Version 13.15.1

Improve the logging around MarkedAsDeleted

.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)

composites/ebean-clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>

composites/ebean-cockroach/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>

composites/ebean-db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>

composites/ebean-h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>

composites/ebean-hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>

composites/ebean-mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>

composites/ebean-mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>

composites/ebean-nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>

composites/ebean-oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>

composites/ebean-postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>

composites/ebean-sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>

composites/ebean-sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>

composites/ebean-yugabyte/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>

composites/ebean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,19 +16,31 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-jackson-jsonnode</artifactId>
+      <version>13.15.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-jackson-mapper</artifactId>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -41,18 +53,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>

composites/pom.xml

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

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean api</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>2.2</version>
+      <version>2.4</version>
     </dependency>
 
     <!--
@@ -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/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,6 +30,13 @@ 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.
    */

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

@@ -117,6 +117,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 +132,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 +191,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 +234,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 +271,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.
    */

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

@@ -830,6 +830,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 +859,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 +900,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 +935,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 +951,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 +969,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 +999,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.
    */
@@ -1683,4 +1763,8 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> endNot();
 
+  /**
+   * Clears the current expression list.
+   */
+  ExpressionList<T> clear();
 }

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,15 +17,32 @@ 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 lineNumber and label.
+   */
+  static ProfileLocation create(String label) {
+    return XServiceProvider.profileLocationFactory().create(label);
+  }
+
+  /**
+   * Deprecated in favor of {@link #create(String)}.
+   */
+  @Deprecated
+  static ProfileLocation create(int lineNumber, String label) {
+    return create(label);
+  }
+
+  /**
+   * Deprecated for removal - not used.
    * Create and return a new ProfileLocation with a given location.
    */
+  @Deprecated
   static ProfileLocation createAt(String location) {
     return XServiceProvider.profileLocationFactory().createAt(location);
   }

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

