Version 13.17.4

#3031 Improve error message
Update README add end
2024-04-21 10:51:47 +00:00 · 2023-05-10 00:34:53 +12:00 · 2023-05-10 00:34:27 +12:00 · 2023-05-10 00:30:07 +12:00 · 2023-05-09 23:37:05 +12:00 · 2023-05-09 23:23:31 +12:00
734 changed files with 12417 additions and 4024 deletions
@@ -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:
@@ -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:
@@ -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:
@@ -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
-
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -3,7 +3,6 @@
 [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/ebean-orm/ebean/blob/master/LICENSE)
 [![Multi-JDK Build](https://github.com/ebean-orm/ebean/actions/workflows/multi-jdk-build.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/multi-jdk-build.yml)
-[![JDK 18-ea](https://github.com/ebean-orm/ebean/actions/workflows/jdk-18-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/jdk-18-ea.yml)

 ##### Build with database platforms
 [![H2Database](https://github.com/ebean-orm/ebean/actions/workflows/h2database.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/h2database.yml)
@@ -12,9 +11,9 @@
 [![MariaDB](https://github.com/ebean-orm/ebean/actions/workflows/mariadb.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/mariadb.yml)
 [![Oracle](https://github.com/ebean-orm/ebean/actions/workflows/oracle.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/oracle.yml)
 [![SqlServer](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver.yml)
+[![DB2 LUW](https://github.com/ebean-orm/ebean/actions/workflows/db2luw.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/db2luw.yml)
 [![Yugabyte](https://github.com/ebean-orm/ebean/actions/workflows/yugabyte.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/yugabyte.yml)

-
 ##### Build with Java Early Access versions
 [![ebean EA](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml)
 [![datasource EA](https://github.com/ebean-orm/ebean-datasource/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-datasource/actions/workflows/jdk-ea.yml)
@@ -121,3 +120,4 @@ To set this option as the global default for IntelliJ use:
 `Run - Edit Configurations -> Edit configuration templates -> JUnit -> modify options - Do not use module-path option`


+end
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,18 +35,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,18 +35,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-db2</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,18 +35,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-h2</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,18 +35,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-hana</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,18 +35,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,18 +35,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,18 +35,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,18 +35,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,18 +35,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,18 +35,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,18 +35,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,18 +35,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,18 +35,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean (all platforms)</name>
@@ -16,19 +16,31 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-jackson-jsonnode</artifactId>
+      <version>13.17.4</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-jackson-mapper</artifactId>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -41,18 +53,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

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

  <name>ebean api</name>
@@ -26,12 +26,6 @@
      <version>1.0</version>
    </dependency>

-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-config</artifactId>
-      <version>2.2</version>
-    </dependency>
-
    <!--
    Class retention Nonnull and Nullable annotations
    to assist with IDE auto-completion with Ebean API
@@ -42,6 +36,12 @@
      <version>1.1</version>
    </dependency>

+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-config</artifactId>
+      <version>3.1</version>
+    </dependency>
+
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>persistence-api</artifactId>
@@ -90,19 +90,22 @@
      <optional>true</optional>
    </dependency>

-    <dependency>
-      <groupId>javax.transaction</groupId>
-      <artifactId>jta</artifactId>
-      <version>1.1</version>
-      <optional>true</optional>
-    </dependency>
-
+    <!-- JAVAX-DEPENDENCY-START -->
    <dependency>
      <groupId>javax.servlet</groupId>
      <artifactId>javax.servlet-api</artifactId>
      <version>3.1.0</version>
      <optional>true</optional>
    </dependency>
+    <!-- JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START ___
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
+      <optional>true</optional>
+    </dependency>
+    ____ JAKARTA-DEPENDENCY-END -->

    <dependency>
      <groupId>io.avaje</groupId>
@@ -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) {
@@ -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.
   */
@@ -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.
   */
@@ -1,10 +1,6 @@
 package io.ebean;

-import io.ebean.search.Match;
-import io.ebean.search.MultiMatch;
-import io.ebean.search.TextCommonTerms;
-import io.ebean.search.TextQueryString;
-import io.ebean.search.TextSimple;
+import io.ebean.search.*;

 import java.util.Collection;
 import java.util.Map;
@@ -117,6 +113,11 @@ public interface ExpressionFactory {
   */
  Expression arrayIsNotEmpty(String propertyName);

+  /**
+   * Equal To the result of a sub-query.
+   */
+  Expression eq(String propertyName, Query<?> subQuery);
+
  /**
   * Equal To - property equal to the given value.
   */
@@ -127,6 +128,11 @@ public interface ExpressionFactory {
   */
  Expression eqOrNull(String propertyName, Object value);

+  /**
+   * Not Equal To the result of a sub-query.
+   */
+  Expression ne(String propertyName, Query<?> subQuery);
+
  /**
   * Not Equal To - property not equal to the given value.
   */
@@ -181,6 +187,23 @@ public interface ExpressionFactory {
   */
  Expression inRangeWith(String lowProperty, String highProperty, Object value);

+  /**
+   * A Property is in Range between 2 properties.
+   *
+   * <pre>{@code
+   *
+   *    .orderDate.inRangeWith(QOrder.Alias.product.startDate, QOrder.Alias.product.endDate)
+   *
+   *    // which equates to
+   *    product.startDate <= orderDate and (orderDate < product.endDate or product.endDate is null)
+   *
+   * }</pre>
+   *
+   * <p>
+   * This is a convenience expression combining a number of simple expressions.
+   */
+  Expression inRangeWithProperties(String propertyName, String lowProperty, String highProperty);
+
  /**
   * Between - property between the two given values.
   */
@@ -207,11 +230,21 @@ public interface ExpressionFactory {
   */
  Expression geOrNull(String propertyName, Object value);

+  /**
+   * Greater Than the result of a sub-query.
+   */
+  Expression gt(String propertyName, Query<?> subQuery);
+
  /**
   * Greater Than - property greater than the given value.
   */
  Expression gt(String propertyName, Object value);

+  /**
+   * Greater Than or Equal to the result of a sub-query.
+   */
+  Expression ge(String propertyName, Query<?> subQuery);
+
  /**
   * Greater Than or Equal to - property greater than or equal to the given
   * value.
@@ -234,11 +267,21 @@ public interface ExpressionFactory {
   */
  Expression leOrNull(String propertyName, Object value);

+  /**
+   * Less Than the result of a sub-query.
+   */
+  Expression lt(String propertyName, Query<?> subQuery);
+
  /**
   * Less Than - property less than the given value.
   */
  Expression lt(String propertyName, Object value);

+  /**
+   * Less Than or Equal to the result of a sub-query.
+   */
+  Expression le(String propertyName, Query<?> subQuery);
+
  /**
   * Less Than or Equal to - property less than or equal to the given value.
   */
@@ -376,6 +419,94 @@ public interface ExpressionFactory {
   */
  Expression inOrEmpty(String propertyName, Collection<?> values);

+  /**
+   * EXISTS a raw SQL SubQuery.
+   *
+   * @param sqlSubQuery The SQL SubQuery
+   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression exists(String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not EXISTS a raw SQL SubQuery.
+   *
+   * @param sqlSubQuery The SQL SubQuery
+   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression notExists(String sqlSubQuery, Object... bindValues);
+
+  /**
+   * IN a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression inSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not IN a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression notInSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression eqSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression neSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Greater Than or Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression geSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Greater Than a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression gtSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Less Than or Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression leSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Less Than a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression ltSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
  /**
   * Not In - property has a value in the array of values.
   */
@@ -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.
   */
@@ -1061,6 +1141,94 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> inPairs(Pairs pairs);

+  /**
+   * EXISTS a raw SQL SubQuery.
+   *
+   * @param sqlSubQuery The SQL SubQuery
+   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> exists(String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not EXISTS a raw SQL SubQuery.
+   *
+   * @param sqlSubQuery The SQL SubQuery
+   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> notExists(String sqlSubQuery, Object... bindValues);
+
+  /**
+   * IN a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> inSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not IN a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> notInSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> eqSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> neSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Greater Than a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> gtSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Greater Than or Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> geSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Less Than a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> ltSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Less Than or Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> leSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
  /**
   * In - using a subQuery.
   */
@@ -1683,4 +1851,8 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> endNot();

+  /**
+   * Clears the current expression list.
+   */
+  ExpressionList<T> clear();
 }
@@ -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) {
@@ -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);
  }
@@ -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();
+  }
 }
@@ -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;
+  }
+}
@@ -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);
+  }
+}
@@ -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>
@@ -77,12 +77,12 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
  /**
   * Return the bean that owns this collection.
   */
-  EntityBean getOwnerBean();
+  EntityBean owner();

  /**
   * Return the bean property name this collection represents.
   */
-  String getPropertyName();
+  String propertyName();

  /**
   * Check after the lazy load that the underlying collection is not null
@@ -99,7 +99,7 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
   * This is so that the filter can be applied on refresh.
   * </p>
   */
-  ExpressionList<?> getFilterMany();
+  ExpressionList<?> filterMany();

  /**
   * Set the filter that was used in building this collection.
@@ -154,7 +154,7 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
  /**
   * Returns the underlying collection of beans from the Set, Map or List.
   */
-  Collection<E> getActualDetails();
+  Collection<E> actualDetails();

  /**
   * Returns the underlying entries so for Maps this is a collection of
@@ -162,7 +162,7 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
   * <p>
   * For maps this returns the entrySet as we need the keys of the map.
   */
-  Collection<?> getActualEntries();
+  Collection<?> actualEntries();

  /**
   * return true if there are real rows held. Return false is this is using
@@ -195,7 +195,7 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
  /**
   * Return the current modify listening mode. Can be null for on newly created beans.
   */
-  ModifyListenMode getModifyListening();
+  ModifyListenMode modifyListening();

  /**
   * Add an object to the additions list.
@@ -217,13 +217,13 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
   * Return the list of objects added to the list set or map. These will used to
   * insert rows into the intersection table of a ManyToMany.
   */
-  Set<E> getModifyAdditions();
+  Set<E> modifyAdditions();

  /**
   * Return the list of objects removed from the list set or map. These will
   * used to delete rows from the intersection table of a ManyToMany.
   */
-  Set<E> getModifyRemovals();
+  Set<E> modifyRemovals();

  /**
   * Reset the set of additions and deletions. This is called after the
@@ -239,5 +239,5 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
  /**
   * Return a shallow copy of this collection that is modifiable.
   */
-  BeanCollection<E> getShallowCopy();
+  BeanCollection<E> shallowCopy();
 }
@@ -13,7 +13,7 @@ public interface BeanLoader {
  /**
   * Return the name of the associated Database.
   */
-  String getName();
+  String name();

  /**
   * Invoke the lazy loading for this bean.
@@ -8,15 +8,15 @@ public interface CallOrigin {
  /**
   * Return the top element. Typically the top stack element with class and line.
   */
-  String getTopElement();
+  String top();

  /**
   * Return the full description of the call origin.
   */
-  String getFullDescription();
+  String description();

  /**
   * Compute and return an origin key based on the query hash.
   */
-  String getOriginKey(int queryHash);
+  String key(int queryHash);
 }
@@ -2,6 +2,7 @@ package io.ebean.bean;

 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.List;

 import static io.ebean.util.EncodeB64.enc;

@@ -27,20 +28,27 @@ public final class CallStack implements Serializable, CallOrigin {

  private final String zeroHash;
  private final String pathHash;
-  private final StackTraceElement[] callStack;
+  private final Object[] callStack;
  private final int hc;

-  public CallStack(StackTraceElement[] callStack, int zeroHash, int pathHash) {
+  public CallStack(Object[] callStack, int zeroHash, int pathHash) {
    this.callStack = callStack;
+    this.hc = computeHashCode();
    this.zeroHash = enc(zeroHash);
    this.pathHash = enc(pathHash);
+  }
+
+  public CallStack(List<StackWalker.StackFrame> frames) {
+    this.callStack = frames.toArray(new Object[0]);
    this.hc = computeHashCode();
+    this.zeroHash = enc(callStack[0].toString().hashCode());
+    this.pathHash = enc(hc);
  }

  private int computeHashCode() {
    int hc = 0;
-    for (StackTraceElement element : callStack) {
-      hc = 92821 * hc + element.hashCode();
+    for (Object element : callStack) {
+      hc = 92821 * hc + element.toString().hashCode();
    }
    return hc;
  }
@@ -71,7 +79,7 @@ public final class CallStack implements Serializable, CallOrigin {
   * Return the first element of the call stack.
   */
  @Override
-  public String getTopElement() {
+  public String top() {
    return callStack[0].toString();
  }

@@ -79,7 +87,7 @@ public final class CallStack implements Serializable, CallOrigin {
   * Return the call stack lines appended with the given newLine string.
   */
  @Override
-  public String getFullDescription() {
+  public String description() {
    StringBuilder sb = new StringBuilder(400);
    for (int i = 0; i < callStack.length; i++) {
      if (i > 0) {
@@ -91,7 +99,7 @@ public final class CallStack implements Serializable, CallOrigin {
  }

  @Override
-  public String getOriginKey(int queryHash) {
+  public String key(int queryHash) {
    return enc(queryHash) + "." + zeroHash + "." + pathHash;
  }

@@ -17,12 +17,12 @@ public interface EntityBeanIntercept extends Serializable {
  /**
   * Return the 'owning' entity bean.
   */
-  EntityBean getOwner();
+  EntityBean owner();

  /**
   * Return the persistenceContext.
   */
-  PersistenceContext getPersistenceContext();
+  PersistenceContext persistenceContext();

  /**
   * Set the persistenceContext.
@@ -37,7 +37,7 @@ public interface EntityBeanIntercept extends Serializable {
  /**
   * Return the ownerId (IdClass).
   */
-  Object getOwnerId();
+  Object ownerId();

  /**
   * Set the ownerId (IdClass).
@@ -47,12 +47,12 @@ public interface EntityBeanIntercept extends Serializable {
  /**
   * Return the owning bean for an embedded bean.
   */
-  Object getEmbeddedOwner();
+  Object embeddedOwner();

  /**
   * Return the property index (for the parent) of this embedded bean.
   */
-  int getEmbeddedOwnerIndex();
+  int embeddedOwnerIndex();

  /**
   * Clear the getter callback.
@@ -229,7 +229,7 @@ public interface EntityBeanIntercept extends Serializable {
  /**
   * Return the original value that was changed via an update.
   */
-  Object getOrigValue(int propertyIndex);
+  Object origValue(int propertyIndex);

  /**
   * Finds the index position of a given property. Returns -1 if the
@@ -240,12 +240,12 @@ public interface EntityBeanIntercept extends Serializable {
  /**
   * Return the property name for the given property.
   */
-  String getProperty(int propertyIndex);
+  String property(int propertyIndex);

  /**
   * Return the number of properties.
   */
-  int getPropertyLength();
+  int propertyLength();

  /**
   * Set the loaded state of the property given it's name.
@@ -321,17 +321,17 @@ public interface EntityBeanIntercept extends Serializable {
  /**
   * Return the set of property names for a partially loaded bean.
   */
-  Set<String> getLoadedPropertyNames();
+  Set<String> loadedPropertyNames();

  /**
   * Return the array of flags indicating the dirty properties.
   */
-  boolean[] getDirtyProperties();
+  boolean[] dirtyProperties();

  /**
   * Return the set of dirty properties.
   */
-  Set<String> getDirtyPropertyNames();
+  Set<String> dirtyPropertyNames();

  /**
   * Recursively add dirty properties.
@@ -346,7 +346,7 @@ public interface EntityBeanIntercept extends Serializable {
  /**
   * Return a map of dirty properties with their new and old values.
   */
-  Map<String, ValuePair> getDirtyValues();
+  Map<String, ValuePair> dirtyValues();

  /**
   * Recursively add dirty properties.
@@ -361,7 +361,7 @@ public interface EntityBeanIntercept extends Serializable {
  /**
   * Return a dirty property hash taking into account embedded beans.
   */
-  StringBuilder getDirtyPropertyKey();
+  StringBuilder dirtyPropertyKey();

  /**
   * Add and return a dirty property hash.
@@ -371,22 +371,22 @@ public interface EntityBeanIntercept extends Serializable {
  /**
   * Return a loaded property hash.
   */
-  StringBuilder getLoadedPropertyKey();
+  StringBuilder loadedPropertyKey();

  /**
   * Return the loaded state for all the properties.
   */
-  boolean[] getLoaded();
+  boolean[] loaded();

  /**
   * Return the index of the property that triggered the lazy load.
   */
-  int getLazyLoadPropertyIndex();
+  int lazyLoadPropertyIndex();

  /**
   * Return the property that triggered the lazy load.
   */
-  String getLazyLoadProperty();
+  String lazyLoadProperty();

  /**
   * Load the bean when it is a reference.
@@ -497,7 +497,7 @@ public interface EntityBeanIntercept extends Serializable {
  /**
   * Return the sort order value for an order column.
   */
-  int getSortOrder();
+  int sortOrder();

  /**
   * Set the sort order value for an order column.
@@ -522,7 +522,7 @@ public interface EntityBeanIntercept extends Serializable {
  /**
   * Returns the loadErrors.
   */
-  Map<String, Exception> getLoadErrors();
+  Map<String, Exception> loadErrors();

  /**
   * Return true if the property has its changed state set.
@@ -25,12 +25,17 @@ public class InterceptReadOnly implements EntityBeanIntercept {
  }

  @Override
-  public EntityBean getOwner() {
+  public String toString() {
+    return "InterceptReadOnly{" + owner + '}';
+  }
+
+  @Override
+  public EntityBean owner() {
    return owner;
  }

  @Override
-  public PersistenceContext getPersistenceContext() {
+  public PersistenceContext persistenceContext() {
    return null;
  }

@@ -45,7 +50,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
  }

  @Override
-  public Object getOwnerId() {
+  public Object ownerId() {
    return null;
  }

@@ -55,12 +60,12 @@ public class InterceptReadOnly implements EntityBeanIntercept {
  }

  @Override
-  public Object getEmbeddedOwner() {
+  public Object embeddedOwner() {
    return null;
  }

  @Override
-  public int getEmbeddedOwnerIndex() {
+  public int embeddedOwnerIndex() {
    return 0;
  }

@@ -225,7 +230,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
  }

  @Override
-  public Object getOrigValue(int propertyIndex) {
+  public Object origValue(int propertyIndex) {
    return null;
  }

@@ -235,12 +240,12 @@ public class InterceptReadOnly implements EntityBeanIntercept {
  }

  @Override
-  public String getProperty(int propertyIndex) {
+  public String property(int propertyIndex) {
    return null;
  }

  @Override
-  public int getPropertyLength() {
+  public int propertyLength() {
    return 0;
  }

@@ -315,17 +320,17 @@ public class InterceptReadOnly implements EntityBeanIntercept {
  }

  @Override
-  public Set<String> getLoadedPropertyNames() {
+  public Set<String> loadedPropertyNames() {
    return Collections.emptySet();
  }

  @Override
-  public boolean[] getDirtyProperties() {
+  public boolean[] dirtyProperties() {
    return new boolean[0];
  }

  @Override
-  public Set<String> getDirtyPropertyNames() {
+  public Set<String> dirtyPropertyNames() {
    return Collections.emptySet();
  }

@@ -340,7 +345,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
  }

  @Override
-  public Map<String, ValuePair> getDirtyValues() {
+  public Map<String, ValuePair> dirtyValues() {
    return Collections.emptyMap();
  }

@@ -355,7 +360,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
  }

  @Override
-  public StringBuilder getDirtyPropertyKey() {
+  public StringBuilder dirtyPropertyKey() {
    return null;
  }

@@ -365,22 +370,22 @@ public class InterceptReadOnly implements EntityBeanIntercept {
  }

  @Override
-  public StringBuilder getLoadedPropertyKey() {
+  public StringBuilder loadedPropertyKey() {
    return null;
  }

  @Override
-  public boolean[] getLoaded() {
+  public boolean[] loaded() {
    return new boolean[0];
  }

  @Override
-  public int getLazyLoadPropertyIndex() {
+  public int lazyLoadPropertyIndex() {
    return 0;
  }

  @Override
-  public String getLazyLoadProperty() {
+  public String lazyLoadProperty() {
    return null;
  }

@@ -490,7 +495,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
  }

  @Override
-  public int getSortOrder() {
+  public int sortOrder() {
    return 0;
  }

@@ -515,7 +520,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
  }

  @Override
-  public Map<String, Exception> getLoadErrors() {
+  public Map<String, Exception> loadErrors() {
    return null;
  }

@@ -47,7 +47,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   */
  private static final byte FLAG_MUTABLE_HASH_SET = 16;

-  private transient final ReentrantLock lock = new ReentrantLock();
+  private final ReentrantLock lock = new ReentrantLock();
  private transient NodeUsageCollector nodeUsageCollector;
  private transient PersistenceContext persistenceContext;
  private transient BeanLoader beanLoader;
@@ -114,12 +114,30 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  }

  @Override
-  public EntityBean getOwner() {
+  public String toString() {
+    return "InterceptReadWrite@" + hashCode() + "{state=" + state +
+      (dirty ? " dirty;" : "") +
+      (forceUpdate ? " forceUpdate;" : "") +
+      (readOnly ? " readOnly;" : "") +
+      (disableLazyLoad ? " disableLazyLoad;" : "") +
+      (lazyLoadFailure ? " lazyLoadFailure;" : "") +
+      (fullyLoadedBean ? " fullyLoadedBean;" : "") +
+      (loadedFromCache ? " loadedFromCache;" : "") +
+      ", pc=" + System.identityHashCode(persistenceContext) +
+      ", flags=" + Arrays.toString(flags) +
+      (lazyLoadProperty > -1 ? (", lazyLoadProperty=" + lazyLoadProperty) : "") +
+      ", loader=" + beanLoader +
+      (ownerId != null ? (", ownerId=" + ownerId) : "") +
+      '}';
+  }
+
+  @Override
+  public EntityBean owner() {
    return owner;
  }

  @Override
-  public PersistenceContext getPersistenceContext() {
+  public PersistenceContext persistenceContext() {
    return persistenceContext;
  }

@@ -134,7 +152,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  }

  @Override
-  public Object getOwnerId() {
+  public Object ownerId() {
    return ownerId;
  }

@@ -144,12 +162,12 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  }

  @Override
-  public Object getEmbeddedOwner() {
+  public Object embeddedOwner() {
    return embeddedOwner;
  }

  @Override
-  public int getEmbeddedOwnerIndex() {
+  public int embeddedOwnerIndex() {
    return embeddedOwnerIndex;
  }

@@ -173,13 +191,13 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  public void setBeanLoader(BeanLoader beanLoader, PersistenceContext ctx) {
    this.beanLoader = beanLoader;
    this.persistenceContext = ctx;
-    this.ebeanServerName = beanLoader.getName();
+    this.ebeanServerName = beanLoader.name();
  }

  @Override
  public void setBeanLoader(BeanLoader beanLoader) {
    this.beanLoader = beanLoader;
-    this.ebeanServerName = beanLoader.getName();
+    this.ebeanServerName = beanLoader.name();
  }

  @Override
@@ -362,8 +380,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  @Override
  public void setEmbeddedLoaded(Object embeddedBean) {
    if (embeddedBean instanceof EntityBean) {
-      EntityBean eb = (EntityBean) embeddedBean;
-      eb._ebean_getIntercept().setLoaded();
+      ((EntityBean) embeddedBean)._ebean_getIntercept().setLoaded();
    }
  }

@@ -383,7 +400,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  }

  @Override
-  public Object getOrigValue(int propertyIndex) {
+  public Object origValue(int propertyIndex) {
    if ((flags[propertyIndex] & (FLAG_ORIG_VALUE_SET | FLAG_MUTABLE_HASH_SET)) == FLAG_MUTABLE_HASH_SET) {
      // mutable hash set, but not ORIG_VALUE
      setOriginalValue(propertyIndex, mutableInfo[propertyIndex].get());
@@ -396,7 +413,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {

  @Override
  public int findProperty(String propertyName) {
-    String[] names = owner._ebean_getPropertyNames();
+    final String[] names = owner._ebean_getPropertyNames();
    for (int i = 0; i < names.length; i++) {
      if (names[i].equals(propertyName)) {
        return i;
@@ -406,7 +423,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  }

  @Override
-  public String getProperty(int propertyIndex) {
+  public String property(int propertyIndex) {
    if (propertyIndex == -1) {
      return null;
    }
@@ -414,13 +431,13 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  }

  @Override
-  public int getPropertyLength() {
+  public int propertyLength() {
    return flags.length;
  }

  @Override
  public void setPropertyLoaded(String propertyName, boolean loaded) {
-    int position = findProperty(propertyName);
+    final int position = findProperty(propertyName);
    if (position == -1) {
      throw new IllegalArgumentException("Property " + propertyName + " not found");
    }
@@ -514,23 +531,23 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  }

  @Override
-  public Set<String> getLoadedPropertyNames() {
+  public Set<String> loadedPropertyNames() {
    if (fullyLoadedBean) {
      return null;
    }
-    Set<String> props = new LinkedHashSet<>();
+    final Set<String> props = new LinkedHashSet<>();
    for (int i = 0; i < flags.length; i++) {
      if ((flags[i] & FLAG_LOADED_PROP) != 0) {
-        props.add(getProperty(i));
+        props.add(property(i));
      }
    }
    return props;
  }

  @Override
-  public boolean[] getDirtyProperties() {
-    int len = getPropertyLength();
-    boolean[] dirties = new boolean[len];
+  public boolean[] dirtyProperties() {
+    final int len = propertyLength();
+    final boolean[] dirties = new boolean[len];
    for (int i = 0; i < len; i++) {
      // this, or an embedded property has been changed - recurse
      dirties[i] = (flags[i] & (FLAG_CHANGED_PROP + FLAG_EMBEDDED_DIRTY)) != 0;
@@ -539,31 +556,31 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  }

  @Override
-  public Set<String> getDirtyPropertyNames() {
-    Set<String> props = new LinkedHashSet<>();
+  public Set<String> dirtyPropertyNames() {
+    final Set<String> props = new LinkedHashSet<>();
    addDirtyPropertyNames(props, null);
    return props;
  }

  @Override
  public void addDirtyPropertyNames(Set<String> props, String prefix) {
-    int len = getPropertyLength();
+    final int len = propertyLength();
    for (int i = 0; i < len; i++) {
      if (isChangedProp(i)) {
        // the property has been changed on this bean
-        props.add((prefix == null ? getProperty(i) : prefix + getProperty(i)));
+        props.add((prefix == null ? property(i) : prefix + property(i)));
      } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
        // an embedded property has been changed - recurse
-        EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
-        embeddedBean._ebean_getIntercept().addDirtyPropertyNames(props, getProperty(i) + ".");
+        final EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
+        embeddedBean._ebean_getIntercept().addDirtyPropertyNames(props, property(i) + ".");
      }
    }
  }

  @Override
  public boolean hasDirtyProperty(Set<String> propertyNames) {
-    String[] names = owner._ebean_getPropertyNames();
-    int len = getPropertyLength();
+    final String[] names = owner._ebean_getPropertyNames();
+    final int len = propertyLength();
    for (int i = 0; i < len; i++) {
      if (isChangedProp(i)) {
        if (propertyNames.contains(names[i])) {
@@ -579,46 +596,46 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  }

  @Override
-  public Map<String, ValuePair> getDirtyValues() {
-    Map<String, ValuePair> dirtyValues = new LinkedHashMap<>();
+  public Map<String, ValuePair> dirtyValues() {
+    final Map<String, ValuePair> dirtyValues = new LinkedHashMap<>();
    addDirtyPropertyValues(dirtyValues, null);
    return dirtyValues;
  }

  @Override
  public void addDirtyPropertyValues(Map<String, ValuePair> dirtyValues, String prefix) {
-    int len = getPropertyLength();
+    final int len = propertyLength();
    for (int i = 0; i < len; i++) {
      if (isChangedProp(i)) {
        // the property has been changed on this bean
-        String propName = (prefix == null ? getProperty(i) : prefix + getProperty(i));
-        Object newVal = owner._ebean_getField(i);
-        Object oldVal = getOrigValue(i);
+        final String propName = (prefix == null ? property(i) : prefix + property(i));
+        final Object newVal = owner._ebean_getField(i);
+        final Object oldVal = origValue(i);
        if (notEqual(oldVal, newVal)) {
          dirtyValues.put(propName, new ValuePair(newVal, oldVal));
        }
      } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
        // an embedded property has been changed - recurse
-        EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
-        embeddedBean._ebean_getIntercept().addDirtyPropertyValues(dirtyValues, getProperty(i) + ".");
+        final EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
+        embeddedBean._ebean_getIntercept().addDirtyPropertyValues(dirtyValues, property(i) + ".");
      }
    }
  }

  @Override
  public void addDirtyPropertyValues(BeanDiffVisitor visitor) {
-    int len = getPropertyLength();
+    final int len = propertyLength();
    for (int i = 0; i < len; i++) {
      if (isChangedProp(i)) {
        // the property has been changed on this bean
-        Object newVal = owner._ebean_getField(i);
-        Object oldVal = getOrigValue(i);
+        final Object newVal = owner._ebean_getField(i);
+        final Object oldVal = origValue(i);
        if (notEqual(oldVal, newVal)) {
          visitor.visit(i, newVal, oldVal);
        }
      } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
        // an embedded property has been changed - recurse
-        EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
+        final EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
        visitor.visitPush(i);
        embeddedBean._ebean_getIntercept().addDirtyPropertyValues(visitor);
        visitor.visitPop();
@@ -627,8 +644,8 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  }

  @Override
-  public StringBuilder getDirtyPropertyKey() {
-    StringBuilder sb = new StringBuilder();
+  public StringBuilder dirtyPropertyKey() {
+    final StringBuilder sb = new StringBuilder();
    addDirtyPropertyKey(sb);
    return sb;
  }
@@ -638,24 +655,23 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
    if (sortOrder > 0) {
      sb.append("s,");
    }
-    int len = getPropertyLength();
+    final int len = propertyLength();
    for (int i = 0; i < len; i++) {
      if ((flags[i] & FLAG_CHANGED_PROP) != 0) { // we do not check against mutablecontent here.
        sb.append(i).append(',');
      } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
        // an embedded property has been changed - recurse
-        EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
        sb.append(i).append('[');
-        embeddedBean._ebean_getIntercept().addDirtyPropertyKey(sb);
+        ((EntityBean) owner._ebean_getField(i))._ebean_getIntercept().addDirtyPropertyKey(sb);
        sb.append(']');
      }
    }
  }

  @Override
-  public StringBuilder getLoadedPropertyKey() {
-    StringBuilder sb = new StringBuilder();
-    int len = getPropertyLength();
+  public StringBuilder loadedPropertyKey() {
+    final StringBuilder sb = new StringBuilder();
+    final int len = propertyLength();
    for (int i = 0; i < len; i++) {
      if (isLoadedProperty(i)) {
        sb.append(i).append(',');
@@ -665,8 +681,8 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  }

  @Override
-  public boolean[] getLoaded() {
-    boolean[] ret = new boolean[flags.length];
+  public boolean[] loaded() {
+    final boolean[] ret = new boolean[flags.length];
    for (int i = 0; i < ret.length; i++) {
      ret[i] = (flags[i] & FLAG_LOADED_PROP) != 0;
    }
@@ -674,13 +690,13 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  }

  @Override
-  public int getLazyLoadPropertyIndex() {
+  public int lazyLoadPropertyIndex() {
    return lazyLoadProperty;
  }

  @Override
-  public String getLazyLoadProperty() {
-    return getProperty(lazyLoadProperty);
+  public String lazyLoadProperty() {
+    return property(lazyLoadProperty);
  }

  @Override
@@ -690,7 +706,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
      if (beanLoader == null) {
        final Database database = DB.byName(ebeanServerName);
        if (database == null) {
-          throw new PersistenceException("Database [" + ebeanServerName + "] was not found?");
+          throw new PersistenceException(ebeanServerName == null ? "No registered default server" : "Database [" + ebeanServerName + "] is not registered");
        }
        // For stand alone reference bean or after deserialisation lazy load
        // using the ebeanServer. Synchronise only on the bean.
@@ -718,14 +734,14 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
    }
    if (lazyLoadFailure) {
      // failed when batch lazy loaded by another bean in the batch
-      throw new EntityNotFoundException("(Lazy) loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted");
+      throw new EntityNotFoundException("(Lazy) loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted. BeanLoader: " + beanLoader);
    }
    if (lazyLoadProperty == -1) {
      lazyLoadProperty = loadProperty;
      loader.loadBean(this);
      if (lazyLoadFailure) {
        // failed when lazy loading this bean
-        throw new EntityNotFoundException("Lazy loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted.");
+        throw new EntityNotFoundException("Lazy loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted. BeanLoader: " + beanLoader);
      }
      // bean should be loaded and intercepting now. setLoaded() has
      // been called by the lazy loading mechanism
@@ -820,7 +836,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
      loadBean(propertyIndex);
    }
    if (nodeUsageCollector != null) {
-      nodeUsageCollector.addUsed(getProperty(propertyIndex));
+      nodeUsageCollector.addUsed(property(propertyIndex));
    }
  }

@@ -969,7 +985,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  }

  @Override
-  public int getSortOrder() {
+  public int sortOrder() {
    return sortOrder;
  }

@@ -998,19 +1014,19 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
  }

  @Override
-  public Map<String, Exception> getLoadErrors() {
+  public Map<String, Exception> loadErrors() {
    if (loadErrors == null) {
      return Collections.emptyMap();
    }
    Map<String, Exception> ret = null;
-    int len = getPropertyLength();
+    int len = propertyLength();
    for (int i = 0; i < len; i++) {
-      Exception loadError = loadErrors[i];
+      final Exception loadError = loadErrors[i];
      if (loadError != null) {
        if (ret == null) {
          ret = new LinkedHashMap<>();
        }
-        ret.put(getProperty(i), loadError);
+        ret.put(property(i), loadError);
      }
    }
    return ret;
@@ -8,7 +8,6 @@ import java.util.Objects;
 * <p>
 * It represents a location relative to the root of an object graph and specific
 * to a query and call stack hash.
- * </p>
 */
 public final class ObjectGraphNode implements Serializable {

@@ -17,7 +16,7 @@ public final class ObjectGraphNode implements Serializable {
  /**
   * Identifies the origin.
   */
-  private final ObjectGraphOrigin originQueryPoint;
+  private final ObjectGraphOrigin origin;

  /**
   * The path relative to the root.
@@ -28,26 +27,26 @@ public final class ObjectGraphNode implements Serializable {
   * Create at a sub level.
   */
  public ObjectGraphNode(ObjectGraphNode parent, String path) {
-    this.originQueryPoint = parent.getOriginQueryPoint();
-    this.path = parent.getChildPath(path);
+    this.origin = parent.origin();
+    this.path = parent.childPath(path);
  }

  /**
   * Create an the root level.
   */
-  public ObjectGraphNode(ObjectGraphOrigin originQueryPoint, String path) {
-    this.originQueryPoint = originQueryPoint;
+  public ObjectGraphNode(ObjectGraphOrigin origin, String path) {
+    this.origin = origin;
    this.path = path;
  }

  /**
   * Return the origin query point.
   */
-  public ObjectGraphOrigin getOriginQueryPoint() {
-    return originQueryPoint;
+  public ObjectGraphOrigin origin() {
+    return origin;
  }

-  private String getChildPath(String childPath) {
+  private String childPath(String childPath) {
    if (path == null) {
      return childPath;
    } else if (childPath == null) {
@@ -60,18 +59,18 @@ public final class ObjectGraphNode implements Serializable {
  /**
   * Return the path relative to the root.
   */
-  public String getPath() {
+  public String path() {
    return path;
  }

  @Override
  public String toString() {
-    return "origin:" + originQueryPoint + " path[" + path + "]";
+    return "origin:" + origin + " path[" + path + "]";
  }

  @Override
  public int hashCode() {
-    int hc = 92821 * originQueryPoint.hashCode();
+    int hc = 92821 * origin.hashCode();
    hc = 92821 * hc + (path == null ? 0 : path.hashCode());
    return hc;
  }
@@ -87,6 +86,6 @@ public final class ObjectGraphNode implements Serializable {

    ObjectGraphNode e = (ObjectGraphNode) obj;
    return (Objects.equals(e.path, path))
-      && e.originQueryPoint.equals(originQueryPoint);
+      && e.origin.equals(origin);
  }
 }
@@ -28,38 +28,38 @@ public final class ObjectGraphOrigin implements Serializable {
    this.callOrigin = callOrigin;
    this.beanType = beanType;
    this.queryHash = queryHash;
-    this.key = callOrigin.getOriginKey(queryHash);
+    this.key = callOrigin.key(queryHash);
  }

  /**
   * The key includes the queryPlan hash and the callStack hash. This becomes
   * the unique identifier for a query point.
   */
-  public String getKey() {
+  public String key() {
    return key;
  }

  /**
   * The type of bean the query is fetching.
   */
-  public String getBeanType() {
+  public String beanType() {
    return beanType;
  }

  /**
   * The call stack involved.
   */
-  public CallOrigin getCallOrigin() {
+  public CallOrigin callOrigin() {
    return callOrigin;
  }

-  public String getTopElement() {
-    return callOrigin.getTopElement();
+  public String top() {
+    return callOrigin.top();
  }

  @Override
  public String toString() {
-    return "key[" + key + "] type[" + beanType + "] " + callOrigin.getTopElement();
+    return "key[" + key + "] type[" + beanType + "] " + callOrigin.top();
  }

  @Override
@@ -19,7 +19,7 @@ public abstract class SingleBeanLoader implements BeanLoader {
  }

  @Override
-  public String getName() {
+  public String name() {
    return database.name();
  }

@@ -1,7 +1,5 @@
 package io.ebean.bean;

-import io.ebean.common.BeanMap;
-
 import java.util.Collection;
 import java.util.IdentityHashMap;
 import java.util.Map;
@@ -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 {

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

@@ -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;
+  }
 }
@@ -59,17 +59,17 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
  }

  @Override
-  public EntityBean getOwnerBean() {
+  public EntityBean owner() {
    return ownerBean;
  }

  @Override
-  public String getPropertyName() {
+  public String propertyName() {
    return propertyName;
  }

  @Override
-  public ExpressionList<?> getFilterMany() {
+  public ExpressionList<?> filterMany() {
    return filterMany;
  }

@@ -129,7 +129,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
  }

  @Override
-  public ModifyListenMode getModifyListening() {
+  public ModifyListenMode modifyListening() {
    return modifyListenMode;
  }

@@ -182,7 +182,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
  }

  @Override
-  public Set<E> getModifyAdditions() {
+  public Set<E> modifyAdditions() {
    if (modifyHolder == null) {
      return null;
    } else {
@@ -191,7 +191,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
  }

  @Override
-  public Set<E> getModifyRemovals() {
+  public Set<E> modifyRemovals() {
    if (modifyHolder == null) {
      return null;
    } else {
@@ -213,7 +213,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
  }

  /**
-   * Copies all relevant properties for a clone. See {@link #getShallowCopy()}
+   * Copies all relevant properties for a clone. See {@link #shallowCopy()}
   */
  protected void setFromOriginal(AbstractBeanCollection<E> other) {
    this.disableLazyLoad = other.disableLazyLoad;
@@ -3,12 +3,7 @@ package io.ebean.common;
 import io.ebean.bean.*;

 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
+import java.util.*;

 /**
 * List capable of lazy loading and modification awareness.
@@ -73,7 +68,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
    if (list == null) {
      list = new ArrayList<>();
    }
-    list.addAll((Collection<? extends E>) other.getActualDetails());
+    list.addAll((Collection<? extends E>) other.actualDetails());
  }

  @Override
@@ -159,17 +154,17 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
  /**
   * Return the actual underlying list.
   */
-  public List<E> getActualList() {
+  public List<E> actualList() {
    return list;
  }

  @Override
-  public Collection<E> getActualDetails() {
+  public Collection<E> actualDetails() {
    return list;
  }

  @Override
-  public Collection<?> getActualEntries() {
+  public Collection<?> actualEntries() {
    return list;
  }

@@ -538,7 +533,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
  }

  @Override
-  public BeanCollection<E> getShallowCopy() {
+  public BeanCollection<E> shallowCopy() {
    BeanList<E> copy = new BeanList<>(new CopyOnFirstWriteList<>(list));
    copy.setFromOriginal(this);
    return copy;
@@ -5,11 +5,7 @@ import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.ToStringBuilder;

-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;

 /**
 * Map capable of lazy loading and modification aware.
@@ -71,7 +67,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
  public void loadFrom(BeanCollection<?> other) {
    BeanMap<K, E> otherMap = (BeanMap<K, E>) other;
    internalPutNull();
-    map.putAll(otherMap.getActualMap());
+    map.putAll(otherMap.actualMap());
  }

  public void internalPutNull() {
@@ -175,7 +171,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
  /**
   * Return the actual underlying map.
   */
-  public Map<K, E> getActualMap() {
+  public Map<K, E> actualMap() {
    return map;
  }

@@ -183,7 +179,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   * Returns the collection of beans (map values).
   */
  @Override
-  public Collection<E> getActualDetails() {
+  public Collection<E> actualDetails() {
    return map.values();
  }

@@ -191,7 +187,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   * Returns the map entrySet.
   */
  @Override
-  public Collection<?> getActualEntries() {
+  public Collection<?> actualEntries() {
    return map.entrySet();
  }

@@ -346,7 +342,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
  }

  @Override
-  public BeanCollection<E> getShallowCopy() {
+  public BeanCollection<E> shallowCopy() {
    BeanMap<K, E> copy = new BeanMap<>(new LinkedHashMap<>(map));
    copy.setFromOriginal(this);
    return copy;
@@ -67,7 +67,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
    if (set == null) {
      set = new LinkedHashSet<>();
    }
-    set.addAll((Collection<? extends E>) other.getActualDetails());
+    set.addAll((Collection<? extends E>) other.actualDetails());
  }

  @Override
@@ -155,17 +155,17 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
  /**
   * Return the actual underlying set.
   */
-  public Set<E> getActualSet() {
+  public Set<E> actualSet() {
    return set;
  }

  @Override
-  public Collection<E> getActualDetails() {
+  public Collection<E> actualDetails() {
    return set;
  }

  @Override
-  public Collection<?> getActualEntries() {
+  public Collection<?> actualEntries() {
    return set;
  }

@@ -382,7 +382,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
  }

  @Override
-  public BeanCollection<E> getShallowCopy() {
+  public BeanCollection<E> shallowCopy() {
    BeanSet<E> copy = new BeanSet<>(new LinkedHashSet<>(set));
    copy.setFromOriginal(this);
    return copy;
@@ -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 {
@@ -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;
  }

  /**
@@ -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);
  }
@@ -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);
  }
@@ -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.
   */
@@ -143,7 +143,7 @@ public final class ShutdownManager {
      }
      // shutdown any registered servers that have not
      // already been shutdown manually
-      for (Database server : databases) {
+      for (Database server : new ArrayList<>(databases)) {
        try {
          server.shutdown();
        } catch (Exception ex) {
@@ -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.
@@ -0,0 +1,29 @@
+package io.ebean.util;
+
+import java.util.function.Predicate;
+
+/**
+ * Provides a stack filter that excludes ebean and jdk code.
+ */
+public final class StackWalkFilter {
+
+  private static final Filter FILTER = new Filter();
+
+  /**
+   * Return a stack filter that excludes ebean and jdk code.
+   */
+  public static Predicate<StackWalker.StackFrame> filter() {
+    return FILTER;
+  }
+
+  private static class Filter implements Predicate<StackWalker.StackFrame> {
+
+    @Override
+    public boolean test(StackWalker.StackFrame stackFrame) {
+      return !stackFrame.getClassName().startsWith("io.ebean")
+        && !stackFrame.getClassName().startsWith("jdk.")
+        && !stackFrame.getClassName().startsWith("java.")
+        && !stackFrame.getMethodName().startsWith("_ebean_");
+    }
+  }
+}
@@ -0,0 +1 @@
+ebean-version: 143
@@ -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')");
+  }
+}
@@ -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);
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</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.2</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.2</version>
+      <version>13.17.4</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>
@@ -45,6 +59,13 @@
      <scope>test</scope>
    </dependency>

+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-ddl-generator</artifactId>
+      <version>13.17.4</version>
+      <scope>test</scope>
+    </dependency>
+
    <dependency>
      <groupId>io.avaje</groupId>
      <artifactId>junit</artifactId>
@@ -55,7 +76,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

@@ -66,11 +87,11 @@
      <plugin>
        <groupId>io.repaint.maven</groupId>
        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
+        <version>2.34</version>
        <extensions>true</extensions>
        <configuration>
          <tiles>
-            <tile>io.ebean.tile:enhancement:13.6.5</tile>
+            <tile>io.ebean.tile:enhancement:13.17.1</tile>
          </tiles>
        </configuration>
      </plugin>
@@ -97,7 +97,7 @@ public class AutoTuneDiffCollection {
    OrmQueryDetail profileDetail = entry.getDetail();

    // compare with the existing query tuning entry
-    OrmQueryDetail tuneDetail = queryTuner.get(point.getKey());
+    OrmQueryDetail tuneDetail = queryTuner.get(point.key());
    if (tuneDetail == null) {
      addToDocumentNewEntry(entry, point);

@@ -145,10 +145,10 @@ public class AutoTuneDiffCollection {
  private Origin createOrigin(AutoTuneCollection.Entry entry, ObjectGraphOrigin point, String query) {

    Origin origin = new Origin();
-    origin.setKey(point.getKey());
-    origin.setBeanType(point.getBeanType());
+    origin.setKey(point.key());
+    origin.setBeanType(point.beanType());
    origin.setDetail(entry.getDetail().asString());
-    origin.setCallStack(point.getCallOrigin().getFullDescription());
+    origin.setCallStack(point.callOrigin().description());
    origin.setOriginal(query);

    if (updateTuning) {
@@ -122,7 +122,7 @@ public class BaseQueryTuner {

    if (queryTuning) {
      // get current "tuned fetch" for this query point
-      TunedQueryInfo tuneInfo = tunedQueryInfoMap.get(origin.getOriginQueryPoint().getKey());
+      TunedQueryInfo tuneInfo = tunedQueryInfoMap.get(origin.origin().key());
      return tuneInfo != null && tuneInfo.tuneQuery(query);
    }
    return false;
@@ -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
@@ -46,9 +46,9 @@ public class ProfileManager implements ProfilingListener {

  @Override
  public boolean isProfileRequest(ObjectGraphNode origin, SpiQuery<?> query) {
-    ProfileOrigin profileOrigin = profileMap.get(origin.getOriginQueryPoint().getKey());
+    ProfileOrigin profileOrigin = profileMap.get(origin.origin().key());
    if (profileOrigin == null) {
-      profileMap.put(origin.getOriginQueryPoint().getKey(), createProfileOrigin(origin, query));
+      profileMap.put(origin.origin().key(), createProfileOrigin(origin, query));
      return true;
    } else {
      return profileOrigin.isProfile();
@@ -62,7 +62,7 @@ public class ProfileManager implements ProfilingListener {
   * query detail that is specified in the code (as the query might already be manually optimised).
   */
  private ProfileOrigin createProfileOrigin(ObjectGraphNode origin, SpiQuery<?> query) {
-    ProfileOrigin profileOrigin = new ProfileOrigin(origin.getOriginQueryPoint(), queryTuningAddVersion, profilingBase, profilingRate);
+    ProfileOrigin profileOrigin = new ProfileOrigin(origin.origin(), queryTuningAddVersion, profilingBase, profilingRate);
    // set the current query detail (fetch group) so that we can compare against profiling for new entries
    profileOrigin.setOriginalQuery(query.getDetail().asString());
    return profileOrigin;
@@ -76,7 +76,7 @@ public class ProfileManager implements ProfilingListener {
  @Override
  public void collectQueryInfo(ObjectGraphNode node, long beans, long micros) {
    if (node != null) {
-      ObjectGraphOrigin origin = node.getOriginQueryPoint();
+      ObjectGraphOrigin origin = node.origin();
      if (origin != null) {
        ProfileOrigin stats = getProfileOrigin(origin);
        stats.collectQueryInfo(node, beans, micros);
@@ -92,14 +92,14 @@ public class ProfileManager implements ProfilingListener {
   */
  @Override
  public void collectNodeUsage(NodeUsageCollector.State usageCollector) {
-    ProfileOrigin profileOrigin = getProfileOrigin(usageCollector.node().getOriginQueryPoint());
+    ProfileOrigin profileOrigin = getProfileOrigin(usageCollector.node().origin());
    profileOrigin.collectUsageInfo(usageCollector);
  }

  private ProfileOrigin getProfileOrigin(ObjectGraphOrigin originQueryPoint) {
    lock.lock();
    try {
-      return profileMap.computeIfAbsent(originQueryPoint.getKey(), k -> new ProfileOrigin(originQueryPoint, queryTuningAddVersion, profilingBase, profilingRate));
+      return profileMap.computeIfAbsent(originQueryPoint.key(), k -> new ProfileOrigin(originQueryPoint, queryTuningAddVersion, profilingBase, profilingRate));
    } finally {
      lock.unlock();
    }
@@ -111,7 +111,7 @@ public class ProfileManager implements ProfilingListener {
  public AutoTuneCollection profilingCollection(boolean reset) {
    AutoTuneCollection req = new AutoTuneCollection();
    for (ProfileOrigin origin : profileMap.values()) {
-      BeanDescriptor<?> desc = server.descriptorById(origin.getOrigin().getBeanType());
+      BeanDescriptor<?> desc = server.descriptorById(origin.getOrigin().beanType());
      if (desc != null) {
        origin.profilingCollection(desc, req, reset);
      }
@@ -134,7 +134,7 @@ public class ProfileOrigin {
   */
  public void collectQueryInfo(ObjectGraphNode node, long beansLoaded, long micros) {

-    String key = node.getPath();
+    String key = node.path();
    if (key == null) {
      key = "";
    }
@@ -153,7 +153,7 @@ public class ProfileOrigin {
   */
  public void collectUsageInfo(NodeUsageCollector.State profile) {
    if (!profile.isEmpty()) {
-      getNodeStats(profile.node().getPath()).collectUsageInfo(profile);
+      getNodeStats(profile.node().path()).collectUsageInfo(profile);
    }
  }

@@ -1,28 +1,37 @@
 package org.tests.autofetch;

+import io.ebean.DB;
+import org.junit.jupiter.api.Test;
+import org.tests.model.basic.Order;
+
+import java.util.List;
+
 public class MainAutoQueryTune1 {

-//  public static void main(String[] args) {
-//
-//    ResetBasicData.reset();
-//
-//    MainAutoQueryTune1 me = new MainAutoQueryTune1();
-//    me.tuneJoin();
-//  }
-//
-//  private void tuneJoin() {
-//    List<Order> list = Ebean.find(Order.class)
-//      .setAutoTune(true)
-//      .fetch("customer")
-//      .where()
-//      .eq("status", Order.Status.NEW)
-//      .eq("customer.name", "Rob")
-//      .order().asc("id")
-//      .findList();
-//
-//    for (Order order : list) {
-//      order.getId();
-//      order.getOrderDate();
-//    }
-//  }
+  public static void main(String[] args) {
+    MainAutoQueryTune1 me = new MainAutoQueryTune1();
+    me.tuneJoin();
+  }
+
+  @Test
+  void tuneJoin() {
+    TestData.load();
+
+    List<Order> list = DB.find(Order.class)
+      .setAutoTune(true)
+      //.fetch("customer")
+      .where()
+      .eq("status", Order.Status.NEW)
+      .eq("customer.name", "Rob")
+      .order().asc("id")
+      .findList();
+
+    for (Order order : list) {
+      order.getId();
+      order.getOrderDate();
+      order.getCustomer().getName();
+      order.getCustomer().getNote();
+    }
+  }
+
 }
@@ -0,0 +1,25 @@
+package org.tests.autofetch;
+
+import io.ebean.DB;
+import org.tests.model.basic.Address;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.Order;
+
+import java.time.LocalDate;
+
+public class TestData {
+
+  static void load() {
+    if (DB.find(Order.class).findCount() > 0) {
+      return;
+    }
+
+    var customer = new Customer("Rob");
+    customer.setBillingAddress(new Address("l0", "city0"));
+    DB.save(customer);
+
+    var order = new Order(customer);
+    order.setOrderDate(LocalDate.now());
+    DB.save(order);
+  }
+}
@@ -1,17 +1,21 @@
 package org.tests.model.basic;

 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.Table;

@Entity
-@Table(name = "address")
+@Table(name = "o_address")
 public class Address extends BaseModel {

  String line1;
  String line2;
  String city;

+  public Address(String line1, String city) {
+    this.line1 = line1;
+    this.city = city;
+  }
+
  public String getLine1() {
    return line1;
  }
@@ -1,5 +1,8 @@
 package org.tests.model.basic;

+import io.ebean.annotation.NotNull;
+
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
@@ -8,13 +11,17 @@ import javax.persistence.Table;
@Table(name = "o_customer")
 public class Customer extends BaseModel {

-  String name;
+  @NotNull String name;

  String note;

-  @ManyToOne
+  @ManyToOne(cascade = CascadeType.PERSIST)
  Address billingAddress;

+  public Customer(String name) {
+    this.name = name;
+  }
+
  public String getName() {
    return name;
  }
@@ -1,21 +1,10 @@
 package org.tests.model.basic;

-import io.ebean.Model;
-import io.ebean.annotation.WhenModified;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Version;
-import java.sql.Timestamp;
+import javax.persistence.*;
 import java.time.LocalDate;

@Entity
-@Table(name = "orders")
+@Table(name = "o_order")
 public class Order extends BaseModel {

  public enum Status {
@@ -32,7 +21,11 @@ public class Order extends BaseModel {
  LocalDate orderDate;

  @ManyToOne(cascade = CascadeType.PERSIST)
-  Customer customer;
+  final Customer customer;
+
+  public Order(Customer customer) {
+    this.customer = customer;
+  }

  public Status getStatus() {
    return status;
@@ -54,7 +47,4 @@ public class Order extends BaseModel {
    return customer;
  }

-  public void setCustomer(Customer customer) {
-    this.customer = customer;
-  }
 }
@@ -9,3 +9,9 @@ datasource.h2.url=jdbc:h2:mem:h2AutoTune
 datasource.pg.username=sa
 datasource.pg.password=
 datasource.pg.url=jdbc:h2:mem:h2AutoTune
+
+ebean.autoTune.profiling=true
+ebean.maxCallStack=10
+
+ebean.autoTune.queryTuning=true
+ebean.autoTune.queryTuningFile=autotune/my-autotune.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<autotune xmlns="http://ebean-orm.github.io/xml/ns/autotune">
+  <origin key="BmouL7.Bn_jgL.BNY1QD" beanType="org.tests.model.basic.Order" detail="select (orderDate) fetch customer (name,note)" original="">
+    <callStack>org.tests.autofetch.MainAutoQueryTune1.tuneJoin(MainAutoQueryTune1.java:27)
+      org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:725)
+      org.junit.jupiter.engine.execution.MethodInvocation.proceed(MethodInvocation.java:60)
+      org.junit.jupiter.engine.execution.InvocationInterceptorChain$ValidatingInvocation.proceed(InvocationInterceptorChain.java:131)
+      org.junit.jupiter.engine.extension.TimeoutExtension.intercept(TimeoutExtension.java:149)
+      org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestableMethod(TimeoutExtension.java:140)
+      org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestMethod(TimeoutExtension.java:84)
+      org.junit.jupiter.engine.execution.ExecutableInvoker$ReflectiveInterceptorCall.lambda$ofVoidMethod$0(ExecutableInvoker.java:115)
+      org.junit.jupiter.engine.execution.ExecutableInvoker.lambda$invoke$0(ExecutableInvoker.java:105)
+      org.junit.jupiter.engine.execution.InvocationInterceptorChain$InterceptedInvocation.proceed(InvocationInterceptorChain.java:106)</callStack>
+  </origin>
+</autotune>
@@ -12,10 +12,11 @@
    <appender-ref ref="STDOUT"/>
  </root>

+  <logger name="io.ebeaninternal" level="DEBUG"/>
  <logger name="io.ebean.docker" level="TRACE"/>
  <!--  <logger name="io.ebean.DDL" level="DEBUG"/>-->
-  <!--  <logger name="io.ebean.SQL" level="TRACE"/>-->
+    <logger name="io.ebean.SQL" level="TRACE"/>
  <!--  <logger name="io.ebean.TXN" level="TRACE"/>-->
-  <!--  <logger name="io.ebean.SUM" level="TRACE"/>-->
+    <logger name="io.ebean.SUM" level="TRACE"/>

 </configuration>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean bom</name>
@@ -89,94 +89,180 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-joda-time</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-jackson-jsonnode</artifactId>
+        <version>13.17.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-jackson-mapper</artifactId>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-autotune</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
        <scope>test</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>13.9.2</version>
+        <version>13.17.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-spring-txn</artifactId>
+        <version>13.17.4</version>
+      </dependency>
+
+      <!-- platforms -->
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-clickhouse</artifactId>
+        <version>13.17.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-db2</artifactId>
+        <version>13.17.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-h2</artifactId>
+        <version>13.17.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-hana</artifactId>
+        <version>13.17.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-mariadb</artifactId>
+        <version>13.17.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-mysql</artifactId>
+        <version>13.17.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-nuodb</artifactId>
+        <version>13.17.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-oracle</artifactId>
+        <version>13.17.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-postgres</artifactId>
+        <version>13.17.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-sqlite</artifactId>
+        <version>13.17.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-sqlserver</artifactId>
+        <version>13.17.4</version>
      </dependency>

    </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</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>
@@ -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);
+  }
 }
@@ -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);
+}
@@ -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();
+}
@@ -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;
+  }
+}
@@ -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);
+
+}
@@ -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);
+
+}
@@ -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;

@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-core</artifactId>
@@ -15,14 +15,14 @@

  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.2</tag>
+    <tag>HEAD</tag>
  </scm>

  <dependencies>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -46,13 +46,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -135,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>

@@ -143,21 +143,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.2</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

@@ -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");
 }
@@ -23,4 +23,9 @@ public interface LoadBeanBuffer {

  void configureQuery(SpiQuery<?> query, String lazyLoadProperty);

+  boolean isCache();
+
+  void loadingStarted();
+
+  void loadingStopped();
 }
@@ -6,11 +6,14 @@ import io.ebeaninternal.api.SpiQuery.Mode;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;

+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
 * Request for loading ManyToOne and OneToOne relationships.
 */
@@ -21,12 +24,16 @@ public final class LoadBeanRequest extends LoadRequest {
  private final String lazyLoadProperty;
  private final boolean loadCache;
  private final boolean alreadyLoaded;
+  private String triggerEbi;
+  private String batchBefore;
+  private List<Object> queryIds;

  /**
   * Construct for lazy load request.
   */
  public LoadBeanRequest(LoadBeanBuffer loadBuffer, EntityBeanIntercept ebi, boolean loadCache) {
-    this(loadBuffer, null, true, ebi.getLazyLoadProperty(), ebi.isLoaded(), loadCache || ebi.isLoadedFromCache());
+    this(loadBuffer, null, true, ebi.lazyLoadProperty(), ebi.isLoaded(), loadCache || ebi.isLoadedFromCache());
+    this.triggerEbi = String.valueOf(ebi);
  }

  /**
@@ -56,20 +63,23 @@ public final class LoadBeanRequest extends LoadRequest {
  }

  /**
-   * Return the batch of beans to actually load.
+   * Return true if the batch is empty.
   */
-  public Set<EntityBeanIntercept> batch() {
-    return batch;
+  public boolean checkEmpty() {
+    loadBuffer.loadingStarted();
+    batchBefore = String.valueOf(batch);
+    queryIds = ids();
+    return batch.isEmpty();
  }

  /**
   * 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();
+  private 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()));
+      idList.add(desc.getId(ebi.owner()));
    }
    return idList;
  }
@@ -77,10 +87,10 @@ public final class LoadBeanRequest extends LoadRequest {
  /**
   * Configure the query for lazy loading execution.
   */
-  public void configureQuery(SpiQuery<?> query, List<Object> idList) {
+  public void configureQuery(SpiQuery<?> query) {
    query.setMode(Mode.LAZYLOAD_BEAN);
    query.setPersistenceContext(loadBuffer.persistenceContext());
-    query.setLoadDescription(lazy ? "+lazy" : "+query", description());
+    query.setLoadDescription(mode(), description());
    if (lazy) {
      query.setLazyLoadBatchSize(loadBuffer.batchSize());
      if (alreadyLoaded) {
@@ -93,17 +103,22 @@ public final class LoadBeanRequest extends LoadRequest {
    if (loadCache) {
      query.setBeanCacheMode(CacheMode.PUT);
    }
-    if (idList.size() == 1) {
-      query.where().idEq(idList.get(0));
+    if (queryIds.size() == 1) {
+      query.where().idEq(queryIds.get(0));
    } else {
-      query.where().idIn(idList);
+      query.where().idIn(queryIds);
    }
  }

+  private String mode() {
+    return lazy ? "+lazy" : loadBuffer.isCache() ? "+cache" : "+query";
+  }
+
  /**
   * Load the beans into the L2 cache if that is requested and check for load failures due to deletes.
   */
  public void postLoad(List<?> list) {
+    loadBuffer.loadingStopped();
    Set<Object> loadedIds = new HashSet<>();
    BeanDescriptor<?> desc = loadBuffer.descriptor();
    // collect Ids and maybe load bean cache
@@ -114,13 +129,31 @@ 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
-        Object id = desc.getId(ebi.getOwner());
+        Object id = desc.getId(ebi.owner());
        if (!loadedIds.contains(id)) {
-          // assume this is logically deleted (hence not found)
-          desc.markAsDeleted(ebi.getOwner());
+          if (queryIds.contains(id)) {
+            // assume this is logically deleted (hence not found)
+            desc.markAsDeleted(ebi.owner());
+          } else {
+            // unexpected, added to batch during loading
+            missedIds.add(id);
+            missed.add(ebi);
+          }
+        }
+        if (!missed.isEmpty()) {
+          if (CoreLog.markedAsDeleted.isLoggable(DEBUG)) {
+            CoreLog.markedAsDeleted.log(DEBUG, "Loaded bean batch triggered by ebi:{0} property:{1}", triggerEbi, lazyLoadProperty);
+            CoreLog.markedAsDeleted.log(DEBUG, "Loaded bean batch BEFORE {0}", batchBefore);
+            CoreLog.markedAsDeleted.log(DEBUG, "Loaded bean batch AFTER {0}", batch);
+            String msg = MessageFormat.format("Bean added to batch during load for {0} missedIds:{1} queryIds:{2} missed:{3}",
+              beanType(), missedIds, queryIds, missed);
+            CoreLog.markedAsDeleted.log(DEBUG, msg, new RuntimeException("LoadBeanRequest - Bean added to batch during load"));
+          }
        }
      }
    }
@@ -16,7 +16,7 @@ public interface LoadContext {
  /**
   * Return the minimum batch size when using QueryIterator with query joins.
   */
-  int getSecondaryQueriesMinBatchSize();
+  int secondaryQueriesMinBatchSize();

  /**
   * Execute any secondary (+query) queries if there are any defined.
@@ -29,12 +29,12 @@ public interface LoadContext {
  /**
   * Return the node for a given path which is used by AutoTune profiling.
   */
-  ObjectGraphNode getObjectGraphNode(String path);
+  ObjectGraphNode objectGraphNode(String path);

  /**
   * Return the persistence context used by this query and future lazy loading.
   */
-  PersistenceContext getPersistenceContext();
+  PersistenceContext persistenceContext();

  /**
   * Register a Bean for lazy loading.
@@ -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);
 }
@@ -6,26 +6,40 @@ 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();

-  BeanPropertyAssocMany<?> getBeanProperty();
+  /**
+   * Get the <code>i</code>th element from buffer. This can be null.
+   */
+  BeanCollection<?> get(int i);

-  ObjectGraphNode getObjectGraphNode();
+  /**
+   * Removes an element from the buffer. This will NOT affect size.
+   */
+  boolean removeFromBuffer(BeanCollection<?> collection);

-  BeanDescriptor<?> getBeanDescriptor();
+  BeanPropertyAssocMany<?> beanProperty();

-  PersistenceContext getPersistenceContext();
+  ObjectGraphNode objectGraphNode();

-  String getFullPath();
+  BeanDescriptor<?> descriptor();
+
+  PersistenceContext persistenceContext();
+
+  String fullPath();

  void configureQuery(SpiQuery<?> query);

@@ -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,49 +20,60 @@ 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
  public Class<?> beanType() {
-    return loadContext.getBeanDescriptor().type();
+    return loadContext.descriptor().type();
  }

  public String description() {
-    return loadContext.getFullPath();
+    return loadContext.fullPath();
  }

  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.owner()));
+        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.owner()));
+      originCollection.setLoader(server); // don't use the load buffer again
    }
    if (many.targetDescriptor().isPadInExpression()) {
      BindPadding.padIds(idList);
@@ -70,7 +82,7 @@ public final class LoadManyRequest extends LoadRequest {
  }

  private BeanPropertyAssocMany<?> many() {
-    return loadContext.getBeanProperty();
+    return loadContext.beanProperty();
  }

  public SpiQuery<?> createQuery(SpiEbeanServer server) {
@@ -88,10 +100,10 @@ public final class LoadManyRequest extends LoadRequest {
    }
    query.setLazyLoadForParents(many);
    many.addWhereParentIdIn(query, parentIdList(server), loadContext.isUseDocStore());
-    query.setPersistenceContext(loadContext.getPersistenceContext());
+    query.setPersistenceContext(loadContext.persistenceContext());
    query.setLoadDescription(lazy ? "+lazy" : "+query", description());
    if (lazy) {
-      query.setLazyLoadBatchSize(loadContext.getBatchSize());
+      query.setLazyLoadBatchSize(loadContext.batchSize());
    } else {
      query.setBeanCacheMode(CacheMode.OFF);
    }
@@ -108,19 +120,22 @@ public final class LoadManyRequest extends LoadRequest {
   * After the query execution check for empty collections and load L2 cache if desired.
   */
  public void postLoad() {
-    BeanDescriptor<?> desc = loadContext.getBeanDescriptor();
+    BeanDescriptor<?> desc = loadContext.descriptor();
    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.owner();
+            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.owner()));
        }
-      } else if (loadCache && many.isUseCache()) {
-        desc.cacheManyPropPut(many, bc, desc.getId(bc.getOwnerBean()));
      }
    }
  }
--- a/Show More
+++ b/Show More