@@ -1768,4 +1768,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/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,19 +28,26 @@ 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].hashCode());
+    this.pathHash = enc(hc);
   }
 
   private int computeHashCode() {
     int hc = 0;
-    for (StackTraceElement element : callStack) {
+    for (Object element : callStack) {
       hc = 92821 * hc + element.hashCode();
     }
     return hc;

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

@@ -24,6 +24,11 @@ public class InterceptReadOnly implements EntityBeanIntercept {
     this.owner = (EntityBean) ownerBean;
   }
 
+  @Override
+  public String toString() {
+    return "InterceptReadOnly{" + owner + '}';
+  }
+
   @Override
   public EntityBean getOwner() {
     return owner;

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

@@ -113,6 +113,25 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
     this.flags = null;
   }
 
+  @Override
+  public String toString() {
+    return "InterceptReadWrite{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) : "") +
+      ", owner=" + owner +
+      '}';
+  }
+
   @Override
   public EntityBean getOwner() {
     return owner;
@@ -690,7 +709,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 +737,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

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/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
@@ -615,7 +612,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.
    * <p>
    * For example, put IgniteConfiguration in to be passed to the Ignite plugin.
    */
@@ -623,6 +620,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 +645,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 +670,7 @@ public class DatabaseConfig {
   }
 
   /**
-   * Used by plugins to obtain service objects.
+   * Used by ebean or plugins to obtain service objects.
    *
    * <pre>{@code
    *
@@ -2306,8 +2320,7 @@ 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.
@@ -2317,8 +2330,7 @@ public class DatabaseConfig {
    * <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 +2339,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 +2381,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 +2769,6 @@ public class DatabaseConfig {
     this.classLoadConfig = classLoadConfig;
   }
 
-
-
   /**
    * Load settings from application.properties, application.yaml and other sources.
    * <p>
@@ -2892,7 +2913,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);
@@ -2968,10 +2989,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 +3006,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 +3027,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);
@@ -3385,8 +3406,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/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/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/util/StackWalkFilter.java

@@ -0,0 +1,28 @@
+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.getMethodName().startsWith("_ebean_");
+    }
+  }
+}

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

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,17 +26,31 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
       <scope>provided</scope>
     </dependency>
 
-    <!-- needed for java 11+ -->
+    <!-- JAVAX-DEPENDENCY-START -->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
       <version>2.3.6</version>
       <scope>provided</scope>
     </dependency>
+    <!-- JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START ___
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    ____ JAKARTA-DEPENDENCY-END -->
 
     <dependency>
       <groupId>io.ebean</groupId>
@@ -55,7 +69,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -70,7 +84,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:13.6.5</tile>
+            <tile>io.ebean.tile:enhancement:13.12.0</tile>
           </tiles>
         </configuration>
       </plugin>

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

@@ -148,7 +148,7 @@ public class BaseQueryTuner {
       case UPDATE:
       case DELETE:
       case SQ_EXISTS:
-      case SQ_IN:
+      case SQ_EX:
         return false;
       default:
         // not using autoTune when explicitly loading the l2 bean cache

ebean-bom/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,94 +89,180 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-jackson-jsonnode</artifactId>
+        <version>13.15.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-jackson-mapper</artifactId>
+        <version>13.15.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.9.0</version>
+        <version>13.15.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-spring-txn</artifactId>
+        <version>13.15.1</version>
+      </dependency>
+
+      <!-- platforms -->
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-clickhouse</artifactId>
+        <version>13.15.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-db2</artifactId>
+        <version>13.15.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-h2</artifactId>
+        <version>13.15.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-hana</artifactId>
+        <version>13.15.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-mariadb</artifactId>
+        <version>13.15.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-mysql</artifactId>
+        <version>13.15.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-nuodb</artifactId>
+        <version>13.15.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-oracle</artifactId>
+        <version>13.15.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-postgres</artifactId>
+        <version>13.15.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-sqlite</artifactId>
+        <version>13.15.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-sqlserver</artifactId>
+        <version>13.15.1</version>
       </dependency>
 
     </dependencies>

ebean-core-type/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -26,6 +26,14 @@
       <optional>true</optional>
     </dependency>
 
+    <!-- Provided scope for Postgres JSON/JSONB support -->
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>42.4.3</version>
+      <optional>true</optional>
+    </dependency>
+
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>

ebean-core-type/src/main/java/io/ebean/core/type/PostgresHelper.java

@@ -1,5 +1,7 @@
-package io.ebeaninternal.server.type;
+package io.ebean.core.type;
 
+import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.DatabasePlatform;
 import org.postgresql.util.PGobject;
 
 import java.sql.SQLException;
@@ -9,12 +11,12 @@ public final class PostgresHelper {
   /**
    * The Postgres JSON DB type.
    */
-  static final String JSON_TYPE = "json";
+  public static final String JSON_TYPE = "json";
 
   /**
    * The Postgres JSONB DB type.
    */
-  static final String JSONB_TYPE = "jsonb";
+  public static final String JSONB_TYPE = "jsonb";
 
   static final String INET_TYPE = "inet";
 
@@ -31,4 +33,13 @@ public final class PostgresHelper {
     pgo.setValue(rawJson);
     return pgo;
   }
+
+  /**
+   * Return true if the platform is Postgres or compatible like Yugabyte, Cockroach.
+   */
+  public static boolean isPostgresCompatible(DatabasePlatform databasePlatform) {
+    return databasePlatform.isPlatform(Platform.POSTGRES)
+      || databasePlatform.isPlatform(Platform.YUGABYTE)
+      || databasePlatform.isPlatform(Platform.COCKROACH);
+  }
 }

ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonManager.java

@@ -0,0 +1,24 @@
+package io.ebean.core.type;
+
+import io.ebean.annotation.MutationDetection;
+
+/**
+ * Holds the configured mapper and default mutation detection mode to be used.
+ */
+public interface ScalarJsonManager {
+
+  /**
+   * Return the default mutation detection mode.
+   */
+  MutationDetection mutationDetection();
+
+  /**
+   * Return the object mapper supplied in DatabaseConfig.
+   */
+  Object mapper();
+
+  /**
+   * Return the Postgres type given the jdbc type.
+   */
+  String postgresType(int dbType);
+}

ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java

@@ -0,0 +1,23 @@
+package io.ebean.core.type;
+
+import io.avaje.lang.Nullable;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * Supports JSON bean properties that use something like Jackson ObjectMapper to convert between
+ * JSON content and the logical bean property value.
+ */
+public interface ScalarJsonMapper {
+
+  /**
+   * Return a ScalarType for the given JSON property.
+   */
+  ScalarType<?> createType(ScalarJsonRequest request);
+
+  /**
+   * Return a marker annotation to detect when the JSON mapper should be used explicitly.
+   */
+  @Nullable
+  <A extends Annotation> Class<A> markerAnnotation();
+}

ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonRequest.java

@@ -0,0 +1,67 @@
+package io.ebean.core.type;
+
+import io.ebean.annotation.MutationDetection;
+
+/**
+ * A request to create a ScalarType for a bean property (typically annotated with {@code @DbJson}).
+ */
+public final class ScalarJsonRequest {
+
+  private final ScalarJsonManager manager;
+  private final int dbType;
+  private final DocPropertyType docType;
+  private final Class<?> beanType;
+  private final MutationDetection mode;
+  private final String name;
+
+  public ScalarJsonRequest(ScalarJsonManager manager, int dbType, DocPropertyType docType, Class<?> beanType, MutationDetection mode, String name) {
+    this.manager = manager;
+    this.dbType = dbType;
+    this.docType = docType;
+    this.beanType = beanType;
+    this.mode = mode;
+    this.name = name;
+  }
+
+  /**
+   * Return the manager.
+   */
+  public ScalarJsonManager manager() {
+    return manager;
+  }
+
+  /**
+   * Return the jdbc type this property maps to (e.g. JSON, JSONB etc).
+   */
+  public int dbType() {
+    return dbType;
+  }
+
+  /**
+   * Return the document store docType.
+   */
+  public DocPropertyType docType() {
+    return docType;
+  }
+
+  /**
+   * Return the type of the bean that this property belongs to.
+   */
+  public Class<?> beanType() {
+    return beanType;
+  }
+
+  /**
+   * Return the mutation detection mode the property should use.
+   */
+  public MutationDetection mode() {
+    return mode;
+  }
+
+  /**
+   * Return the property name.
+   */
+  public String name() {
+    return name;
+  }
+}

ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeSet.java

@@ -0,0 +1,28 @@
+package io.ebean.core.type;
+
+import io.avaje.lang.Nullable;
+
+/**
+ * A ScalarType that has variations based on the mapped JDBC type (like VARCHAR, CLOB, JSON etc).
+ */
+public interface ScalarTypeSet<T> {
+
+  /**
+   * The property type these scalar types map to.
+   */
+  Class<?> type();
+
+  /**
+   * Return a default ScalarType to use when no other annotations like {@code @DbJson} are present.
+   */
+  @Nullable
+  ScalarType<?> defaultType();
+
+  /**
+   * Return the scalarType to use for the given jdbc type.
+   * <p>
+   * For example VARCHAR, CLOB, JSON etc.
+   */
+  ScalarType<T> forType(int jdbcType);
+
+}

ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeSetFactory.java

@@ -0,0 +1,17 @@
+package io.ebean.core.type;
+
+import io.avaje.lang.Nullable;
+import io.ebean.config.DatabaseConfig;
+
+/**
+ * Factory to create ScalarTypeSet.
+ */
+public interface ScalarTypeSetFactory {
+
+  /**
+   * Create the ScalarTypeSet given the config and optional objectMapper.
+   */
+  @Nullable
+  ScalarTypeSet<?> createTypeSet(DatabaseConfig config, @Nullable Object objectMapper);
+
+}

ebean-core-type/src/main/java/module-info.java

@@ -4,6 +4,7 @@ module io.ebean.core.type {
 
   requires transitive java.sql;
   requires transitive io.ebean.api;
+  requires static org.postgresql.jdbc;
 
   requires static com.fasterxml.jackson.core;
 

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.15.1</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,10 +15,15 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.15.1</version>
+    </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
@@ -38,22 +43,16 @@
       <version>${ebean-migration-auto.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
-    </dependency>
-
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
     </dependency>
 
     <dependency>
@@ -106,7 +105,7 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.9.7</version>
+      <version>2.11.1</version>
       <optional>true</optional>
     </dependency>
 
@@ -136,7 +135,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.4.1</version>
+      <version>42.5.1</version>
       <optional>true</optional>
     </dependency>
 
@@ -144,21 +143,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.0</version>
+      <version>13.15.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-core/src/main/java/io/ebeaninternal/api/CoreLog.java

@@ -9,4 +9,5 @@ public final class CoreLog {
 
   public static final System.Logger log = AppLog.getLogger("io.ebean.core");
   public static final System.Logger internal = AppLog.getLogger("io.ebean.internal");
+  public static final System.Logger markedAsDeleted = AppLog.getLogger("io.ebean.MarkedAsDeleted");
 }

ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java

@@ -6,10 +6,7 @@ import io.ebeaninternal.api.SpiQuery.Mode;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Request for loading ManyToOne and OneToOne relationships.
@@ -65,9 +62,9 @@ public final class LoadBeanRequest extends LoadRequest {
   /**
    * Return the list of Id values for the beans in the lazy load buffer.
    */
-  public List<Object> getIdList() {
-    List<Object> idList = new ArrayList<>();
-    BeanDescriptor<?> desc = loadBuffer.descriptor();
+  public List<Object> ids() {
+    final List<Object> idList = new ArrayList<>(batch.size());
+    final BeanDescriptor<?> desc = loadBuffer.descriptor();
     for (EntityBeanIntercept ebi : batch) {
       idList.add(desc.getId(ebi.getOwner()));
     }
@@ -103,7 +100,7 @@ public final class LoadBeanRequest extends LoadRequest {
   /**
    * Load the beans into the L2 cache if that is requested and check for load failures due to deletes.
    */
-  public void postLoad(List<?> list) {
+  public Result postLoad(List<?> list) {
     Set<Object> loadedIds = new HashSet<>();
     BeanDescriptor<?> desc = loadBuffer.descriptor();
     // collect Ids and maybe load bean cache
@@ -114,6 +111,8 @@ public final class LoadBeanRequest extends LoadRequest {
       desc.cacheBeanPutAll(list);
     }
     if (lazyLoadProperty != null) {
+      List<EntityBeanIntercept> missed = new ArrayList<>();
+      Set<Object> missedIds = new HashSet<>();
       for (EntityBeanIntercept ebi : batch) {
         // check if the underlying row in DB was deleted. Mark the bean as 'failed' if
         // necessary but allow processing to continue until it is accessed by client code
@@ -121,8 +120,43 @@ public final class LoadBeanRequest extends LoadRequest {
         if (!loadedIds.contains(id)) {
           // assume this is logically deleted (hence not found)
           desc.markAsDeleted(ebi.getOwner());
+          missedIds.add(id);
+          missed.add(ebi);
         }
       }
+      return new Result(loadedIds, missedIds, missed);
+    }
+    return EMPTY_RESULT;
+  }
+
+  static final Result EMPTY_RESULT = new Result(Collections.emptySet(),Collections.emptySet(), Collections.emptyList());
+
+  public static class Result {
+
+    private final Set<Object> loadedIds;
+    private final Set<Object> missedIds;
+    private final List<EntityBeanIntercept> missed;
+
+    Result(Set<Object> loadedIds, Set<Object> missedIds, List<EntityBeanIntercept> missed) {
+      this.loadedIds = loadedIds;
+      this.missedIds = missedIds;
+      this.missed = missed;
+    }
+
+    public boolean markedDeleted() {
+      return !missedIds.isEmpty();
+    }
+
+    public Set<Object> missedIds() {
+      return missedIds;
+    }
+
+    public Set<Object> loadedIds() {
+      return loadedIds;
+    }
+
+    public List<EntityBeanIntercept> missed() {
+      return missed;
     }
   }
 }

ebean-core/src/main/java/io/ebeaninternal/api/LoadContext.java

@@ -50,4 +50,9 @@ public interface LoadContext {
    * Register a collection for lazy loading.
    */
   void register(String path, BeanPropertyAssocMany<?> many, BeanCollection<?> bc);
+
+  /**
+   * Use soft-references for streaming queries, so unreachable entries can be garbage collected.
+   */
+  void useReferences(boolean useReferences);
 }

ebean-core/src/main/java/io/ebeaninternal/api/LoadManyBuffer.java

@@ -6,16 +6,30 @@ import io.ebean.bean.PersistenceContext;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 
-import java.util.List;
-
 /**
  * A buffer of bean collections for batch lazy loading and secondary query loading.
  */
 public interface LoadManyBuffer {
 
-  int getBatchSize();
+  /**
+   * The batch (max) size;
+   */
+  int batchSize();
 
-  List<BeanCollection<?>> getBatch();
+  /**
+   * The actual size.
+   */
+  int size();
+
+  /**
+   * Get the <code>i</code>th element from buffer. This can be null.
+   */
+  BeanCollection<?> get(int i);
+
+  /**
+   * Removes an element from the buffer. This will NOT affect size.
+   */
+  boolean removeFromBuffer(BeanCollection<?> collection);
 
   BeanPropertyAssocMany<?> getBeanProperty();
 

ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java

@@ -12,6 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.INFO;
 
 /**
  * Request for loading Associated Many Beans.
@@ -19,32 +20,32 @@ import static java.lang.System.Logger.Level.DEBUG;
 public final class LoadManyRequest extends LoadRequest {
 
   private static final System.Logger log = CoreLog.log;
-
-  private final List<BeanCollection<?>> batch;
   private final LoadManyBuffer loadContext;
   private final boolean onlyIds;
   private final boolean loadCache;
+  private final BeanCollection<?> originCollection;
+  private boolean originIncluded;
 
   /**
    * Construct for lazy loading.
    */
-  public LoadManyRequest(LoadManyBuffer loadContext, boolean onlyIds, boolean loadCache) {
-    this(loadContext, null, true, onlyIds, loadCache);
+  public LoadManyRequest(LoadManyBuffer loadContext, boolean onlyIds, boolean loadCache, BeanCollection<?> originCollection) {
+    super(null, true);
+    this.loadContext = loadContext;
+    this.onlyIds = onlyIds;
+    this.loadCache = loadCache;
+    this.originCollection = originCollection;
   }
 
   /**
    * Construct for secondary query.
    */
   public LoadManyRequest(LoadManyBuffer loadContext, OrmQueryRequest<?> parentRequest) {
-    this(loadContext, parentRequest, false, false, false);
-  }
-
-  private LoadManyRequest(LoadManyBuffer loadContext, OrmQueryRequest<?> parentRequest, boolean lazy, boolean onlyIds, boolean loadCache) {
-    super(parentRequest, lazy);
+    super(parentRequest, false);
     this.loadContext = loadContext;
-    this.batch = loadContext.getBatch();
-    this.onlyIds = onlyIds;
-    this.loadCache = loadCache;
+    this.onlyIds = false;
+    this.loadCache = false;
+    this.originCollection = null;
   }
 
   @Override
@@ -59,9 +60,20 @@ public final class LoadManyRequest extends LoadRequest {
   private List<Object> parentIdList(SpiEbeanServer server) {
     List<Object> idList = new ArrayList<>();
     BeanPropertyAssocMany<?> many = many();
-    for (BeanCollection<?> bc : batch) {
-      idList.add(many.parentId(bc.getOwnerBean()));
-      bc.setLoader(server); // don't use the load buffer again
+    for (int i = 0; i < loadContext.size(); i++) {
+      BeanCollection<?> bc = loadContext.get(i);
+      if (bc != null) {
+        if (lazy && !originIncluded && bc == originCollection) {
+          originIncluded = true;
+        }
+        idList.add(many.parentId(bc.getOwnerBean()));
+        bc.setLoader(server); // don't use the load buffer again
+      }
+    }
+    if (originCollection != null && !originIncluded) {
+      CoreLog.log.log(INFO, "Batch lazy loading including origin collection - size:{0}", idList.size());
+      idList.add(many.parentId(originCollection.getOwnerBean()));
+      originCollection.setLoader(server); // don't use the load buffer again
     }
     if (many.targetDescriptor().isPadInExpression()) {
       BindPadding.padIds(idList);
@@ -91,7 +103,7 @@ public final class LoadManyRequest extends LoadRequest {
     query.setPersistenceContext(loadContext.getPersistenceContext());
     query.setLoadDescription(lazy ? "+lazy" : "+query", description());
     if (lazy) {
-      query.setLazyLoadBatchSize(loadContext.getBatchSize());
+      query.setLazyLoadBatchSize(loadContext.batchSize());
     } else {
       query.setBeanCacheMode(CacheMode.OFF);
     }
@@ -112,15 +124,18 @@ public final class LoadManyRequest extends LoadRequest {
     BeanPropertyAssocMany<?> many = many();
     // check for BeanCollection's that where never processed
     // in the +query or +lazy load due to no rows (predicates)
-    for (BeanCollection<?> bc : batch) {
-      if (bc.checkEmptyLazyLoad()) {
-        if (log.isLoggable(DEBUG)) {
-          EntityBean ownerBean = bc.getOwnerBean();
-          Object parentId = desc.getId(ownerBean);
-          log.log(DEBUG, "BeanCollection after lazy load was empty. type:{0} id:{1} owner:{2}", ownerBean.getClass().getName(), parentId, ownerBean);
+    for (int i = 0; i < loadContext.size(); i++) {
+      BeanCollection<?> bc = loadContext.get(i);
+      if (bc != null) {
+        if (bc.checkEmptyLazyLoad()) {
+          if (log.isLoggable(DEBUG)) {
+            EntityBean ownerBean = bc.getOwnerBean();
+            Object parentId = desc.getId(ownerBean);
+            log.log(DEBUG, "BeanCollection after lazy load was empty. type:{0} id:{1} owner:{2}", ownerBean.getClass().getName(), parentId, ownerBean);
+          }
+        } else if (loadCache && many.isUseCache()) {
+          desc.cacheManyPropPut(many, bc, desc.cacheKeyForBean(bc.getOwnerBean()));
         }
-      } else if (loadCache && many.isUseCache()) {
-        desc.cacheManyPropPut(many, bc, desc.getId(bc.getOwnerBean()));
       }
     }
   }

ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java

@@ -45,15 +45,14 @@ public final class ScopeTrans {
    * Flag set when nested commit has occurred.
    */
   private boolean nestedCommit;
+  private boolean nestedUseSavepoint;
 
   public ScopeTrans(boolean rollbackOnChecked, boolean created, SpiTransaction transaction, TxScope txScope) {
-
     this.rollbackOnChecked = rollbackOnChecked;
     this.created = created;
     this.transaction = transaction;
     this.noRollbackFor = txScope.getNoRollbackFor();
     this.rollbackFor = txScope.getRollbackFor();
-
     if (transaction != null) {
       if (!created && txScope.isBatchSet() || txScope.isBatchOnCascadeSet() || txScope.isBatchSizeSet()) {
         restoreBatch = transaction.isBatchMode();
@@ -90,6 +89,14 @@ public final class ScopeTrans {
     return "ScopeTrans " + transaction;
   }
 
+  void setNestedUseSavepoint() {
+    nestedUseSavepoint = true;
+  }
+
+  boolean isNestedUseSavepoint() {
+    return nestedUseSavepoint;
+  }
+
   /**
    * Return the current/active transaction.
    */
@@ -101,7 +108,6 @@ public final class ScopeTrans {
    * Complete the transaction from enhanced transactional. Try to commit.
    */
   void complete(Object returnOrThrowable, int opCode) {
-
     if (opCode == OPCODE_ATHROW) {
       // exited with a Throwable
       caughtThrowable((Throwable) returnOrThrowable);
@@ -168,7 +174,6 @@ public final class ScopeTrans {
    * Returns the exception and this should be thrown by the calling code.
    */
   public <T extends Throwable> T caughtThrowable(T e) {
-
     if (isRollbackThrowable(e)) {
       rollback(e);
     }
@@ -188,21 +193,17 @@ public final class ScopeTrans {
    * Return true if this throwable should cause a rollback to occur.
    */
   private boolean isRollbackThrowable(Throwable e) {
-
     if (e instanceof Error) {
       return true;
     }
-
     if (noRollbackFor != null) {
       for (Class<? extends Throwable> aNoRollbackFor : noRollbackFor) {
         if (aNoRollbackFor.equals(e.getClass())) {
-
           // explicit no rollback for this one
           return false;
         }
       }
     }
-
     if (rollbackFor != null) {
       for (Class<? extends Throwable> aRollbackFor : rollbackFor) {
         if (aRollbackFor.equals(e.getClass())) {
@@ -211,7 +212,6 @@ public final class ScopeTrans {
         }
       }
     }
-
     // checked exceptions...
     // EJB defaults this to false which is not intuitive IMO
     // Ebean makes this configurable (default to true)

ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java

@@ -33,13 +33,26 @@ public final class ScopedTransaction extends SpiTransactionProxy {
     return "ScopedTransaction " + current;
   }
 
+  @Override
+  public void setNestedUseSavepoint() {
+    current.setNestedUseSavepoint();
+  }
+
+  @Override
+  public boolean isNestedUseSavepoint() {
+    return current.isNestedUseSavepoint();
+  }
+
   /**
    * Push the scope transaction.
    */
   public void push(ScopeTrans scopeTrans) {
-
     if (current != null) {
       stack.push(current);
+      if (current.isNestedUseSavepoint()) {
+        // child scope 'inherits' nestedUseSavepoint
+        scopeTrans.setNestedUseSavepoint();
+      }
     }
     current = scopeTrans;
     transaction = scopeTrans.getTransaction();
@@ -111,6 +124,11 @@ public final class ScopedTransaction extends SpiTransactionProxy {
     }
   }
 
+  @Override
+  public void rollbackAndContinue() {
+    transaction.rollbackAndContinue();
+  }
+
   @Override
   public void rollback() throws PersistenceException {
     try {

ebean-core/src/main/java/io/ebeaninternal/api/SpiLogManager.java

@@ -10,18 +10,25 @@ package io.ebeaninternal.api;
 public interface SpiLogManager {
 
   /**
-   * Return the SQL logger.
+   * Enable bind logging.
+   */
+  boolean enableBindLog();
+
+  /**
+   * Logger used for general transactions.
+   */
+  SpiTxnLogger logger();
+
+  /**
+   * Logger used for read only transactions.
+   */
+  SpiTxnLogger readOnlyLogger();
+
+  /**
+   * Hmmmm, return the SQL logger for logging truncate statements.
+   * <p>
+   * Maybe we should get rid of this
    */
   SpiLogger sql();
 
-  /**
-   * Return the TXN logger.
-   */
-  SpiLogger txn();
-
-  /**
-   * Return the Summary logger.
-   */
-  SpiLogger sum();
-
 }

ebean-core/src/main/java/io/ebeaninternal/api/SpiLogger.java

@@ -14,18 +14,9 @@ public interface SpiLogger {
    */
   boolean isDebug();
 
-  /**
-   * Is trace logging enabled.
-   */
-  boolean isTrace();
-
   /**
    * Log a debug level message.
    */
-  void debug(String msg);
+  void debug(String msg, Object... args);
 
-  /**
-   * Log a trace level message.
-   */
-  void trace(String msg);
 }

ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java

@@ -103,14 +103,14 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
     COUNT(FIND_COUNT, "findCount"),
 
     /**
-     * A subquery used as part of an exists where clause.
+     * A sub-query used as part of an exists where clause.
      */
     SQ_EXISTS(FIND_SUBQUERY, "sqExists", false, false),
 
     /**
-     * A subquery used as part of an in where clause.
+     * A sub-query expression used as part of where clause.
      */
-    SQ_IN(FIND_SUBQUERY, "sqIn", false, false),
+    SQ_EX(FIND_SUBQUERY, "sqEx", false, false),
 
     /**
      * Delete query.
@@ -759,6 +759,11 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
    */
   BindParams getBindParams();
 
+  /**
+   * Return the bind parameters ensuring it is initialised.
+   */
+  BindParams initBindParams();
+
   /**
    * Replace the query detail. This is used by the AutoTune feature to as a
    * fast way to set the query properties and joins.

ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java

@@ -27,10 +27,6 @@ public interface SpiTransaction extends Transaction {
    */
   String getLabel();
 
-  /**
-   * Return the string prefix with the transaction id and label used in logging.
-   */
-  String getLogPrefix();
 
   /**
    * Return true if generated SQL and Bind values should be logged to the
@@ -47,12 +43,17 @@ public interface SpiTransaction extends Transaction {
   /**
    * Log a message to the SQL logger.
    */
-  void logSql(String msg);
+  void logSql(String msg, Object... args);
 
   /**
-   * Log a message to the SUMMARY logger.
+   * Log a summary message to the SUMMARY logger.
    */
-  void logSummary(String msg);
+  void logSummary(String msg, Object... args);
+
+  /**
+   * Log a transaction message to the transaction logger.
+   */
+  void logTxn(String msg, Object... args);
 
   /**
    * Register a "Deferred Relationship" that requires an additional update later.

ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java

@@ -137,10 +137,6 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
     transaction.setDocStoreBatchSize(batchSize);
   }
 
-  @Override
-  public String getLogPrefix() {
-    return transaction.getLogPrefix();
-  }
 
   @Override
   public boolean isLogSql() {
@@ -153,13 +149,18 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void logSql(String msg) {
-    transaction.logSql(msg);
+  public void logSql(String msg, Object... args) {
+    transaction.logSql(msg, args);
   }
 
   @Override
-  public void logSummary(String msg) {
-    transaction.logSummary(msg);
+  public void logSummary(String msg, Object... args) {
+    transaction.logSummary(msg, args);
+  }
+
+  @Override
+  public void logTxn(String msg, Object... args) {
+    transaction.logTxn(msg, args);
   }
 
   @Override

ebean-core/src/main/java/io/ebeaninternal/api/SpiTxnLogger.java

@@ -0,0 +1,49 @@
+package io.ebeaninternal.api;
+
+/**
+ * Per Transaction logging of SQL, TXN and Summary messages.
+ */
+public interface SpiTxnLogger {
+
+  String id();
+
+  /**
+   * Is debug logging enabled.
+   */
+  boolean isLogSql();
+
+  /**
+   * Is summary logging enabled.
+   */
+  boolean isLogSummary();
+
+  /**
+   * Log a SQL message.
+   */
+  void sql(String msg, Object... args);
+
+  /**
+   * Log a Summary message.
+   */
+  void sum(String msg, Object... args);
+
+  /**
+   * Log a Transaction message.
+   */
+  void txn(String msg, Object... args);
+
+  /**
+   * Transaction Committed.
+   */
+  void notifyCommit();
+
+  /**
+   * Query only transaction completed.
+   */
+  void notifyQueryOnly();
+
+  /**
+   * Transaction Rolled back.
+   */
+  void notifyRollback(Throwable cause);
+}

ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java

@@ -34,5 +34,5 @@ public interface SpiJsonReader {
 
   Object readValueUsingObjectMapper(Class<?> propertyType) throws IOException;
 
-  boolean intercept();
+  boolean update();
 }

ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBind.java

@@ -115,88 +115,88 @@ public class DataBind implements DataBinder {
   }
 
   @Override
-  public void setString(String s) throws SQLException {
-    pstmt.setString(++pos, s);
+  public void setString(String value) throws SQLException {
+    pstmt.setString(++pos, value);
   }
 
   @Override
-  public final void setInt(int i) throws SQLException {
-    pstmt.setInt(++pos, i);
+  public final void setInt(int value) throws SQLException {
+    pstmt.setInt(++pos, value);
   }
 
   @Override
-  public final void setLong(long i) throws SQLException {
-    pstmt.setLong(++pos, i);
+  public final void setLong(long value) throws SQLException {
+    pstmt.setLong(++pos, value);
   }
 
   @Override
-  public final void setShort(short i) throws SQLException {
-    pstmt.setShort(++pos, i);
+  public final void setShort(short value) throws SQLException {
+    pstmt.setShort(++pos, value);
   }
 
   @Override
-  public final void setFloat(float i) throws SQLException {
-    pstmt.setFloat(++pos, i);
+  public final void setFloat(float value) throws SQLException {
+    pstmt.setFloat(++pos, value);
   }
 
   @Override
-  public final void setDouble(double i) throws SQLException {
-    pstmt.setDouble(++pos, i);
+  public final void setDouble(double value) throws SQLException {
+    pstmt.setDouble(++pos, value);
   }
 
   @Override
-  public final void setBigDecimal(BigDecimal v) throws SQLException {
-    pstmt.setBigDecimal(++pos, v);
+  public final void setBigDecimal(BigDecimal value) throws SQLException {
+    pstmt.setBigDecimal(++pos, value);
   }
 
   @Override
-  public final void setDate(java.sql.Date v) throws SQLException {
+  public final void setDate(java.sql.Date value) throws SQLException {
     Calendar timeZone = dataTimeZone.getTimeComponentTimeZone();
     if (timeZone != null) {
-      pstmt.setDate(++pos, v, timeZone);
+      pstmt.setDate(++pos, value, timeZone);
     } else {
-      pstmt.setDate(++pos, v);
+      pstmt.setDate(++pos, value);
     }
   }
 
   @Override
-  public final void setTimestamp(Timestamp v) throws SQLException {
+  public final void setTimestamp(Timestamp value) throws SQLException {
     Calendar timeZone = dataTimeZone.getTimeZone();
     if (timeZone != null) {
-      pstmt.setTimestamp(++pos, v, timeZone);
+      pstmt.setTimestamp(++pos, value, timeZone);
     } else {
-      pstmt.setTimestamp(++pos, v);
+      pstmt.setTimestamp(++pos, value);
     }
   }
 
   @Override
-  public final void setTime(Time v) throws SQLException {
+  public final void setTime(Time value) throws SQLException {
     Calendar timeZone = dataTimeZone.getTimeComponentTimeZone();
     if (timeZone != null) {
-      pstmt.setTime(++pos, v, timeZone);
+      pstmt.setTime(++pos, value, timeZone);
     } else {
-      pstmt.setTime(++pos, v);
+      pstmt.setTime(++pos, value);
     }
   }
 
   @Override
-  public void setBoolean(boolean v) throws SQLException {
-    pstmt.setBoolean(++pos, v);
+  public void setBoolean(boolean value) throws SQLException {
+    pstmt.setBoolean(++pos, value);
   }
 
   @Override
-  public void setBytes(byte[] v) throws SQLException {
-    pstmt.setBytes(++pos, v);
+  public void setBytes(byte[] value) throws SQLException {
+    pstmt.setBytes(++pos, value);
   }
 
   @Override
-  public void setByte(byte v) throws SQLException {
-    pstmt.setByte(++pos, v);
+  public void setByte(byte value) throws SQLException {
+    pstmt.setByte(++pos, value);
   }
 
   @Override
-  public void setChar(char v) throws SQLException {
-    pstmt.setString(++pos, String.valueOf(v));
+  public void setChar(char value) throws SQLException {
+    pstmt.setString(++pos, String.valueOf(value));
   }
 
   @Override
@@ -215,20 +215,17 @@ public class DataBind implements DataBinder {
 
   @Override
   public void setBlob(byte[] bytes) throws SQLException {
-    ByteArrayInputStream is = new ByteArrayInputStream(bytes);
-    pstmt.setBinaryStream(++pos, is, bytes.length);
+    pstmt.setBinaryStream(++pos, new ByteArrayInputStream(bytes), bytes.length);
   }
 
   @Override
   public void setClob(String content) throws SQLException {
-    Reader reader = new StringReader(content);
-    pstmt.setCharacterStream(++pos, reader, content.length());
+    pstmt.setCharacterStream(++pos, new StringReader(content), content.length());
   }
 
   @Override
   public void setArray(String arrayType, Object[] elements) throws SQLException {
-    Array array = connection.createArrayOf(arrayType, elements);
-    pstmt.setArray(++pos, array);
+    pstmt.setArray(++pos, connection.createArrayOf(arrayType, elements));
   }
 
 }

ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureStatement.java

@@ -33,87 +33,87 @@ public final class BindCaptureStatement extends BindCaptureStatementBase impleme
   }
 
   @Override
-  public void setBoolean(int parameterIndex, boolean x) {
-    capture.add(new BindCaptureTypes.Boolean(parameterIndex, x));
+  public void setBoolean(int parameterIndex, boolean value) {
+    capture.add(new BindCaptureTypes.Boolean(parameterIndex, value));
   }
 
   @Override
-  public void setByte(int parameterIndex, byte x) {
-    capture.add(new BindCaptureTypes.Byte(parameterIndex, x));
+  public void setByte(int parameterIndex, byte value) {
+    capture.add(new BindCaptureTypes.Byte(parameterIndex, value));
   }
 
   @Override
-  public void setShort(int parameterIndex, short x) {
-    capture.add(new BindCaptureTypes.TShort(parameterIndex, x));
+  public void setShort(int parameterIndex, short value) {
+    capture.add(new BindCaptureTypes.TShort(parameterIndex, value));
   }
 
   @Override
-  public void setInt(int parameterIndex, int x) {
-    capture.add(new BindCaptureTypes.TInt(parameterIndex, x));
+  public void setInt(int parameterIndex, int value) {
+    capture.add(new BindCaptureTypes.TInt(parameterIndex, value));
   }
 
   @Override
-  public void setLong(int parameterIndex, long x) {
-    capture.add(new BindCaptureTypes.TLong(parameterIndex, x));
+  public void setLong(int parameterIndex, long value) {
+    capture.add(new BindCaptureTypes.TLong(parameterIndex, value));
   }
 
   @Override
-  public void setFloat(int parameterIndex, float x) {
-    capture.add(new BindCaptureTypes.TFloat(parameterIndex, x));
+  public void setFloat(int parameterIndex, float value) {
+    capture.add(new BindCaptureTypes.TFloat(parameterIndex, value));
   }
 
   @Override
-  public void setDouble(int parameterIndex, double x) {
-    capture.add(new BindCaptureTypes.TDouble(parameterIndex, x));
+  public void setDouble(int parameterIndex, double value) {
+    capture.add(new BindCaptureTypes.TDouble(parameterIndex, value));
   }
 
   @Override
-  public void setBigDecimal(int parameterIndex, BigDecimal x) {
-    capture.add(new BindCaptureTypes.TBigDecimal(parameterIndex, x));
+  public void setBigDecimal(int parameterIndex, BigDecimal value) {
+    capture.add(new BindCaptureTypes.TBigDecimal(parameterIndex, value));
   }
 
   @Override
-  public void setString(int parameterIndex, String x) {
-    capture.add(new BindCaptureTypes.TString(parameterIndex, x));
+  public void setString(int parameterIndex, String value) {
+    capture.add(new BindCaptureTypes.TString(parameterIndex, value));
   }
 
   @Override
-  public void setBytes(int parameterIndex, byte[] x) {
-    capture.add(new BindCaptureTypes.Bytes(parameterIndex, x));
+  public void setBytes(int parameterIndex, byte[] value) {
+    capture.add(new BindCaptureTypes.Bytes(parameterIndex, value));
   }
 
   @Override
-  public void setDate(int parameterIndex, Date x) {
-    capture.add(new BindCaptureTypes.TDate(parameterIndex, x));
+  public void setDate(int parameterIndex, Date value) {
+    capture.add(new BindCaptureTypes.TDate(parameterIndex, value));
   }
 
   @Override
-  public void setTime(int parameterIndex, Time x) {
-    capture.add(new BindCaptureTypes.TTime(parameterIndex, x));
+  public void setTime(int parameterIndex, Time value) {
+    capture.add(new BindCaptureTypes.TTime(parameterIndex, value));
   }
 
   @Override
-  public void setTimestamp(int parameterIndex, Timestamp x) {
-    capture.add(new BindCaptureTypes.TTimestamp(parameterIndex, x, null));
+  public void setTimestamp(int parameterIndex, Timestamp value) {
+    capture.add(new BindCaptureTypes.TTimestamp(parameterIndex, value, null));
   }
 
   @Override
-  public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) {
-    capture.add(new BindCaptureTypes.TTimestamp(parameterIndex, x, cal));
+  public void setTimestamp(int parameterIndex, Timestamp value, Calendar cal) {
+    capture.add(new BindCaptureTypes.TTimestamp(parameterIndex, value, cal));
   }
 
   @Override
-  public void setObject(int parameterIndex, Object x) {
-    capture.add(new BindCaptureTypes.TObject(parameterIndex, x));
+  public void setObject(int parameterIndex, Object value) {
+    capture.add(new BindCaptureTypes.TObject(parameterIndex, value));
   }
 
   @Override
-  public void setBinaryStream(int parameterIndex, InputStream x, int length) {
+  public void setBinaryStream(int parameterIndex, InputStream value, int length) {
     capture.add(new BindCaptureTypes.BinaryStream(parameterIndex));
   }
 
   @Override
-  public void setCharacterStream(int parameterIndex, Reader reader, int length) {
+  public void setCharacterStream(int parameterIndex, Reader value, int length) {
     capture.add(new BindCaptureTypes.CharacterStream(parameterIndex));
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java

@@ -91,15 +91,15 @@ public final class CacheChangeSet {
   /**
    * Add many property remove.
    */
-  public <T> void addManyRemove(BeanDescriptor<T> desc, String manyProperty, Object parentId) {
-    many(desc, manyProperty).addRemove(parentId);
+  public <T> void addManyRemove(BeanDescriptor<T> desc, String manyProperty, String parentKey) {
+    many(desc, manyProperty).addRemove(parentKey);
   }
 
   /**
    * Add many property put.
    */
-  public <T> void addManyPut(BeanDescriptor<T> desc, String manyProperty, Object parentId, CachedManyIds entry) {
-    many(desc, manyProperty).addPut(parentId, entry);
+  public <T> void addManyPut(BeanDescriptor<T> desc, String manyProperty, String parentKey, CachedManyIds entry) {
+    many(desc, manyProperty).addPut(parentKey, entry);
   }
 
   /**
@@ -164,8 +164,8 @@ public final class CacheChangeSet {
   private static final class ManyChange implements CacheChange {
 
     final ManyKey key;
-    final Set<Object> removes = new HashSet<>();
-    final Map<Object, CachedManyIds> puts = new LinkedHashMap<>();
+    final Set<String> removes = new HashSet<>();
+    final Map<String, CachedManyIds> puts = new LinkedHashMap<>();
     boolean clear;
 
     ManyChange(ManyKey key) {
@@ -183,17 +183,17 @@ public final class CacheChangeSet {
     /**
      * Remove entry for the given parentId.
      */
-    void addRemove(Object parentId) {
+    void addRemove(String parentKey) {
       if (!clear) {
-        removes.add(parentId);
+        removes.add(parentKey);
       }
     }
 
     /**
      * Put entry for the given parentId.
      */
-    void addPut(Object parentId, CachedManyIds entry) {
-      puts.put(parentId, entry);
+    void addPut(String parentKey, CachedManyIds entry) {
+      puts.put(parentKey, entry);
     }
 
     @Override
@@ -201,11 +201,11 @@ public final class CacheChangeSet {
       if (clear) {
         key.cacheClear();
       } else {
-        for (Map.Entry<Object, CachedManyIds> entry : puts.entrySet()) {
+        for (Map.Entry<String, CachedManyIds> entry : puts.entrySet()) {
           key.cachePut(entry.getKey(), entry.getValue());
         }
-        for (Object parentId : removes) {
-          key.cacheRemove(parentId);
+        for (String parentKey : removes) {
+          key.cacheRemove(parentKey);
         }
       }
     }
@@ -241,12 +241,12 @@ public final class CacheChangeSet {
       desc.cacheManyPropClear(manyProperty);
     }
 
-    void cachePut(Object parentId, CachedManyIds entry) {
-      desc.cacheManyPropPut(manyProperty, parentId, entry);
+    void cachePut(String parentKey, CachedManyIds entry) {
+      desc.cacheManyPropPut(manyProperty, parentKey, entry);
     }
 
-    void cacheRemove(Object parentId) {
-      desc.cacheManyPropRemove(manyProperty, parentId);
+    void cacheRemove(String parentKey) {
+      desc.cacheManyPropRemove(manyProperty, parentKey);
     }
   }
 }

ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java

@@ -130,7 +130,7 @@ final class DefaultCacheHolder {
   }
 
   private ServerCacheOptions getQueryOptions(Class<?> cls) {
-    CacheQueryTuning tuning = AnnotationUtil.get(cls, CacheQueryTuning.class);
+    CacheQueryTuning tuning = AnnotationUtil.typeGet(cls, CacheQueryTuning.class);
     if (tuning != null) {
       return new ServerCacheOptions(tuning).applyDefaults(queryDefault);
     }
@@ -138,9 +138,9 @@ final class DefaultCacheHolder {
   }
 
   private ServerCacheOptions getBeanOptions(Class<?> cls) {
-    Cache cache = cls.getAnnotation(Cache.class);
+    Cache cache = AnnotationUtil.typeGet(cls, Cache.class);
     boolean nearCache = (cache != null && cache.nearCache());
-    CacheBeanTuning tuning = cls.getAnnotation(CacheBeanTuning.class);
+    CacheBeanTuning tuning = AnnotationUtil.typeGet(cls, CacheBeanTuning.class);
     if (tuning != null) {
       return new ServerCacheOptions(nearCache, tuning).applyDefaults(beanDefault);
     }

ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java

@@ -44,7 +44,10 @@ public class DefaultServerCache implements ServerCache {
   protected final CountMetric removeCount;
   protected final CountMetric clearCount;
   protected final CountMetric evictCount;
-
+  protected final CountMetric gcCount;
+  protected final CountMetric idleCount;
+  protected final CountMetric ttlCount;
+  protected final CountMetric lruCount;
   protected final String name;
   protected final String shortName;
   protected final int maxSize;
@@ -55,6 +58,7 @@ public class DefaultServerCache implements ServerCache {
   protected final ReentrantLock lock = new ReentrantLock();
   protected final AtomicLong mutationCounter = new AtomicLong();
 
+
   public DefaultServerCache(DefaultServerCacheConfig config) {
     this.name = config.getName();
     this.shortName = config.getShortName();
@@ -73,6 +77,11 @@ public class DefaultServerCache implements ServerCache {
     this.removeCount = factory.createCountMetric(prefix + shortName + ".remove");
     this.clearCount = factory.createCountMetric(prefix + shortName + ".clear");
     this.evictCount = factory.createCountMetric(prefix + shortName + ".evict");
+    this.gcCount = factory.createCountMetric(prefix + shortName + ".gc");
+    this.idleCount = factory.createCountMetric(prefix + shortName + ".idle");
+    this.ttlCount = factory.createCountMetric(prefix + shortName + ".ttl");
+    this.lruCount = factory.createCountMetric(prefix + shortName + ".lru");
+
   }
 
   public void periodicTrim(BackgroundExecutor executor) {
@@ -90,6 +99,10 @@ public class DefaultServerCache implements ServerCache {
     removeCount.visit(visitor);
     clearCount.visit(visitor);
     evictCount.visit(visitor);
+    gcCount.visit(visitor);
+    idleCount.visit(visitor);
+    ttlCount.visit(visitor);
+    lruCount.visit(visitor);
   }
 
   @Override
@@ -104,6 +117,10 @@ public class DefaultServerCache implements ServerCache {
     cacheStats.setRemoveCount(removeCount.get(reset));
     cacheStats.setClearCount(clearCount.get(reset));
     cacheStats.setEvictCount(evictCount.get(reset));
+    cacheStats.setGcCount(gcCount.get(reset));
+    cacheStats.setIdleCount(idleCount.get(reset));
+    cacheStats.setTtlCount(ttlCount.get(reset));
+    cacheStats.setLruCount(lruCount.get(reset));
     return cacheStats;
   }
 
@@ -289,6 +306,12 @@ public class DefaultServerCache implements ServerCache {
         evictCount.add(trimmedByGC);
         evictCount.add(trimmedByTTL);
         evictCount.add(trimmedByLRU);
+
+        gcCount.add(trimmedByGC);
+        idleCount.add(trimmedByIdle);
+        ttlCount.add(trimmedByTTL);
+        lruCount.add(trimmedByLRU);
+
         if (logger.isLoggable(TRACE)) {
           long exeMicros = TimeUnit.MICROSECONDS.convert(System.nanoTime() - startNanos, TimeUnit.NANOSECONDS);
           logger.log(TRACE, "Executed trim of cache {0} in [{1}]millis idle[{2}] timeToLive[{3}] accessTime[{4}] gc[{5}]",

ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java

@@ -4,7 +4,6 @@ import io.ebean.CancelableQuery;
 import io.ebean.Transaction;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.*;
-import io.ebeaninternal.server.util.Str;
 import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.persist.TrimLogSql;
 import io.ebeaninternal.server.util.BindParamsParser;
@@ -151,7 +150,7 @@ public abstract class AbstractSqlQueryRequest implements CancelableQuery {
       }
       if (isLogSql()) {
         long micros = (System.nanoTime() - startNano) / 1000L;
-        transaction.logSql(Str.add(TrimLogSql.trim(sql), "; --bind(", bindLog, ") --micros(", micros + ")"));
+        transaction.logSql("{0}; --bind({1}) --micros({2})", TrimLogSql.trim(sql), bindLog, micros);
       }
     } finally {
       lock.unlock();

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java

@@ -14,10 +14,12 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
 
 import javax.persistence.EntityNotFoundException;
+import java.text.MessageFormat;
 import java.util.List;
 import java.util.Set;
 
 import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.ERROR;
 
 /**
  * Helper to handle lazy loading and refreshing of beans.
@@ -72,7 +74,8 @@ final class DefaultBeanLoader {
       if (ebi.isReadOnly()) {
         readOnly = Boolean.TRUE;
       }
-      if (parentDesc.cacheManyPropLoad(many, beanCollection, parentId, readOnly)) {
+      final String parentKey = parentDesc.cacheKey(parentId);
+      if (parentDesc.cacheManyPropLoad(many, beanCollection, parentKey, readOnly)) {
         return;
       }
     }
@@ -113,7 +116,8 @@ final class DefaultBeanLoader {
           log.log(DEBUG, "BeanCollection after load was empty. Owner:{0}", beanCollection.getOwnerBean());
         }
       } else if (useManyIdCache) {
-        parentDesc.cacheManyPropPut(many, beanCollection, parentId);
+        final String parentKey = parentDesc.cacheKey(parentId);
+        parentDesc.cacheManyPropPut(many, beanCollection, parentKey);
       }
     }
   }
@@ -122,21 +126,28 @@ final class DefaultBeanLoader {
    * Load a batch of beans for +query or +lazy loading.
    */
   void loadBean(LoadBeanRequest loadRequest) {
-    Set<EntityBeanIntercept> batch = loadRequest.batch();
+    final Set<EntityBeanIntercept> batch = loadRequest.batch();
     if (batch.isEmpty()) {
       throw new RuntimeException("Nothing in batch?");
     }
 
-    List<Object> idList = loadRequest.getIdList();
-    if (idList.isEmpty()) {
-      // everything was loaded from cache
+    final List<Object> ids = loadRequest.ids();
+    if (ids.isEmpty()) {
+      // this should never happen given the batch is not empty
+      CoreLog.internal.log(ERROR, "No Ids when loading Batch buffer");
       return;
     }
 
-    SpiQuery<?> query = server.createQuery(loadRequest.beanType());
-    loadRequest.configureQuery(query, idList);
-    List<?> list = executeQuery(loadRequest, query);
-    loadRequest.postLoad(list);
+    final SpiQuery<?> query = server.createQuery(loadRequest.beanType());
+    loadRequest.configureQuery(query, ids);
+    final List<?> list = executeQuery(loadRequest, query);
+    final LoadBeanRequest.Result result = loadRequest.postLoad(list);
+    if (result.markedDeleted() && CoreLog.markedAsDeleted.isLoggable(DEBUG)) {
+      CoreLog.markedAsDeleted.log(DEBUG, "Loaded bean batch {0}", batch);
+      String msg = MessageFormat.format("Loaded bean marked as deleted for {0} ids:{1} missedIds:{2} loadedIds:{3} sql:{4} loadedList:{5} missed:{6}",
+        loadRequest.beanType(), ids, result.missedIds(), result.loadedIds(), query.getGeneratedSql(), list, result.missed());
+      CoreLog.markedAsDeleted.log(DEBUG, msg, new RuntimeException("LoadBeanRequest markedAsDeleted"));
+    }
   }
 
   /**

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultCallOriginFactory.java

@@ -2,17 +2,17 @@ package io.ebeaninternal.server.core;
 
 import io.ebean.bean.CallOrigin;
 import io.ebean.bean.CallStack;
+import io.ebean.util.StackWalkFilter;
 
 import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Default CallStackFactory where the Hash function for StackTraceElement includes the line number.
  */
-public final class DefaultCallOriginFactory implements CallOriginFactory {
-
-  private static final int IGNORE_LEADING_ELEMENTS = 5;
-
-  private static final String IO_EBEAN = "io.ebean";
+final class DefaultCallOriginFactory implements CallOriginFactory {
 
   private final int maxCallStack;
 
@@ -22,57 +22,18 @@ public final class DefaultCallOriginFactory implements CallOriginFactory {
 
   @Override
   public CallOrigin createCallOrigin() {
-     StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
-
-    // ignore the first 6 as they are always avaje stack elements
-    int startIndex = IGNORE_LEADING_ELEMENTS;
-
-    // find the first non-avaje stackElement
-    for (; startIndex < stackTrace.length; startIndex++) {
-      if (!ignore(stackTrace[startIndex])) {
-        break;
-      }
-    }
-
-    int stackLength = stackTrace.length - startIndex;
-    if (stackLength > maxCallStack) {
-      // maximum of maxCallStack stackTrace elements
-      stackLength = maxCallStack;
-    }
-
-    // create the 'interesting' part of the stackTrace
-    StackTraceElement[] finalTrace = new StackTraceElement[stackLength];
-    System.arraycopy(stackTrace, startIndex, finalTrace, 0, stackLength);
-
-    if (stackLength < 1) {
+    final var frames = StackWalker.getInstance().walk(this::filter);
+    if (frames.isEmpty()) {
       // this should not really happen
-      throw new RuntimeException("StackTraceElement size 0?  stack: " + Arrays.toString(stackTrace));
+      throw new RuntimeException("stackFrames filtered to empty for stack: " + Arrays.toString(Thread.currentThread().getStackTrace()));
     }
-
-    return createCallStack(finalTrace);
+    return new CallStack(frames);
   }
 
-  private boolean ignore(StackTraceElement element) {
-    if (element.getClassName().startsWith(IO_EBEAN)) {
-      return true;
-    }
-    return element.getMethodName().startsWith("_ebean_");
-  }
-
-  private CallOrigin createCallStack(StackTraceElement[] finalTrace) {
-    return new CallStack(finalTrace, finalTrace[0].hashCode(), pathHash(finalTrace));
-  }
-
-  /**
-   * Return the hash code for the path excluding the first element.
-   */
-  private int pathHash(StackTraceElement[] callStack) {
-
-    int hc = 0;
-    for (int i = 1; i < callStack.length; i++) {
-      hc = 92821 * hc + callStack[i].hashCode();
-    }
-    return hc;
+  private <T> List<StackWalker.StackFrame> filter(Stream<StackWalker.StackFrame> frames) {
+    return frames.filter(StackWalkFilter.filter())
+      .limit(maxCallStack)
+      .collect(Collectors.toList());
   }
 
 }

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java

@@ -17,8 +17,8 @@ import javax.persistence.PersistenceException;
 import java.net.URL;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.List;
 import java.util.ServiceLoader;
+import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
 
 import static java.lang.System.Logger.Level.*;
@@ -121,7 +121,7 @@ public final class DefaultContainer implements SpiContainer {
         configProvider.apply(config);
       }
     }
-    if (config.isAutoLoadModuleInfo()) {
+    if (config.isLoadModuleInfo()) {
       // auto register entity classes
       boolean found = false;
       for (EntityClassRegister loader : ServiceLoader.load(EntityClassRegister.class)) {
@@ -160,6 +160,8 @@ public final class DefaultContainer implements SpiContainer {
    */
   private BootupClasses bootupClasses(DatabaseConfig config) {
     BootupClasses bootup = bootupClasses1(config);
+    bootup.addServerConfigStartup(config.getServerConfigStartupListeners());
+    bootup.runServerConfigStartup(config);
     bootup.addIdGenerators(config.getIdGenerators());
     bootup.addPersistControllers(config.getPersistControllers());
     bootup.addPostLoaders(config.getPostLoaders());
@@ -167,9 +169,7 @@ public final class DefaultContainer implements SpiContainer {
     bootup.addFindControllers(config.getFindControllers());
     bootup.addPersistListeners(config.getPersistListeners());
     bootup.addQueryAdapters(config.getQueryAdapters());
-    bootup.addServerConfigStartup(config.getServerConfigStartupListeners());
     bootup.addChangeLogInstances(config);
-    bootup.runServerConfigStartup(config);
     return bootup;
   }
 
@@ -177,10 +177,10 @@ public final class DefaultContainer implements SpiContainer {
    * Get the class based entities, scalarTypes, Listeners etc.
    */
   private BootupClasses bootupClasses1(DatabaseConfig config) {
-    List<Class<?>> entityClasses = config.getClasses();
-    if (config.isDisableClasspathSearch() || (entityClasses != null && !entityClasses.isEmpty())) {
+    Set<Class<?>> classes = config.classes();
+    if (config.isDisableClasspathSearch() || (classes != null && !classes.isEmpty())) {
       // use classes we explicitly added via configuration
-      return new BootupClasses(entityClasses);
+      return new BootupClasses(classes);
     }
     return BootupClassPathSearch.search(config);
   }

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java

@@ -307,7 +307,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   public void start() {
     if (config.isRunMigration() && TenantMode.DB != config.getTenantMode()) {
-      final AutoMigrationRunner migrationRunner = ServiceUtil.service(AutoMigrationRunner.class);
+      AutoMigrationRunner migrationRunner = config.getServiceObject(AutoMigrationRunner.class);
+      if (migrationRunner == null) {
+        migrationRunner = ServiceUtil.service(AutoMigrationRunner.class);
+      }
       if (migrationRunner == null) {
         throw new IllegalStateException("No AutoMigrationRunner found. Probably ebean-migration is not in the classpath?");
       }
@@ -1088,7 +1091,13 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
   public <T> Set<T> findSet(Query<T> query, Transaction transaction) {
-    SpiOrmQueryRequest request = createQueryRequest(Type.SET, query, transaction);
+    SpiOrmQueryRequest request = buildQueryRequest(Type.SET, query, transaction);
+    request.resetBeanCacheAutoMode(false);
+    if ((transaction == null || !transaction.isSkipCache()) && request.getFromBeanCache()) {
+      // hit bean cache and got all results from cache
+      return request.beanCacheHitsAsSet();
+    }
+    request.prepareQuery();
     Object result = request.getFromQueryCache();
     if (result != null) {
       return (Set<T>) result;
@@ -1104,12 +1113,13 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
   public <K, T> Map<K, T> findMap(Query<T> query, @Nullable Transaction transaction) {
-    SpiOrmQueryRequest request = createQueryRequest(Type.MAP, query, transaction);
+    SpiOrmQueryRequest request = buildQueryRequest(Type.MAP, query, transaction);
     request.resetBeanCacheAutoMode(false);
     if ((transaction == null || !transaction.isSkipCache()) && request.getFromBeanCache()) {
       // hit bean cache and got all results from cache
       return request.beanCacheHitsAsMap();
     }
+    request.prepareQuery();
     Object result = request.getFromQueryCache();
     if (result != null) {
       return (Map<K, T>) result;

ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java

@@ -117,7 +117,10 @@ final class InitDataSource {
    * Attach DataSourceAlert via service loader if present.
    */
   private void attachAlert(DataSourceConfig dsConfig) {
-    DataSourceAlertFactory alertFactory = ServiceUtil.service(DataSourceAlertFactory.class);
+    DataSourceAlertFactory alertFactory = config.getServiceObject(DataSourceAlertFactory.class);
+    if (alertFactory == null) {
+      alertFactory = ServiceUtil.service(DataSourceAlertFactory.class);
+    }
     if (alertFactory != null) {
       dsConfig.setAlert(alertFactory.createAlert());
     }

ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java

@@ -144,7 +144,12 @@ public final class InternalConfiguration {
   }
 
   private <S> S service(Class<S> cls) {
-    return ServiceUtil.service(cls);
+    S service = config.getServiceObject(cls);
+    if (service != null) {
+      return service;
+    } else {
+      return ServiceUtil.service(cls);
+    }
   }
 
   private List<XmapEbean> readExternalMapping() {

ebean-core/src/main/java/io/ebeaninternal/server/core/NoopCallOriginFactory.java

@@ -10,7 +10,7 @@ final class NoopCallOriginFactory implements CallOriginFactory {
 
   private static final StackTraceElement E0 = new StackTraceElement("none", "none", "none", 0);
 
-  private final CallOrigin COMMON = new CallStack(new StackTraceElement[]{E0}, 0, 0);
+  private final CallOrigin COMMON = new CallStack(new Object[]{E0}, 0, 0);
 
   @Override
   public CallOrigin createCallOrigin() {

ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java

@@ -229,6 +229,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
       persistenceContext.beginIterate();
     }
     loadContext = new DLoadContext(this, secondaryQueries);
+    loadContext.useReferences(Type.ITERATE == query.getType());
   }
 
   /**
@@ -515,12 +516,12 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
       if (query.getType() == Type.MAP) {
         mergeCacheHitsToMap(result);
       } else {
-        mergeCacheHitsToList(result);
+        mergeCacheHitsToCollection(result);
       }
     }
   }
 
-  private void mergeCacheHitsToList(BeanCollection<T> result) {
+  private void mergeCacheHitsToCollection(BeanCollection<T> result) {
     for (T hit : cacheBeans) {
       result.internalAdd(hit);
     }
@@ -579,6 +580,15 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     return property;
   }
 
+  @Override
+  public Set<T> beanCacheHitsAsSet() {
+    OrderBy<T> orderBy = query.getOrderBy();
+    if (orderBy != null && !orderBy.isEmpty()) {
+      beanDescriptor.sort(cacheBeans, orderBy.toStringFormat());
+    }
+    return new LinkedHashSet<>(cacheBeans);
+  }
+
   @Override
   public boolean getFromBeanCache() {
     if (!query.isBeanCacheGet()) {
@@ -691,8 +701,8 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   /**
    * Log the SQL if the logLevel is appropriate.
    */
-  public void logSql(String sql) {
-    transaction.logSql(sql);
+  public void logSql(String msg, Object... args) {
+    transaction.logSql(msg, args);
   }
 
   /**