Fix for #3381 - Empty OneToMany when overflowing LazyLoadBatchSize and mixed queries

14.0.0 via #3295 introduced this bug.

 #3295 introduced a behaviour where bulk updates clear the persistence context. Now the lazy loading of a BeanCollection works with an assumption that the "parent bean" is in the persistence context (and this assumption is broken with that change for this test case). That is, the bulk update is clearing the persistence context - removing the parent bean BEFORE the lazy loading is invoked ... and that doesn't then work because the parent bean isn't in the persistence context.

 This fix means that when lazy loading many's, the parent beans are putIfAbsent into the persistence context.

.github/workflows/build.yml

@@ -2,7 +2,6 @@
 name: Build
 
 on:
-  workflow_dispatch:
   pull_request:
   push:
     branches: master
@@ -21,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'zulu'
     - name: Maven cache
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.github/workflows/db2luw.yml

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

.github/workflows/h2database.yml

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

.github/workflows/jdk-ea.yml

@@ -16,18 +16,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [GA,EA,23]
+        java_version: [GA,EA]
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v4
+    - 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@v4
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.github/workflows/mariadb.yml

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

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

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

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

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

.github/workflows/mysql.yml

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

.github/workflows/oracle.yml

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

.github/workflows/postgres.yml

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

.github/workflows/sqlserver-2019.yml

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

.github/workflows/sqlserver.yml

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

.github/workflows/valhalla.yml

@@ -1,41 +0,0 @@
-name: Valhalla EA
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '39 2 * * 3'
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [valhalla]
-        os: [ubuntu-latest]
-
-    steps:
-      - uses: actions/checkout@v4
-      - 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@v4
-        env:
-          cache-name: maven-cache
-        with:
-          path:
-            ~/.m2
-          key: build-${{ env.cache-name }}
-      - name: Maven version
-        run: mvn --version
-#      - name: Prepare
-#        run: ./jakarta-to-valhalla.sh
-      - name: Build with Maven
-        run: mvn package

.github/workflows/yugabyte.yml

@@ -4,7 +4,7 @@ name: Yugabyte
 on:
   workflow_dispatch:
   schedule:
-    - cron: '10 3 * * 3'
+    - cron: '10 3 * * *'
 
 jobs:
   build:
@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'adopt'
     - name: Maven cache
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

README.md

@@ -56,7 +56,12 @@ Work at the highest level of abstraction and drop down levels as needed.
     <tr>
       <td align="center" valign="middle">
         <a href="https://www.foconis.de/" target="_blank">
-          <img width="222px" src="https://group.foconis.com/download/ci/logo/png-72dpi/logo-quer/foconis-analytics-quer.png">
+          <img width="222px" src="https://www.foconis.de/templates/yootheme/cache/foconis_logo_322-709da1de.png">
+        </a>
+      </td>
+      <td align="center" valign="middle">
+        <a href="https://www.payintech.com/" target="_blank">
+          <img width="222px" src="https://ebean.io/images/sponsor_PayinTech-logo-noir.png">
         </a>
       </td>
       <td align="center" valign="middle">

composites/ebean-clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
   </dependencies>

composites/ebean-cockroach/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
   </dependencies>

composites/ebean-db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
   </dependencies>

composites/ebean-h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
   </dependencies>

composites/ebean-hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
   </dependencies>

composites/ebean-mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
   </dependencies>

composites/ebean-mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
   </dependencies>

composites/ebean-net-postgis/pom.xml

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

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

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

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

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

composites/ebean-nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
   </dependencies>

composites/ebean-oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
   </dependencies>

composites/ebean-postgis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -47,19 +47,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-postgis-types</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>

composites/ebean-postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
   </dependencies>

composites/ebean-yugabyte/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
   </dependencies>

composites/ebean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -60,13 +60,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>14.10.0</version>
+      <version>14.0.2</version>
     </dependency>
 
   </dependencies>

composites/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
   </parent>
 
   <artifactId>composites</artifactId>
@@ -24,7 +24,6 @@
     <module>ebean-oracle</module>
     <module>ebean-postgres</module>
     <module>ebean-postgis</module>
-    <module>ebean-net-postgis</module>
 <!--    <module>sqlanywhere</module>-->
     <module>ebean-sqlite</module>
     <module>ebean-sqlserver</module>

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.10.0</version>
+    <version>14.0.2</version>
   </parent>
 
   <name>ebean api</name>
@@ -26,10 +26,14 @@
       <version>1.0</version>
     </dependency>
 
+    <!--
+    Class retention Nonnull and Nullable annotations
+    to assist with IDE auto-completion with Ebean API
+    -->
     <dependency>
-      <groupId>org.jspecify</groupId>
-      <artifactId>jspecify</artifactId>
-      <version>1.0.0</version>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-lang</artifactId>
+      <version>1.1</version>
     </dependency>
 
     <dependency>
@@ -86,6 +90,23 @@
       <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 -->
+
   </dependencies>
 
   <build>

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

@@ -1,9 +1,10 @@
 package io.ebean;
 
-import org.jspecify.annotations.NullMarked;
+import io.avaje.lang.NonNullApi;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -19,7 +20,7 @@ import java.util.concurrent.TimeUnit;
  * This also propagates MDC context from the current thread to the
  * background task if defined.
  */
-@NullMarked
+@NonNullApi
 public interface BackgroundExecutor {
 
   /**

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

@@ -1,25 +0,0 @@
-package io.ebean;
-
-/**
- * Unsupported access of a property on an entity bean.
- * <p>
- * Attempted a lazy load operation on a bean that has disabled lazy loading
- * or attempt to mutate an unmodifiable bean.
- */
-public class BeanAccessException extends UnsupportedOperationException {
-  private static final long serialVersionUID = 1;
-
-  /**
-   * Create with no message.
-   */
-  public BeanAccessException() {
-    super();
-  }
-
-  /**
-   * Create with message.
-   */
-  public BeanAccessException(String message) {
-    super(message);
-  }
-}

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

@@ -1,7 +1,7 @@
 package io.ebean;
 
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import java.util.List;
 import java.util.Optional;
 
@@ -30,7 +30,7 @@ import java.util.Optional;
  *
  * @see BeanRepository
  */
-@NullMarked
+@NonNullApi
 public abstract class BeanFinder<I,T> {
 
   protected final Database database;

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

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import org.jspecify.annotations.NullMarked;
+import io.avaje.lang.NonNullApi;
 import io.ebean.bean.EntityBean;
 
 import java.util.Collection;
@@ -36,7 +36,7 @@ import java.util.Collection;
  * @param <I> The ID type
  * @param <T> The Bean type
  */
-@NullMarked
+@NonNullApi
 public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
 
   /**

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

@@ -89,7 +89,12 @@ public interface BeanState {
    * <p>
    * If a setter is called on a readOnly bean it will throw an exception.
    */
-  boolean isUnmodifiable();
+  boolean isReadOnly();
+
+  /**
+   * Set the readOnly status for the bean.
+   */
+  void setReadOnly(boolean readOnly);
 
   /**
    * Advanced - Used to programmatically build a partially or fully loaded

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

@@ -1,7 +1,7 @@
 package io.ebean;
 
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.plugin.Property;
@@ -57,7 +57,7 @@ import java.util.concurrent.Callable;
  *
  * }</pre>
  */
-@NullMarked
+@NonNullApi
 public final class DB {
 
   private static final DbContext context = DbContext.getInstance();
@@ -605,7 +605,7 @@ public final class DB {
    *   // find orders and their customers
    *   List<Order> list = DB.find(Order.class)
    *     .fetch("customer")
-   *     .orderBy("id")
+   *     .order("id")
    *     .findList();
    *
    *   // sort by customer name ascending, then by order shipDate

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

@@ -1,50 +0,0 @@
-package io.ebean;
-
-final class DPaging implements Paging {
-
-  static final Paging NONE = new DPaging(0, 0, null);
-
-  static Paging build(int pgIndex, int pgSize, OrderBy<?> orderBy) {
-    return new DPaging(pgIndex, pgSize, orderBy);
-  }
-
-  static Paging build(int pgIndex, int pgSize) {
-    return new DPaging(pgIndex, pgSize, null);
-  }
-
-  private final int pageNumber;
-  private final int pageSize;
-  private final OrderBy<?> orderBy;
-
-  DPaging(int pageNumber, int pageSize, OrderBy<?> orderBy) {
-    this.pageNumber = pageNumber;
-    this.pageSize = pageSize;
-    this.orderBy = orderBy;
-  }
-
-  @Override
-  public int pageIndex() {
-    return pageNumber;
-  }
-
-  @Override
-  public int pageSize() {
-    return pageSize;
-  }
-
-  @Override
-  public OrderBy<?> orderBy() {
-    return orderBy;
-  }
-
-  @Override
-  public Paging withPage(int pageNumber) {
-    return new DPaging(pageNumber, pageSize, orderBy);
-  }
-
-  @Override
-  public Paging withOrderBy(String orderByClause) {
-    return new DPaging(pageNumber, pageSize, OrderBy.of(orderByClause));
-  }
-
-}

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

@@ -1,7 +1,7 @@
 package io.ebean;
 
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
@@ -83,7 +83,7 @@ import java.util.concurrent.Callable;
  * @see DatabaseFactory
  * @see DatabaseConfig
  */
-@NullMarked
+@NonNullApi
 public interface Database {
 
   /**
@@ -400,7 +400,7 @@ public interface Database {
    *   // find orders and their customers
    *   List<Order> list = database.find(Order.class)
    *     .fetch("customer")
-   *     .orderBy("id")
+   *     .order("id")
    *     .findList();
    *
    *   // sort by customer name ascending, then by order shipDate
@@ -772,6 +772,18 @@ public interface Database {
    */
   <T> T reference(Class<T> beanType, Object id);
 
+  /**
+   * Return the extended API for Database.
+   * <p>
+   * The extended API has the options for executing queries that take an explicit
+   * transaction as an argument.
+   * <p>
+   * Typically, we only need to use the extended API when we do NOT want to use the
+   * usual ThreadLocal based mechanism to obtain the current transaction but instead
+   * supply the transaction explicitly.
+   */
+  ExtendedServer extended();
+
   /**
    * Either Insert or Update the bean depending on its state.
    * <p>

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

@@ -1968,8 +1968,8 @@ public interface DatabaseBuilder {
   DatabaseBuilder setLocalOnlyL2Cache(boolean localOnlyL2Cache);
 
   /**
-   * Controls if Ebean should ignore <code>&#64;javax.validation.contstraints.NotNull</code> or
-   * <code>&#64;jakarta.validation.contstraints.NotNull</code>
+   * Controls if Ebean should ignore <code>&x64;javax.validation.contstraints.NotNull</code> or
+   * <code>&x64;jakarta.validation.contstraints.NotNull</code>
    * with respect to generating a <code>NOT NULL</code> column.
    * <p>
    * Normally when Ebean sees javax NotNull annotation it means that column is defined as NOT NULL.

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

@@ -5,6 +5,8 @@ import io.ebean.service.SpiContainer;
 import io.ebean.service.SpiContainerFactory;
 import jakarta.persistence.PersistenceException;
 
+import java.util.Iterator;
+import java.util.ServiceLoader;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
@@ -155,10 +157,10 @@ public final class DatabaseFactory {
    * Create the container instance using the configuration.
    */
   private static SpiContainer createContainer(ContainerConfig containerConfig) {
-    SpiContainerFactory factory = XBootstrapService.containerFactory();
-    if (factory == null) {
-      throw new IllegalStateException("Service loader didn't find a SpiContainerFactory?");
+    Iterator<SpiContainerFactory> factories = ServiceLoader.load(SpiContainerFactory.class).iterator();
+    if (factories.hasNext()) {
+      return factories.next().create(containerConfig);
     }
-    return factory.create(containerConfig);
+    throw new IllegalStateException("Service loader didn't find a SpiContainerFactory?");
   }
 }

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

@@ -1,7 +1,7 @@
 package io.ebean;
 
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import io.ebean.docstore.DocQueryContext;
 import io.ebean.docstore.RawDoc;
 
@@ -14,7 +14,7 @@ import java.util.function.Predicate;
 /**
  * Document storage operations.
  */
-@NullMarked
+@NonNullApi
 public interface DocumentStore {
 
   /**

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

@@ -1,7 +1,7 @@
 package io.ebean;
 
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -42,7 +42,7 @@ import java.util.stream.Stream;
  *
  * }</pre>
  */
-@NullMarked
+@NonNullApi
 public interface DtoQuery<T> extends CancelableQuery {
 
   /**
@@ -140,17 +140,6 @@ public interface DtoQuery<T> extends CancelableQuery {
    * Bind the named multi-value array parameter which we would use with Postgres ANY.
    * <p>
    * For Postgres this binds an ARRAY rather than expands into multiple bind values.
-   * <pre>{@code
-   *
-   *   String sql = "select id, name from o_customer where id = any(:idList)";
-   *
-   *   var ids = List.of(1, 2, 3);
-   *
-   *   List<CustomerDto> list2 = DB.findDto(CustomerDto.class, sql)
-   *       .setArrayParameter("idList", ids)
-   *       .findList();
-   *
-   * }</pre>
    */
   DtoQuery<T> setArrayParameter(String name, Collection<?> values);
 

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

@@ -5,8 +5,6 @@ import java.util.List;
 import java.util.concurrent.Future;
 
 /**
- * @deprecated migrate to using {@link PagedList#emptyList()} only.
- * <p>
  * An empty PagedList.
  * <p>
  * For use in application code when we need to return a PagedList but don't want to
@@ -19,8 +17,7 @@ import java.util.concurrent.Future;
  *
  * }</pre>
  */
-@Deprecated(forRemoval = true)
-public final class EmptyPagedList<T> implements PagedList<T> {
+public class EmptyPagedList<T> implements PagedList<T> {
 
   @Override
   public void loadCount() {

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

@@ -1,7 +1,7 @@
 package io.ebean;
 
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import io.ebean.search.*;
 
 import jakarta.persistence.NonUniqueResultException;
@@ -31,7 +31,7 @@ import java.util.function.Predicate;
  *
  * @see Query#where()
  */
-@NullMarked
+@NonNullApi
 public interface ExpressionList<T> {
 
   /**
@@ -53,6 +53,14 @@ public interface ExpressionList<T> {
    */
   Query<T> orderById(boolean orderById);
 
+  /**
+   * @deprecated migrate to {@link #orderBy(String)}
+   */
+  @Deprecated(since = "13.19", forRemoval = true)
+  default ExpressionList<T> order(String orderByClause) {
+    return orderBy(orderByClause);
+  }
+
   /**
    * Set the order by clause replacing the existing order by clause if there is
    * one.
@@ -63,6 +71,14 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> orderBy(String orderBy);
 
+  /**
+   * @deprecated migrate to {@link #orderBy()}.
+   */
+  @Deprecated(forRemoval = true)
+  default OrderBy<T> order() {
+    return orderBy();
+  }
+
   /**
    * Return the OrderBy so that you can append an ascending or descending
    * property to the order by clause.
@@ -205,6 +221,18 @@ public interface ExpressionList<T> {
    */
   int delete();
 
+  /**
+   * Execute as a delete query deleting the 'root level' beans that match the predicates
+   * in the query.
+   * <p>
+   * Note that if the query includes joins then the generated delete statement may not be
+   * optimal depending on the database platform.
+   * </p>
+   *
+   * @return the number of rows that were deleted.
+   */
+  int delete(Transaction transaction);
+
   /**
    * Execute as a update query.
    *
@@ -213,6 +241,14 @@ public interface ExpressionList<T> {
    */
   int update();
 
+  /**
+   * Execute as a update query with the given transaction.
+   *
+   * @return the number of rows that were updated.
+   * @see UpdateQuery
+   */
+  int update(Transaction transaction);
+
   /**
    * Execute the query returning true if a row is found.
    * <p>
@@ -313,7 +349,7 @@ public interface ExpressionList<T> {
    *  List<String> names =
    *    DB.find(Customer.class)
    *      .select("name")
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .findSingleAttributeList();
    *
    * }</pre>
@@ -326,7 +362,7 @@ public interface ExpressionList<T> {
    *      .setDistinct(true)
    *      .select("name")
    *      .where().eq("status", Customer.Status.NEW)
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .setMaxRows(100)
    *      .findSingleAttributeList();
    *
@@ -1671,7 +1707,7 @@ public interface ExpressionList<T> {
    *        .eq("status", Customer.Status.ACTIVE)
    *        .gt("id", 0)
    *        .endAnd()
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .findList();
    * }</pre>
    */
@@ -1692,7 +1728,7 @@ public interface ExpressionList<T> {
    *    .or()
    *      .eq("status", Customer.Status.ACTIVE)
    *      .isNull("anniversary")
-   *    .orderBy().asc("name")
+   *    .order().asc("name")
    *    .findList();
    *
    * }</pre>
@@ -1712,7 +1748,7 @@ public interface ExpressionList<T> {
    *        .eq("status", Customer.Status.ACTIVE)
    *        .gt("id", 0)
    *        .endAnd()
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .findList();
    *
    * }</pre>
@@ -1746,7 +1782,7 @@ public interface ExpressionList<T> {
    *       .gt("id", 1)
    *       .eq("anniversary", onAfter)
    *       .endNot()
-   *     .orderBy()
+   *     .order()
    *       .asc("name")
    *     .findList();
    *

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

@@ -0,0 +1,21 @@
+package io.ebean;
+
+import java.time.Clock;
+
+/**
+ * The extended API for Database.
+ */
+public interface ExtendedServer {
+
+  /**
+   * Deprecated but no yet determined suitable replacement (to support testing only change of clock).
+   * <p>
+   * Set the Clock to use for <code>@WhenCreated</code> and <code>@WhenModified</code>.
+   * <p>
+   * Note that we only expect to change the Clock for testing purposes.
+   * </p>
+   */
+  @Deprecated
+  void setClock(Clock clock);
+
+}

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

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import org.jspecify.annotations.NullMarked;
+import io.avaje.lang.NonNullApi;
 import io.ebean.service.SpiFetchGroupQuery;
 
 /**
@@ -61,7 +61,7 @@ import io.ebean.service.SpiFetchGroupQuery;
  *
  * @param <T> The bean type the Fetch group can be applied to
  */
-@NullMarked
+@NonNullApi
 public interface FetchGroup<T> {
 
   /**
@@ -84,7 +84,7 @@ public interface FetchGroup<T> {
    * @return The FetchGroup with the given select clause
    */
   static <T> FetchGroup<T> of(Class<T> cls, String select) {
-    return XBootstrapService.fetchGroupOf(cls, select);
+    return XServiceProvider.fetchGroupOf(cls, select);
   }
 
   /**
@@ -108,14 +108,14 @@ public interface FetchGroup<T> {
    * @return The FetchGroupBuilder with the given select clause which we will add fetch clauses to
    */
   static <T> FetchGroupBuilder<T> of(Class<T> cls) {
-    return XBootstrapService.fetchGroupOf(cls);
+    return XServiceProvider.fetchGroupOf(cls);
   }
 
   /**
    * Return a query to be used by query beans for constructing FetchGroup.
    */
   static <T> SpiFetchGroupQuery<T> queryFor(Class<T> beanType) {
-    return XBootstrapService.fetchGroupQueryFor(beanType);
+    return XServiceProvider.fetchGroupQueryFor(beanType);
   }
 
 }

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

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import org.jspecify.annotations.NullMarked;
+import io.avaje.lang.NonNullApi;
 
 /**
  * Builds a FetchGroup by adding fetch clauses.
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
  *
  * }</pre>
  */
-@NullMarked
+@NonNullApi
 public interface FetchGroupBuilder<T> {
 
   /**

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

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import org.jspecify.annotations.NullMarked;
+import io.avaje.lang.NonNullApi;
 
 import java.util.List;
 import java.util.Set;
@@ -79,7 +79,7 @@ import java.util.Set;
  *
  * @param <T> the entity bean type
  */
-@NullMarked
+@NonNullApi
 public interface Filter<T> {
 
   /**

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

@@ -1,7 +1,7 @@
 package io.ebean;
 
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import java.util.List;
 
 /**
@@ -35,7 +35,7 @@ import java.util.List;
  *   public List<Customer> findNew() {
  *     return query().where()
  *       .eq("status", Customer.Status.NEW)
- *       .orderBy("name")
+ *       .order("name")
  *       .findList()
  *   }
  * }
@@ -60,7 +60,7 @@ import java.util.List;
  * @see BeanRepository
  * @see BeanFinder
  */
-@NullMarked
+@NonNullApi
 public class Finder<I, T> {
 
   /**

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

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.Nullable;
 
 /**
  * Options to be used with insert such as ON CONFLICT DO UPDATE | NOTHING.

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

@@ -61,7 +61,7 @@ package io.ebean;
  *            .eq("status", Customer.Status.ACTIVE)
  *            .gt("id", 0)
  *            .endAnd()
- *      .orderBy().asc("name");
+ *      .order().asc("name");
  *
  * q.findList();
  * String s = q.getGeneratedSql();

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

@@ -1,19 +0,0 @@
-package io.ebean;
-
-/**
- * Thrown when trying to access a property that isn't loaded on an entity
- * that is unmodifiable or has disabled lazy loading.
- * <p>
- * On a normal mutable entity accessing the property would invoke lazy loading. On
- * a unmodifiable entity with lazy loading disabled, accessing an unloaded property
- * throws this LazyInitialisationException instead.
- */
-public class LazyInitialisationException extends BeanAccessException {
-
-  /**
-   * Create specifying the property that was being accessed.
-   */
-  public LazyInitialisationException(String message) {
-    super(message);
-  }
-}

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

@@ -16,7 +16,4 @@ public interface ModifyAwareType {
    */
   void setMarkedDirty(boolean markedDirty);
 
-  default Object freeze() {
-    return this; // throw new UnsupportedOperationException();
-  }
 }

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

@@ -8,11 +8,13 @@ import java.util.Objects;
 /**
  * Represents an Order By for a Query.
  * <p>
- * Is an ordered list of OrderBy.Property objects each specifying a property and
+ * Is a ordered list of OrderBy.Property objects each specifying a property and
  * whether it is ascending or descending order.
+ * </p>
  * <p>
- * Typically, you will not construct an OrderBy yourself but use one that exists
+ * Typically you will not construct an OrderBy yourself but use one that exists
  * on the Query object.
+ * </p>
  */
 public class OrderBy<T> implements Serializable {
 
@@ -23,22 +25,8 @@ public class OrderBy<T> implements Serializable {
   private final List<Property> list;
 
   /**
-   * Create an OrderBy parsing the given order by clause.
-   * <p>
-   * The order by clause follows SQL order by clause with comma's between each
-   * property and optionally "asc" or "desc" to represent ascending or
-   * descending order respectively.
-   */
-  public static <P> OrderBy<P> of(String orderByClause) {
-    return new OrderBy<>(orderByClause);
-  }
-
-  /**
-   * @deprecated This method will be removed from public API.
-   * <p>
    * Create an empty OrderBy with no associated query.
    */
-  @Deprecated(forRemoval = true)
   public OrderBy() {
     this.list = new ArrayList<>(3);
   }
@@ -48,17 +36,20 @@ public class OrderBy<T> implements Serializable {
   }
 
   /**
-   * @deprecated migrate to {@link OrderBy#of(String)}.
+   * Create an orderBy parsing the order by clause.
+   * <p>
+   * The order by clause follows SQL order by clause with comma's between each
+   * property and optionally "asc" or "desc" to represent ascending or
+   * descending order respectively.
+   * </p>
    */
-  @Deprecated(forRemoval = true)
   public OrderBy(String orderByClause) {
     this(null, orderByClause);
   }
 
   /**
-   * @deprecated This method will be removed from public API.
+   * Construct with a given query and order by clause.
    */
-  @Deprecated(forRemoval = true)
   public OrderBy(Query<T> query, String orderByClause) {
     this.query = query;
     this.list = new ArrayList<>(3);
@@ -119,11 +110,8 @@ public class OrderBy<T> implements Serializable {
   }
 
   /**
-   * @deprecated This method will become internal only API.
-   * <p>
    * Return a copy of this OrderBy with the path trimmed.
    */
-  @Deprecated(forRemoval = true)
   public OrderBy<T> copyWithTrim(String path) {
     List<Property> newList = new ArrayList<>(list.size());
     for (Property aList : list) {
@@ -198,15 +186,15 @@ public class OrderBy<T> implements Serializable {
     if (list.isEmpty()) {
       return null;
     }
-    var append = new StringAppend();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < list.size(); i++) {
       Property property = list.get(i);
       if (i > 0) {
-        append.append(", ");
+        sb.append(", ");
       }
-      property.toStringFormat(append);
+      sb.append(property.toStringFormat());
     }
-    return append.toString();
+    return sb.toString();
   }
 
   @Override
@@ -243,55 +231,6 @@ public class OrderBy<T> implements Serializable {
     return this;
   }
 
-  /**
-   * Append the order by clause.
-   */
-  public interface Append {
-
-    /**
-     * Append a property expression.
-     */
-    Append property(String property);
-
-    /**
-     * Append a literal.
-     */
-    Append append(String literal);
-
-    /**
-     * Parse and append an expression.
-     */
-    Append parse(String expression);
-  }
-
-  private static final class StringAppend implements Append {
-
-    private final StringBuilder builder = new StringBuilder();
-
-    @Override
-    public String toString() {
-      return builder.toString();
-    }
-
-    @Override
-    public Append property(String property) {
-      builder.append(property);
-      return this;
-    }
-
-    @Override
-    public Append append(String literal) {
-      builder.append(literal);
-      return this;
-    }
-
-    @Override
-    public Append parse(String raw) {
-      builder.append(raw);
-      return this;
-    }
-  }
-
   /**
    * A property and its ascending descending order.
    */
@@ -370,25 +309,36 @@ public class OrderBy<T> implements Serializable {
 
     @Override
     public String toString() {
-      return property;
+      return toStringFormat();
     }
 
-    public void toStringFormat(Append append) {
-      if (collation != null)  {
-        if (collation.contains("${}")) {
-          // this is a complex collation, e.g. DB2 - we must replace the property
-          append.parse(collation.replace("${}", property));
+    public String toStringFormat() {
+      if (nulls == null && collation == null) {
+        if (ascending) {
+          return property;
         } else {
-          append.property(property).append(" collate ").append(collation);
+          return property + " desc";
         }
       } else {
-        append.property(property);
-      }
-      if (!ascending) {
-        append.append(" desc");
-      }
-      if (nulls != null) {
-        append.append(" ").append(nulls).append(" ").append(highLow);
+        StringBuilder sb = new StringBuilder();
+        if (collation != null)  {
+          if (collation.contains("${}")) {
+            // this is a complex collation, e.g. DB2 - we must replace the property
+            sb.append(collation.replace("${}", property));
+          } else {
+            sb.append(property);
+            sb.append(" collate ").append(collation);
+          }
+        } else {
+          sb.append(property);
+        }
+        if (!ascending) {
+          sb.append(' ').append("desc");
+        }
+        if (nulls != null) {
+          sb.append(' ').append(nulls).append(' ').append(highLow);
+        }
+        return sb.toString();
       }
     }
 

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

@@ -25,7 +25,7 @@ import java.util.concurrent.Future;
  *
  *     PagedList<Order> pagedList = DB.find(Order.class)
  *       .where().eq("status", Order.Status.NEW)
- *       .orderBy().asc("id")
+ *       .order().asc("id")
  *       .setFirstRow(0)
  *       .setMaxRows(50)
  *       .findPagedList();

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

@@ -1,90 +0,0 @@
-package io.ebean;
-
-import org.jspecify.annotations.Nullable;
-
-/**
- * Used to specify Paging on a Query as an alternative to setting each of the
- * maxRows, firstRow and orderBy clause via:
- * {@link Query#setMaxRows(int)} + {@link Query#setFirstRow(int)} + {@link Query#setOrderBy(OrderBy)}.
- * <p>
- * Example use:
- *
- * <pre>{@code
- *
- *   var orderBy = OrderBy.of("lastName desc nulls first, firstName asc");
- *   var paging = Paging.of(0, 100, orderBy);
- *
- *   new QCustomer()
- *       .name.isNotNull()
- *       .setPaging(paging)
- *       .findList();
- *
- * }</pre>
- */
-public interface Paging {
-
-  /**
-   * Create a Paging with the given page index size and orderBy.
-   *
-   * @param pageIndex the page index starting from zero
-   * @param pageSize  the page size (effectively max rows)
-   * @param orderBy   order by for the query result
-   */
-  static Paging of(int pageIndex, int pageSize, @Nullable OrderBy<?> orderBy) {
-    return DPaging.build(pageIndex, pageSize, orderBy);
-  }
-
-  /**
-   * Create a Paging with a raw order by clause.
-   *
-   * @param pageIndex     the page index starting from zero
-   * @param pageSize      the page size (effectively max rows)
-   * @param orderByClause raw order by clause for ordering the query result
-   */
-  static Paging of(int pageIndex, int pageSize, @Nullable String orderByClause) {
-    return of(pageIndex, pageSize, OrderBy.of(orderByClause));
-  }
-
-  /**
-   * Create a Paging that will use the id property for ordering.
-   *
-   * @param pageIndex the page index starting from zero
-   * @param pageSize  the page size (effectively max rows)
-   */
-  static Paging of(int pageIndex, int pageSize) {
-    return DPaging.build(pageIndex, pageSize);
-  }
-
-  /**
-   * Return a Paging that will not apply any pagination to a query.
-   */
-  static Paging ofNone() {
-    return DPaging.NONE;
-  }
-
-  /**
-   * Return the page index.
-   */
-  int pageIndex();
-
-  /**
-   * Return the page size.
-   */
-  int pageSize();
-
-  /**
-   * Return the order by.
-   */
-  OrderBy<?> orderBy();
-
-  /**
-   * Return a Paging using the given page index.
-   */
-  Paging withPage(int pageIndex);
-
-  /**
-   * Return a Paging using the given order by clause.
-   */
-  Paging withOrderBy(String orderByClause);
-
-}

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

@@ -30,7 +30,7 @@ import java.util.Objects;
  *   .where()
  *   .eq("store", "def")
  *   .inPairs(pairs)       // IN clause with 'pairs' of values
- *   .orderBy("sku desc")
+ *   .order("sku desc")
  *
  *   // query expressions cover the natural key properties
  *   // so we can choose to hit the L2 bean cache if we want

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

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

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

@@ -1,988 +0,0 @@
-package io.ebean;
-
-import org.jspecify.annotations.Nullable;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.Timestamp;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.BooleanSupplier;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-/**
- * Build and execute an ORM query.
- *
- * @param <SELF> The type of the builder
- * @param <T>    The entity bean type
- */
-public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends QueryBuilderProjection<SELF, T> {
-
-  /**
-   * Set root table alias.
-   */
-  SELF alias(String alias);
-
-  /**
-   * Apply changes to the query using a function.
-   *
-   * @param apply Function that applies changes to the query.
-   */
-  SELF also(Consumer<SELF> apply);
-
-  /**
-   * Apply changes to the query conditional on the supplied predicate.
-   * <p>
-   * Typically, the changes are extra predicates etc.
-   *
-   * @param predicate The predicate which when true the changes are applied
-   * @param apply     The changes to apply to the query
-   */
-  SELF alsoIf(BooleanSupplier predicate, Consumer<SELF> apply);
-
-  /**
-   * Perform an 'As of' query using history tables to return the object graph
-   * as of a time in the past.
-   * <p>
-   * To perform this query the DB must have underlying history tables.
-   *
-   * @param asOf the date time in the past at which you want to view the data
-   */
-  SELF asOf(Timestamp asOf);
-
-  /**
-   * Execute the query against the draft set of tables.
-   */
-  SELF asDraft();
-
-  /**
-   * Convert the query to a DTO bean query.
-   * <p>
-   * We effectively use the underlying ORM query to build the SQL and then execute
-   * and map it into DTO beans.
-   */
-  <D> DtoQuery<D> asDto(Class<D> dtoClass);
-
-  /**
-   * Convert the query to a UpdateQuery.
-   * <p>
-   * Typically this is used with query beans to covert a query bean
-   * query into an UpdateQuery like the examples below.
-   * </p>
-   *
-   * <pre>{@code
-   *
-   *  int rowsUpdated = new QCustomer()
-   *       .name.startsWith("Rob")
-   *       .asUpdate()
-   *       .set("active", false)
-   *       .update();;
-   *
-   * }</pre>
-   *
-   * <pre>{@code
-   *
-   *   int rowsUpdated = new QContact()
-   *       .notes.note.startsWith("Make Inactive")
-   *       .email.endsWith("@foo.com")
-   *       .customer.id.equalTo(42)
-   *       .asUpdate()
-   *       .set("inactive", true)
-   *       .setRaw("email = lower(email)")
-   *       .update();
-   *
-   * }</pre>
-   */
-  UpdateQuery<T> asUpdate();
-
-  /**
-   * Return a copy of the query.
-   * <p>
-   * This is so that you can use a Query as a "prototype" for creating other
-   * query instances. You could create a Query with various where expressions
-   * and use that as a "prototype" - using this copy() method to create a new
-   * instance that you can then add other expressions then execute.
-   * </p>
-   */
-  SELF copy();
-
-  /**
-   * Execute the query using the given transaction.
-   */
-  SELF usingTransaction(Transaction transaction);
-
-  /**
-   * Execute the query using the given connection.
-   */
-  SELF usingConnection(Connection connection);
-
-  /**
-   * Execute the query using the given database.
-   */
-  SELF usingDatabase(Database database);
-
-  /**
-   * Ensure that the master DataSource is used if there is a read only data source
-   * being used (that is using a read replica database potentially with replication lag).
-   * <p>
-   * When the database is configured with a read-only DataSource via
-   * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
-   * by default when a query is run without an active transaction, it uses the read-only data
-   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
-   * against the master data source.
-   */
-  SELF usingMaster();
-
-  /**
-   * Set the base table to use for this query.
-   * <p>
-   * Typically this is used when a table has partitioning and we wish to specify a specific
-   * partition/table to query against.
-   * </p>
-   * <pre>{@code
-   *
-   *   QOrder()
-   *   .setBaseTable("order_2019_05")
-   *   .status.equalTo(Status.NEW)
-   *   .findList();
-   *
-   * }</pre>
-   */
-  SELF setBaseTable(String baseTable);
-
-  /**
-   * Specify the PersistenceContextScope to use for this query.
-   * <p>
-   * When this is not set the 'default' configured on {@link io.ebean.config.DatabaseConfig#setPersistenceContextScope(PersistenceContextScope)}
-   * is used - this value defaults to {@link PersistenceContextScope#TRANSACTION}.
-   * <p>
-   * Note that the same persistence Context is used for subsequent lazy loading and query join queries.
-   * <p>
-   * Note that #findEach uses a 'per object graph' PersistenceContext so this scope is ignored for
-   * queries executed as #findIterate, #findEach, #findEachWhile.
-   *
-   * @param scope The scope to use for this query and subsequent lazy loading.
-   */
-  SELF setPersistenceContextScope(PersistenceContextScope scope);
-
-  /**
-   * Explicitly specify whether to use AutoTune for this query.
-   * <p>
-   * If you do not call this method on a query the "Implicit AutoTune mode" is
-   * used to determine if AutoTune should be used for a given query.
-   * <p>
-   * AutoTune can add additional fetch paths to the query and specify which
-   * properties are included for each path. If you have explicitly defined some
-   * fetch paths AutoTune will not remove them.
-   */
-  SELF setAutoTune(boolean autoTune);
-
-  /**
-   * Execute the query allowing properties with invalid JSON to be collected and not fail the query.
-   * <pre>{@code
-   *
-   *   // fetch a bean with JSON content
-   *   EBasicJsonList bean= DB.find(EBasicJsonList.class)
-   *       .setId(42)
-   *       .setAllowLoadErrors()  // collect errors into bean state if we have invalid JSON
-   *       .findOne();
-   *
-   *
-   *   // get the invalid JSON errors from the bean state
-   *   Map<String, Exception> errors = server().getBeanState(bean).getLoadErrors();
-   *
-   *   // If this map is not empty tell we have invalid JSON
-   *   // and should try and fix the JSON content or inform the user
-   *
-   * }</pre>
-   */
-  SELF setAllowLoadErrors();
-
-  /**
-   * Set the default lazy loading batch size to use.
-   * <p>
-   * When lazy loading is invoked on beans loaded by this query then this sets the
-   * batch size used to load those beans.
-   *
-   * @param lazyLoadBatchSize the number of beans to lazy load in a single batch
-   */
-  SELF setLazyLoadBatchSize(int lazyLoadBatchSize);
-
-  /**
-   * Set a label on the query.
-   * <p>
-   * This label can be used to help identify query performance metrics but we can also use
-   * profile location enhancement on Finders so for some that would be a better option.
-   */
-  SELF setLabel(String label);
-
-  /**
-   * Set a SQL query hint.
-   * <p>
-   * This results in an inline comment that immediately follows
-   * after the select keyword in the form: {@code /*+ hint *\/ }
-   */
-  SELF setHint(String hint);
-
-  /**
-   * Set the index(es) to search for a document store which uses partitions.
-   * <p>
-   * For example, when executing a query against ElasticSearch with daily indexes we can
-   * explicitly specify the indexes to search against.
-   * </p>
-   * <pre>{@code
-   *
-   *   // explicitly specify the indexes to search
-   *   query.setDocIndexName("logstash-2016.11.5,logstash-2016.11.6")
-   *
-   *   // search today's index
-   *   query.setDocIndexName("$today")
-   *
-   *   // search the last 3 days
-   *   query.setDocIndexName("$last-3")
-   *
-   * }</pre>
-   * <p>
-   * If the indexName is specified with ${daily} e.g. "logstash-${daily}" ... then we can use
-   * $today and $last-x as the search docIndexName like the examples below.
-   * </p>
-   * <pre>{@code
-   *
-   *   // search today's index
-   *   query.setDocIndexName("$today")
-   *
-   *   // search the last 3 days
-   *   query.setDocIndexName("$last-3")
-   *
-   * }</pre>
-   *
-   * @param indexName The index or indexes to search against
-   * @return This query
-   */
-  SELF setDocIndexName(String indexName);
-
-  /**
-   * Execute the query including soft deleted rows.
-   * <p>
-   * This means that Ebean will not add any predicates to the query for filtering out
-   * soft deleted rows. You can still add your own predicates for the deleted properties
-   * and effectively you have full control over the query to include or exclude soft deleted
-   * rows as needed for a given use case.
-   */
-  SELF setIncludeSoftDeletes();
-
-  /**
-   * Disable read auditing for this query.
-   * <p>
-   * This is intended to be used when the query is not a user initiated query and instead
-   * part of the internal processing in an application to load a cache or document store etc.
-   * In these cases we don't want the query to be part of read auditing.
-   */
-  SELF setDisableReadAuditing();
-
-  /**
-   * Set true if you want to disable lazy loading.
-   * <p>
-   * That is, once the object graph is returned further lazy loading is disabled.
-   */
-  SELF setDisableLazyLoading(boolean disableLazyLoading);
-
-  /**
-   * Set whether this query uses DISTINCT.
-   */
-  SELF setDistinct(boolean distinct);
-
-  /**
-   * Restrict the query to only return subtypes of the given inherit type.
-   * <pre>{@code
-   *
-   *   List<Animal> animals =
-   *     new QAnimal()
-   *       .name.startsWith("Fluffy")
-   *       .setInheritType(Cat.class)
-   *       .findList();
-   *
-   * }</pre>
-   */
-  SELF setInheritType(Class<? extends T> type);
-
-  /**
-   * Set the first row to return for this query.
-   *
-   * @param firstRow the first row to include in the query result.
-   */
-  SELF setFirstRow(int firstRow);
-
-  /**
-   * Set the maximum number of rows to return in the query.
-   *
-   * @param maxRows the maximum number of rows to return in the query.
-   */
-  SELF setMaxRows(int maxRows);
-
-  SELF setPaging(Paging paging);
-
-  /**
-   * Set RawSql to use for this query.
-   */
-  SELF setRawSql(RawSql rawSql);
-
-  /**
-   * Extended version for setDistinct in conjunction with "findSingleAttributeList";
-   *
-   * <pre>{@code
-   *
-   *  List<CountedValue<Order.Status>> orderStatusCount =
-   *
-   *     DB.find(Order.class)
-   *      .select("status")
-   *      .where()
-   *      .gt("orderDate", LocalDate.now().minusMonths(3))
-   *
-   *      // fetch as single attribute with a COUNT
-   *      .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
-   *      .findSingleAttributeList();
-   *
-   *     for (CountedValue<Order.Status> entry : orderStatusCount) {
-   *       System.out.println(" count:" + entry.getCount()+" orderStatus:" + entry.getValue() );
-   *     }
-   *
-   *   // produces
-   *
-   *   count:3 orderStatus:NEW
-   *   count:1 orderStatus:SHIPPED
-   *   count:1 orderStatus:COMPLETE
-   *
-   * }</pre>
-   */
-  SELF setCountDistinct(CountDistinctOrder orderBy);
-
-  /**
-   * Set the property to use as keys for a map.
-   * <p>
-   * If no property is set then the id property is used.
-   * </p>
-   * <pre>{@code
-   *
-   * // Assuming sku is unique for products...
-   *
-   * Map<String,Product> productMap = DB.find(Product.class)
-   *     .setMapKey("sku")  // sku map keys...
-   *     .findMap();
-   *
-   * }</pre>
-   *
-   * @param mapKey the property to use as keys for a map.
-   */
-  SELF setMapKey(String mapKey);
-
-  /**
-   * Set to true if this query should execute against the doc store.
-   * <p>
-   * When setting this you may also consider disabling lazy loading.
-   */
-  SELF setUseDocStore(boolean useDocStore);
-
-  /**
-   * When set to true when you want the returned beans to be unmodifiable read only.
-   * <p>
-   * This means that the returning graph can't be mutated via setters, all the collections
-   * are unmodifiable collections, lazy loading is disabled and that the query uses
-   * {@link PersistenceContextScope#QUERY}.
-   */
-  SELF setUnmodifiable(boolean unmodifiable);
-
-  /**
-   * Set a timeout on this query.
-   * <p>
-   * This will typically result in a call to setQueryTimeout() on a
-   * preparedStatement. If the timeout occurs an exception will be thrown - this
-   * will be a SQLException wrapped up in a PersistenceException.
-   * </p>
-   *
-   * @param secs the query timeout limit in seconds. Zero means there is no limit.
-   */
-  SELF setTimeout(int secs);
-
-  /**
-   * A hint which for JDBC translates to the Statement.fetchSize().
-   * <p>
-   * Gives the JDBC driver a hint as to the number of rows that should be
-   * fetched from the database when more rows are needed for ResultSet.
-   * </p>
-   * <p>
-   * Note that internally findEach and findEachWhile will set the fetch size
-   * if it has not already as these queries expect to process a lot of rows.
-   * If we didn't then Postgres and MySql for example would eagerly pull back
-   * all the row data and potentially consume a lot of memory in the process.
-   * </p>
-   * <p>
-   * As findEach and findEachWhile automatically set the fetch size we don't have
-   * to do so generally but we might still wish to for tuning a specific use case.
-   * </p>
-   */
-  SELF setBufferFetchSizeHint(int fetchSize);
-
-  /**
-   * Set the mode to use the bean cache when executing this query.
-   * <p>
-   * By default, "find by id" and "find by natural key" will use the bean cache
-   * when bean caching is enabled. Setting this to false means that the query
-   * will not use the bean cache and instead hit the database.
-   * <p>
-   * By default, findList() with natural keys will not use the bean cache. In that
-   * case we need to explicitly use the bean cache.
-   */
-  SELF setBeanCacheMode(CacheMode beanCacheMode);
-
-  /**
-   * Set the {@link CacheMode} to use the query for executing this query.
-   */
-  SELF setUseQueryCache(CacheMode cacheMode);
-
-  /**
-   * Set this to false to not use the bean cache.
-   * <p>
-   * This method is now superseded by {@link #setBeanCacheMode(CacheMode)}
-   * which provides more explicit options controlled bean cache use.
-   * <p>
-   * This method is likely to be deprecated in the future with migration
-   * over to setUseBeanCache().
-   */
-  default SELF setUseCache(boolean useCache) {
-    return setBeanCacheMode(useCache ? CacheMode.ON : CacheMode.OFF);
-  }
-
-  /**
-   * Calls {@link #setUseQueryCache(CacheMode)} with <code>ON</code> or <code>OFF</code>.
-   */
-  default SELF setUseQueryCache(boolean enabled) {
-    return setUseQueryCache(enabled ? CacheMode.ON : CacheMode.OFF);
-  }
-
-  /**
-   * Set the order by clause replacing the existing order by clause if there is
-   * one.
-   * <p>
-   * This follows SQL syntax using commas between each property with the
-   * optional asc and desc keywords representing ascending and descending order
-   * respectively.
-   */
-  SELF orderBy(String orderByClause);
-
-  /**
-   * Set an OrderBy object to replace any existing OrderBy clause.
-   */
-  SELF setOrderBy(OrderBy<T> orderBy);
-
-  /**
-   * Controls, if paginated queries should always append an 'order by id' statement at the end to
-   * guarantee a deterministic sort result. This may affect performance.
-   * If this is not enabled, and an orderBy is set on the query, it's up to the programmer that
-   * this query provides a deterministic result.
-   */
-  SELF orderById(boolean orderById);
-
-  /**
-   * Execute the query with the given lock type and WAIT.
-   * <p>
-   * Note that <code>forUpdate()</code> is the same as
-   * <code>withLock(LockType.UPDATE)</code>.
-   * <p>
-   * Provides us with the ability to explicitly use Postgres
-   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
-   */
-  SELF withLock(Query.LockType lockType);
-
-  /**
-   * Execute the query with the given lock type and lock wait.
-   * <p>
-   * Note that <code>forUpdateNoWait()</code> is the same as
-   * <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
-   * <p>
-   * Provides us with the ability to explicitly use Postgres
-   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
-   */
-  SELF withLock(Query.LockType lockType, Query.LockWait lockWait);
-
-  /**
-   * Execute using "for update" clause which results in the DB locking the record.
-   * <p>
-   * The same as <code>withLock(LockType.UPDATE, LockWait.WAIT)</code>.
-   */
-  SELF forUpdate();
-
-  /**
-   * Execute using "for update" clause with "no wait" option.
-   * <p>
-   * This is typically a Postgres and Oracle only option at this stage.
-   * <p>
-   * The same as <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
-   */
-  SELF forUpdateNoWait();
-
-  /**
-   * Execute using "for update" clause with "skip locked" option.
-   * <p>
-   * This is typically a Postgres and Oracle only option at this stage.
-   * <p>
-   * The same as <code>withLock(LockType.UPDATE, LockWait.SKIPLOCKED)</code>.
-   */
-  SELF forUpdateSkipLocked();
-
-  /**
-   * Returns the set of properties or paths that are unknown (do not map to known properties or paths).
-   * <p>
-   * Validate the query checking the where and orderBy expression paths to confirm if
-   * they represent valid properties or paths for the given bean type.
-   */
-  Set<String> validate();
-
-  /**
-   * Return the sql that was generated for executing this query.
-   * <p>
-   * This is only available after the query has been executed and provided only
-   * for informational purposes.
-   */
-  String getGeneratedSql();
-
-  /**
-   * Return the type of beans being queried.
-   */
-  Class<T> getBeanType();
-
-  /**
-   * Execute as a delete query deleting the 'root level' beans that match the predicates
-   * in the query.
-   * <p>
-   * Note that if the query includes joins then the generated delete statement may not be
-   * optimal depending on the database platform.
-   *
-   * @return the number of beans/rows that were deleted.
-   */
-  int delete();
-
-  /**
-   * Execute the query returning true if a row is found.
-   * <p>
-   * The query is executed using max rows of 1 and will only select the id property.
-   * This method is really just a convenient way to optimise a query to perform a
-   * 'does a row exist in the db' check.
-   *
-   * <h2>Example using a query bean:</h2>
-   * <pre>{@code
-   *
-   *   boolean userExists =
-   *     new QContact()
-   *       .email.equalTo("rob@foo.com")
-   *       .exists();
-   *
-   * }</pre>
-   *
-   * <h2>Example:</h2>
-   * <pre>{@code
-   *
-   *   boolean userExists = query()
-   *     .where().eq("email", "rob@foo.com")
-   *     .exists();
-   *
-   * }</pre>
-   *
-   * @return True if the query finds a matching row in the database
-   */
-  boolean exists();
-
-  /**
-   * Execute the query returning either a single bean or null (if no matching
-   * bean is found).
-   * <p>
-   * If more than 1 row is found for this query then a PersistenceException is
-   * thrown.
-   * <p>
-   * This is useful when your predicates dictate that your query should only
-   * return 0 or 1 results.
-   * <p>
-   * <pre>{@code
-   *
-   * // assuming the sku of products is unique...
-   * Product product =
-   *     new QProduct()
-   *         .sku.equalTo("aa113")
-   *         .findOne();
-   * ...
-   * }</pre>
-   * <p>
-   * It is also useful with finding objects by their id when you want to specify
-   * further join information to optimise the query.
-   * <p>
-   * <pre>{@code
-   *
-   * // Fetch order 42 and additionally fetch join its order details...
-   * Order order =
-   *     new QOrder()
-   *         .fetch("details") // eagerly load the order details
-   *         .id.equalTo(42)
-   *         .findOne();
-   *
-   * // the order details were eagerly loaded
-   * List<OrderDetail> details = order.getDetails();
-   * ...
-   * }</pre>
-   */
-  @Nullable
-  T findOne();
-
-  /**
-   * Execute the query returning an optional bean.
-   */
-  Optional<T> findOneOrEmpty();
-
-  /**
-   * Execute the query returning the list of objects.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * <p>
-   * <pre>{@code
-   *
-   * List<Customer> customers =
-   *     new QCustomer()
-   *       .name.ilike("rob%")
-   *       .findList();
-   *
-   * }</pre>
-   *
-   * @see Query#findList()
-   */
-  List<T> findList();
-
-  /**
-   * Execute the query returning the result as a Stream.
-   * <p>
-   * Note that this can support very large queries iterating
-   * any number of results. To do so internally it can use
-   * multiple persistence contexts.
-   * </p>
-   * <pre>{@code
-   *
-   *  // use try with resources to ensure Stream is closed
-   *
-   *  try (Stream<Customer> stream = query.findStream()) {
-   *    stream
-   *    .map(...)
-   *    .collect(...);
-   *  }
-   *
-   * }</pre>
-   */
-  Stream<T> findStream();
-
-  /**
-   * Execute the query returning the set of objects.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * <p>
-   * <pre>{@code
-   *
-   * Set<Customer> customers =
-   *     new QCustomer()
-   *       .name.ilike("rob%")
-   *       .findSet();
-   *
-   * }</pre>
-   *
-   * @see Query#findSet()
-   */
-  Set<T> findSet();
-
-  /**
-   * Execute the query returning the list of Id's.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   *
-   * @see Query#findIds()
-   */
-  <A> List<A> findIds();
-
-  /**
-   * Execute the query returning a map of the objects.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * <p>
-   * You can use setMapKey() or asMapKey() to specify the property to be used as keys
-   * on the map. If one is not specified then the id property is used.
-   * <p>
-   * <pre>{@code
-   *
-   * Map<String, Product> map =
-   *   new QProduct()
-   *     .sku.asMapKey()
-   *     .findMap();
-   *
-   * }</pre>
-   *
-   * @see Query#findMap()
-   */
-  <K> Map<K, T> findMap();
-
-  /**
-   * Execute the query iterating over the results.
-   * <p>
-   * Note that findIterate (and findEach and findEachWhile) uses a "per graph"
-   * persistence context scope and adjusts jdbc fetch buffer size for large
-   * queries. As such it is better to use findList for small queries.
-   * <p>
-   * Remember that with {@link QueryIterator} you must call {@link QueryIterator#close()}
-   * when you have finished iterating the results (typically in a finally block).
-   * <p>
-   * findEach() and findEachWhile() are preferred to findIterate() as they ensure
-   * the jdbc statement and resultSet are closed at the end of the iteration.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * </p>
-   * <pre>{@code
-   *
-   *  Query<Customer> query =
-   *    new QCustomer()
-   *     .status.equalTo(Customer.Status.NEW)
-   *     .orderBy()
-   *       id.asc()
-   *     .query();
-   *
-   *  try (QueryIterator<Customer> it = query.findIterate()) {
-   *    while (it.hasNext()) {
-   *      Customer customer = it.next();
-   *      // do something with customer ...
-   *    }
-   *  }
-   *
-   * }</pre>
-   */
-  QueryIterator<T> findIterate();
-
-  /**
-   * Execute the query returning a list of values for a single property.
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *  List<String> names =
-   *    new QCustomer()
-   *      .setDistinct(true)
-   *      .select(name)
-   *      .findSingleAttributeList();
-   *
-   * }</pre>
-   *
-   * @return the list of values for the selected property
-   */
-  <A> List<A> findSingleAttributeList();
-
-  /**
-   * Execute the query returning a single value or null for a single property.
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *  LocalDate maxDate =
-   *    new QCustomer()
-   *      .select("max(startDate)")
-   *      .findSingleAttribute();
-   *
-   * }</pre>
-   *
-   * @return a single value or null for the selected property
-   */
-  @Nullable
-  <A> A findSingleAttribute();
-
-  /**
-   * Execute the query returning a single optional attribute value.
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *  Optional<String> maybeName =
-   *    new QCustomer()
-   *      .select(name)
-   *      .id.eq(42)
-   *      .status.eq(NEW)
-   *      .findSingleAttributeOrEmpty();
-   *
-   * }</pre>
-   *
-   * @return an optional value for the selected property
-   */
-  <A> Optional<A> findSingleAttributeOrEmpty();
-
-  /**
-   * Execute the query returning a hashset of values for a single property.
-   */
-  <A> Set<A> findSingleAttributeSet();
-
-  /**
-   * Execute the query processing the beans one at a time.
-   * <p>
-   * This method is appropriate to process very large query results as the
-   * beans are consumed one at a time and do not need to be held in memory
-   * (unlike #findList #findSet etc)
-   * <p>
-   * Note that internally Ebean can inform the JDBC driver that it is expecting larger
-   * resultSet and specifically for MySQL this hint is required to stop it's JDBC driver
-   * from buffering the entire resultSet. As such, for smaller resultSets findList() is
-   * generally preferable.
-   * <p>
-   * Compared with #findEachWhile this will always process all the beans where as
-   * #findEachWhile provides a way to stop processing the query result early before
-   * all the beans have been read.
-   * <p>
-   * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the Consumer interface which is better suited to use with closures.
-   *
-   * <pre>{@code
-   *
-   *  new QCustomer()
-   *     .status.equalTo(Status.NEW)
-   *     .orderBy().id.asc()
-   *     .findEach((Customer customer) -> {
-   *
-   *       // do something with customer
-   *       System.out.println("-- visit " + customer);
-   *     });
-   *
-   * }</pre>
-   *
-   * @param consumer the consumer used to process the queried beans.
-   */
-  void findEach(Consumer<T> consumer);
-
-  /**
-   * Execute findEach streaming query batching the results for consuming.
-   * <p>
-   * This query execution will stream the results and is suited to consuming
-   * large numbers of results from the database.
-   * <p>
-   * Typically, we use this batch consumer when we want to do further processing on
-   * the beans and want to do that processing in batch form, for example - 100 at
-   * a time.
-   *
-   * @param batch    The number of beans processed in the batch
-   * @param consumer Process the batch of beans
-   */
-  void findEach(int batch, Consumer<List<T>> consumer);
-
-  /**
-   * Execute the query using callbacks to a visitor to process the resulting
-   * beans one at a time.
-   * <p>
-   * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the Predicate interface which is better suited to use with closures.
-   *
-   * <pre>{@code
-   *
-   *  new QCustomer()
-   *     .status.equalTo(Status.NEW)
-   *     .orderBy().id.asc()
-   *     .findEachWhile((Customer customer) -> {
-   *
-   *       // do something with customer
-   *       System.out.println("-- visit " + customer);
-   *
-   *       // return true to continue processing or false to stop
-   *       return (customer.getId() < 40);
-   *     });
-   *
-   * }</pre>
-   *
-   * @param consumer the consumer used to process the queried beans.
-   */
-  void findEachWhile(Predicate<T> consumer);
-
-  /**
-   * Return versions of a @History entity bean.
-   * <p>
-   * Generally this query is expected to be a find by id or unique predicates query.
-   * It will execute the query against the history returning the versions of the bean.
-   */
-  List<Version<T>> findVersions();
-
-  /**
-   * Return versions of a @History entity bean between a start and end timestamp.
-   * <p>
-   * Generally this query is expected to be a find by id or unique predicates query.
-   * It will execute the query against the history returning the versions of the bean.
-   */
-  List<Version<T>> findVersionsBetween(Timestamp start, Timestamp end);
-
-  /**
-   * Return the count of entities this query should return.
-   * <p>
-   * This is the number of 'top level' or 'root level' entities.
-   */
-  int findCount();
-
-  /**
-   * Execute find row count query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   *
-   * @return a Future object for the row count query
-   */
-  FutureRowCount<T> findFutureCount();
-
-  /**
-   * Execute find Id's query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   *
-   * @return a Future object for the list of Id's
-   */
-  FutureIds<T> findFutureIds();
-
-  /**
-   * Execute find list query in a background thread.
-   * <p>
-   * This query will execute in it's own PersistenceContext and using its own transaction.
-   * What that means is that it will not share any bean instances with other queries.
-   *
-   * @return a Future object for the list result of the query
-   */
-  FutureList<T> findFutureList();
-
-  /**
-   * Return a PagedList for this query using firstRow and maxRows.
-   * <p>
-   * The benefit of using this over findList() is that it provides functionality to get the
-   * total row count etc.
-   * <p>
-   * If maxRows is not set on the query prior to calling findPagedList() then a
-   * PersistenceException is thrown.
-   * <p>
-   * <pre>{@code
-   *
-   *  PagedList<Order> pagedList =
-   *    new QOrder()
-   *       .setFirstRow(50)
-   *       .setMaxRows(20)
-   *       .findPagedList();
-   *
-   *       // fetch the total row count in the background
-   *       pagedList.loadRowCount();
-   *
-   *       List<Order> orders = pagedList.getList();
-   *       int totalRowCount = pagedList.getTotalRowCount();
-   *
-   * }</pre>
-   *
-   * @return The PagedList
-   */
-  PagedList<T> findPagedList();
-
-}

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

@@ -1,249 +0,0 @@
-package io.ebean;
-
-/**
- * Builder for ORM Query projection (the select and fetch part).
- *
- * @param <SELF> The builder type
- * @param <T>    The entity bean type
- */
-public interface QueryBuilderProjection<SELF extends QueryBuilderProjection<SELF, T>, T> {
-
-  /**
-   * Apply the path properties replacing the select and fetch clauses.
-   * <p>
-   * This is typically used when the FetchPath is applied to both the query and the JSON output.
-   */
-  SELF apply(FetchPath fetchPath);
-
-  /**
-   * Specify the properties to fetch on the root level entity bean in comma delimited format.
-   * <p>
-   * The Id property is automatically included in the properties to fetch unless setDistinct(true)
-   * is set on the query.
-   * </p>
-   * <p>
-   * Use {@link #fetch(String, String)} to specify specific properties to fetch
-   * on other non-root level paths of the object graph.
-   * </p>
-   * <pre>{@code
-   *
-   * List<Customer> customers = DB.find(Customer.class)
-   *     // Only fetch the customer id, name and status.
-   *     // This is described as a "Partial Object"
-   *     .select("name, status")
-   *     .where.ilike("name", "rob%")
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param fetchProperties the properties to fetch for this bean (* = all properties).
-   */
-  SELF select(String fetchProperties);
-
-  /**
-   * Set DISTINCT ON clause. This is a Postgres only SQL feature.
-   *
-   * @param distinctOn The properties to include in the DISTINCT ON clause.
-   */
-  SELF distinctOn(String distinctOn);
-
-  /**
-   * Apply the fetchGroup which defines what part of the object graph to load.
-   */
-  SELF select(FetchGroup<T> fetchGroup);
-
-  /**
-   * Specify a path to fetch eagerly including specific properties.
-   * <p>
-   * Ebean will endeavour to fetch this path using a SQL join. If Ebean determines that it can
-   * not use a SQL join (due to maxRows or because it would result in a cartesian product) Ebean
-   * will automatically convert this fetch query into a "query join" - i.e. use fetchQuery().
-   * </p>
-   * <pre>{@code
-   *
-   * // query orders...
-   * List<Order> orders = DB.find(Order.class)
-   *       // fetch the customer...
-   *       // ... getting the customers name and phone number
-   *       .fetch("customer", "name, phoneNumber")
-   *
-   *       // ... also fetch the customers billing address (* = all properties)
-   *       .fetch("customer.billingAddress", "*")
-   *       .findList();
-   * }</pre>
-   * <p>
-   * If columns is null or "*" then all columns/properties for that path are fetched.
-   * </p>
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     .select("name, status")
-   *     .fetch("contacts", "firstName,lastName,email")
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param path            the property path we wish to fetch eagerly.
-   * @param fetchProperties properties of the associated bean that you want to include in the
-   *                        fetch (* means all properties, null also means all properties).
-   */
-  SELF fetch(String path, String fetchProperties);
-
-  /**
-   * Fetch the path and properties using a "query join" (separate SQL query).
-   * <p>
-   * This is the same as:
-   * </p>
-   * <pre>{@code
-   *
-   *  fetch(path, fetchProperties, FetchConfig.ofQuery())
-   *
-   * }</pre>
-   * <p>
-   * This would be used instead of a fetch() when we use a separate SQL query to fetch this
-   * part of the object graph rather than a SQL join.
-   * <p>
-   * We might typically get a performance benefit when the path to fetch is a OneToMany
-   * or ManyToMany, the 'width' of the 'root bean' is wide and the cardinality of the many
-   * is high.
-   *
-   * @param path            the property path we wish to fetch eagerly.
-   * @param fetchProperties properties of the associated bean that you want to include in the
-   *                        fetch (* means all properties, null also means all properties).
-   */
-  SELF fetchQuery(String path, String fetchProperties);
-
-  /**
-   * Fetch the path and properties using L2 bean cache.
-   *
-   * @param path            The path of the beans we are fetching from L2 cache.
-   * @param fetchProperties The properties that should be loaded.
-   */
-  SELF fetchCache(String path, String fetchProperties);
-
-  /**
-   * Fetch the path and properties lazily (via batch lazy loading).
-   * <p>
-   * This is the same as:
-   *
-   * <pre>{@code
-   *
-   *  fetch(path, fetchProperties, FetchConfig.ofLazy())
-   *
-   * }</pre>
-   * <p>
-   * The reason for using fetchLazy() is to either:
-   * <ul>
-   * <li>Control/tune what is fetched as part of lazy loading</li>
-   * <li>Make use of the L2 cache, build this part of the graph from L2 cache</li>
-   * </ul>
-   *
-   * @param path            the property path we wish to fetch lazily.
-   * @param fetchProperties properties of the associated bean that you want to include in the
-   *                        fetch (* means all properties, null also means all properties).
-   */
-  SELF fetchLazy(String path, String fetchProperties);
-
-  /**
-   * Additionally specify a FetchConfig to use a separate query or lazy loading
-   * to load this path.
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     .select("name, status")
-   *     .fetch("contacts", "firstName,lastName,email", FetchConfig.ofLazy(10))
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param path the property path we wish to fetch eagerly.
-   */
-  SELF fetch(String path, String fetchProperties, FetchConfig fetchConfig);
-
-  /**
-   * Specify a path to fetch eagerly including all its properties.
-   * <p>
-   * Ebean will endeavour to fetch this path using a SQL join. If Ebean determines that it can
-   * not use a SQL join (due to maxRows or because it would result in a cartesian product) Ebean
-   * will automatically convert this fetch query into a "query join" - i.e. use fetchQuery().
-   * </p>
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     // eager fetch the contacts
-   *     .fetch("contacts")
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param path the property path we wish to fetch eagerly.
-   */
-  SELF fetch(String path);
-
-  /**
-   * Fetch the path eagerly using a "query join" (separate SQL query).
-   * <p>
-   * This is the same as:
-   * <pre>{@code
-   *
-   *  fetch(path, FetchConfig.ofQuery())
-   *
-   * }</pre>
-   * <p>
-   * This would be used instead of a fetch() when we use a separate SQL query to fetch this
-   * part of the object graph rather than a SQL join.
-   * <p>
-   * We might typically get a performance benefit when the path to fetch is a OneToMany
-   * or ManyToMany, the 'width' of the 'root bean' is wide and the cardinality of the many
-   * is high.
-   *
-   * @param path the property path we wish to fetch eagerly
-   */
-  SELF fetchQuery(String path);
-
-  /**
-   * Fetch the path eagerly using L2 cache.
-   */
-  SELF fetchCache(String path);
-
-  /**
-   * Fetch the path lazily (via batch lazy loading).
-   * <p>
-   * This is the same as:
-   * </p>
-   * <pre>{@code
-   *
-   *  fetch(path, FetchConfig.ofLazy())
-   *
-   * }</pre>
-   * <p>
-   * The reason for using fetchLazy() is to either:
-   * </p>
-   * <ul>
-   * <li>Control/tune what is fetched as part of lazy loading</li>
-   * <li>Make use of the L2 cache, build this part of the graph from L2 cache</li>
-   * </ul>
-   *
-   * @param path the property path we wish to fetch lazily.
-   */
-  SELF fetchLazy(String path);
-
-  /**
-   * Additionally specify a JoinConfig to specify a "query join" and or define
-   * the lazy loading query.
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     // lazy fetch contacts with a batch size of 100
-   *     .fetch("contacts", FetchConfig.ofLazy(100))
-   *     .findList();
-   *
-   * }</pre>
-   */
-  SELF fetch(String path, FetchConfig fetchConfig);
-
-}

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

@@ -25,7 +25,7 @@ import java.util.Iterator;
  *
  *  Query<Customer> query = database.find(Customer.class)
  *     .where().gt("id", 0)
- *     .orderBy("id")
+ *     .order("id")
  *     .setMaxRows(2);
  *
  *  QueryIterator<Customer> it = query.findIterate();

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

@@ -111,7 +111,7 @@ package io.ebean;
  *     .fetch("order.customer", "name")
  *     .where().gt("order.id", 0)
  *     .having().gt("totalAmount", 20)
- *     .orderBy().desc("totalAmount")
+ *     .order().desc("totalAmount")
  *     .setMaxRows(10)
  *     .findList();
  *

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

@@ -22,14 +22,14 @@ public interface RawSqlBuilder {
    * resultSet.
    */
   static RawSql resultSet(ResultSet resultSet, String... propertyNames) {
-    return XBootstrapService.rawSql().resultSet(resultSet, propertyNames);
+    return XServiceProvider.rawSql().resultSet(resultSet, propertyNames);
   }
 
   /**
    * Create and return a SqlRow based on the resultSet with dbTrueValue and binaryOptimizedUUID options.
    */
   static SqlRow sqlRow(ResultSet resultSet, final String dbTrueValue, boolean binaryOptimizedUUID) throws SQLException {
-    return XBootstrapService.rawSql().sqlRow(resultSet, dbTrueValue, binaryOptimizedUUID);
+    return XServiceProvider.rawSql().sqlRow(resultSet, dbTrueValue, binaryOptimizedUUID);
   }
 
   /**
@@ -38,7 +38,7 @@ public interface RawSqlBuilder {
    * this query.
    */
   static RawSqlBuilder unparsed(String sql) {
-    return XBootstrapService.rawSql().unparsed(sql);
+    return XServiceProvider.rawSql().unparsed(sql);
   }
 
   /**
@@ -55,7 +55,7 @@ public interface RawSqlBuilder {
    * </p>
    */
   static RawSqlBuilder parse(String sql) {
-    return XBootstrapService.rawSql().parsed(sql);
+    return XServiceProvider.rawSql().parsed(sql);
   }
 
   /**

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

@@ -1,12 +1,11 @@
 package io.ebean;
 
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 
 import javax.sql.DataSource;
 import java.io.Serializable;
 import java.sql.Connection;
-import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -40,7 +39,7 @@ import java.util.function.Predicate;
  *
  * }</pre>
  */
-@NullMarked
+@NonNullApi
 public interface SqlQuery extends Serializable, CancelableQuery {
 
   /**
@@ -172,7 +171,7 @@ public interface SqlQuery extends Serializable, CancelableQuery {
    *   List<SqlRow> list =
    *     DB.sqlQuery(sql)
    *       .setParameter("Rob")
-   *       .setParameter(Status.NEW)
+   *       .setParameter("Status.NEW)
    *       .findList();
    *
    *   // the same as ...
@@ -242,45 +241,11 @@ public interface SqlQuery extends Serializable, CancelableQuery {
    */
   SqlQuery setParameter(int position, Object value);
 
-  /**
-   * Bind the array parameter by its index position for use with Postgres ANY.
-   * <p>
-   * For Postgres this binds an ARRAY rather than expands into multiple bind values.
-   * <pre>{@code
-   *
-   *    String sql = "select name from customer where id = any(?)";
-   *
-   *    List<SqlRow> list =
-   *      DB.sqlQuery(sql)
-   *        .setArrayParameter(1, List.of(1, 2, 3))
-   *        .findList();
-   *
-   * }</pre>
-   */
-  SqlQuery setArrayParameter(int position, Collection<?> value);
-
   /**
    * Bind the named parameter value.
    */
   SqlQuery setParameter(String name, Object value);
 
-  /**
-   * Bind the named array parameter which we would use with Postgres ANY.
-   * <p>
-   * For Postgres this binds an ARRAY rather than expands into multiple bind values.
-   * <pre>{@code
-   *
-   *    String sql = "select name from customer where id = any(:idList)";
-   *
-   *    List<SqlRow> list =
-   *      DB.sqlQuery(sql)
-   *        .setArrayParameter("idList", List.of(1, 2, 3))
-   *        .findList();
-   *
-   * }</pre>
-   */
-  SqlQuery setArrayParameter(String name, Collection<?> value);
-
   /**
    * Set the index of the first row of the results to return.
    */

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

@@ -1,22 +0,0 @@
-package io.ebean;
-
-/**
- * Attempted to modify a read only entity.
- */
-public class UnmodifiableEntityException extends BeanAccessException {
-  private static final long serialVersionUID = 1;
-
-  /**
-   * Create with no message.
-   */
-  public UnmodifiableEntityException() {
-    super();
-  }
-
-  /**
-   * Create with message.
-   */
-  public UnmodifiableEntityException(String message) {
-    super(message);
-  }
-}

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

@@ -1,95 +0,0 @@
-package io.ebean;
-
-import io.ebean.metric.MetricFactory;
-import io.ebean.service.*;
-
-import java.util.ServiceLoader;
-
-/**
- * Bootstrap internal services.
- */
-public final class XBootstrapService {
-
-  private static final SpiContainerFactory containerFactory;
-  private static final SpiRawSqlService rawSqlService;
-  private static final SpiProfileLocationFactory profileLocationFactory;
-  private static final SpiFetchGroupService fetchGroupService;
-  private static final MetricFactory metricFactory;
-  private static final SpiJsonService jsonService;
-  static {
-    SpiContainerFactory _factory = null;
-    SpiRawSqlService _raw = null;
-    SpiProfileLocationFactory _profile = null;
-    SpiFetchGroupService _fetch = null;
-    MetricFactory _metric = null;
-    SpiJsonService _json = null;
-    for (BootstrapService extension : ServiceLoader.load(BootstrapService.class)) {
-      if (extension instanceof SpiContainerFactory) {
-        _factory = (SpiContainerFactory)extension;
-      } else if (extension instanceof SpiRawSqlService) {
-        _raw = (SpiRawSqlService)extension;
-      } else if (extension instanceof SpiProfileLocationFactory) {
-        _profile = (SpiProfileLocationFactory)extension;
-      } else if (extension instanceof SpiFetchGroupService) {
-        _fetch = (SpiFetchGroupService)extension;
-      } else if (extension instanceof MetricFactory) {
-        _metric = (MetricFactory)extension;
-      } else if (extension instanceof SpiJsonService) {
-        _json = (SpiJsonService)extension;
-      }
-    }
-    containerFactory = _factory;
-    rawSqlService = _raw;
-    profileLocationFactory = _profile;
-    fetchGroupService = _fetch;
-    metricFactory = _metric;
-    jsonService = _json;
-  }
-
-  /**
-   * Return the MetricFactory found in boostrap service loading.
-   */
-  public static MetricFactory metricFactory() {
-    return metricFactory;
-  }
-
-  /**
-   * Return the SpiJsonService found in boostrap service loading.
-   */
-  public static SpiJsonService jsonService() {
-    return jsonService;
-  }
-
-  static SpiContainerFactory containerFactory() {
-    return containerFactory;
-  }
-
-  static SpiRawSqlService rawSql() {
-    return rawSqlService;
-  }
-
-  static SpiProfileLocationFactory profileLocationFactory() {
-    return profileLocationFactory;
-  }
-
-  /**
-   * Return the FetchGroup with the given select clause.
-   */
-  static <T> FetchGroup<T> fetchGroupOf(Class<T> cls, String select) {
-    return fetchGroupService.of(cls, select);
-  }
-
-  /**
-   * Return the FetchGroupBuilder with the given select clause.
-   */
-  static <T> FetchGroupBuilder<T> fetchGroupOf(Class<T> cls) {
-    return fetchGroupService.of(cls);
-  }
-
-  /**
-   * Return the FetchGroup Query for building fetch groups via query beans.
-   */
-  static <T> SpiFetchGroupQuery<T> fetchGroupQueryFor(Class<T> cls) {
-    return fetchGroupService.queryFor(cls);
-  }
-}

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

@@ -0,0 +1,76 @@
+package io.ebean;
+
+import io.ebean.service.SpiFetchGroupQuery;
+import io.ebean.service.SpiFetchGroupService;
+import io.ebean.service.SpiProfileLocationFactory;
+import io.ebean.service.SpiRawSqlService;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+/**
+ * Lookup internal services.
+ */
+final class XServiceProvider {
+
+  private static SpiRawSqlService rawSqlService = initRawSql();
+
+  private static SpiProfileLocationFactory profileLocationFactory = initProfileLocation();
+
+  private static SpiFetchGroupService fetchGroupService = initSpiFetchGroupService();
+
+  private static SpiFetchGroupService initSpiFetchGroupService() {
+    return loadFirstService(SpiFetchGroupService.class);
+  }
+
+  private static SpiRawSqlService initRawSql() {
+    return loadFirstService(SpiRawSqlService.class);
+  }
+
+  private static SpiProfileLocationFactory initProfileLocation() {
+    return loadFirstService(SpiProfileLocationFactory.class);
+  }
+
+  private static <T> T loadFirstService(Class<T> cls) {
+    Iterator<T> loader = ServiceLoader.load(cls).iterator();
+    if (loader.hasNext()) {
+      return loader.next();
+    }
+    throw new IllegalStateException("No service implementation found for " + cls);
+  }
+
+  /**
+   * Return the RawSqlService implementation.
+   */
+  static SpiRawSqlService rawSql() {
+    return rawSqlService;
+  }
+
+  /**
+   * Return the RawSqlService implementation.
+   */
+  static SpiProfileLocationFactory profileLocationFactory() {
+    return profileLocationFactory;
+  }
+
+  /**
+   * Return the FetchGroup with the given select clause.
+   */
+  static <T> FetchGroup<T> fetchGroupOf(Class<T> cls, String select) {
+    return fetchGroupService.of(cls, select);
+  }
+
+  /**
+   * Return the FetchGroupBuilder with the given select clause.
+   */
+  static <T> FetchGroupBuilder<T> fetchGroupOf(Class<T> cls) {
+    return fetchGroupService.of(cls);
+  }
+
+  /**
+   * Return the FetchGroup Query for building fetch groups via query beans.
+   */
+  static <T> SpiFetchGroupQuery<T> fetchGroupQueryFor(Class<T> cls) {
+    return fetchGroupService.queryFor(cls);
+  }
+}

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

@@ -119,6 +119,18 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
    */
   void setLoader(BeanCollectionLoader beanLoader);
 
+  /**
+   * Set to true if you want the BeanCollection to be treated as read only. This
+   * means no elements can be added or removed etc.
+   */
+  void setReadOnly(boolean readOnly);
+
+  /**
+   * Return true if the collection should be treated as readOnly and no elements
+   * can be added or removed etc.
+   */
+  boolean isReadOnly();
+
   /**
    * Add the bean to the collection. This is disallowed for BeanMap.
    */
@@ -225,7 +237,7 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
   boolean wasTouched();
 
   /**
-   * Freeze the collection returning an unmodifiable version.
+   * Return a shallow copy of this collection that is modifiable.
    */
-  Object freeze();
+  BeanCollection<E> shallowCopy();
 }

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

@@ -148,6 +148,18 @@ public interface EntityBeanIntercept extends Serializable {
    */
   boolean isLoadedFromCache();
 
+  /**
+   * Return true if the bean should be treated as readOnly. If a setter method
+   * is called when it is readOnly an Exception is thrown.
+   */
+  boolean isReadOnly();
+
+  /**
+   * Set the readOnly status. If readOnly then calls to setter methods through
+   * an exception.
+   */
+  void setReadOnly(boolean readOnly);
+
   /**
    * Set the bean to be updated when persisted (for merge).
    */
@@ -381,6 +393,11 @@ public interface EntityBeanIntercept extends Serializable {
    */
   void loadBean(int loadProperty);
 
+  /**
+   * Invoke the lazy loading. This method is synchronised externally.
+   */
+  void loadBeanInternal(int loadProperty, BeanLoader loader);
+
   /**
    * Called when a BeanCollection is initialised automatically.
    */
@@ -535,9 +552,4 @@ public interface EntityBeanIntercept extends Serializable {
    * Update the 'next' mutable info returning the content that was obtained via dirty detection.
    */
   String mutableNext(int propertyIndex);
-
-  /**
-   * Return true if this entity bean should be frozen. Used to handle recursive freezing.
-   */
-  boolean freeze();
 }

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

@@ -1,70 +0,0 @@
-package io.ebean.bean;
-
-/**
- * Common base features for EntityBeanIntercept.
- */
-abstract class InterceptBase implements EntityBeanIntercept {
-
-  final EntityBean owner;
-  boolean fullyLoadedBean;
-
-  /**
-   * Create with a given entity.
-   */
-  InterceptBase(Object ownerBean) {
-    this.owner = (EntityBean) ownerBean;
-  }
-
-  /**
-   * EXPERIMENTAL - Constructor only for use by serialization frameworks.
-   */
-  InterceptBase() {
-    this.owner = null;
-  }
-
-  @Override
-  public final EntityBean owner() {
-    return owner;
-  }
-
-  @Override
-  public final boolean isFullyLoadedBean() {
-    return fullyLoadedBean;
-  }
-
-  @Override
-  public final void setFullyLoadedBean(boolean fullyLoadedBean) {
-    this.fullyLoadedBean = fullyLoadedBean;
-  }
-
-  @Override
-  public final String property(int propertyIndex) {
-    if (propertyIndex == -1) {
-      return null;
-    }
-    return owner._ebean_getPropertyName(propertyIndex);
-  }
-
-  @Override
-  public final int findProperty(String propertyName) {
-    final String[] names = owner._ebean_getPropertyNames();
-    for (int i = 0; i < names.length; i++) {
-      if (names[i].equals(propertyName)) {
-        return i;
-      }
-    }
-    return -1;
-  }
-
-  @Override
-  public final 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(',');
-      }
-    }
-    return sb;
-  }
-}

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

@@ -1,44 +1,37 @@
 package io.ebean.bean;
 
-import io.ebean.LazyInitialisationException;
-import io.ebean.UnmodifiableEntityException;
 import io.ebean.ValuePair;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * EntityBeanIntercept optimised for read only use.
  * <p>
  * For the read only use this intercept doesn't need to hold any state that is normally
- * required for updates such as per property changed, dirty state, original values
+ * required for updates such as per property changed, loaded, dirty state, original values
  * bean state etc.
  */
-public final class InterceptReadOnly extends InterceptBase {
+public class InterceptReadOnly implements EntityBeanIntercept {
 
-  private final boolean[] loaded;
-  private boolean frozen;
+  private final EntityBean owner;
 
   /**
    * Create with a given entity.
    */
   public InterceptReadOnly(Object ownerBean) {
-    super(ownerBean);
-    this.loaded = new boolean[owner._ebean_getPropertyNames().length];
-  }
-
-  @Override
-  public boolean freeze() {
-    if (frozen) {
-      return false;
-    } else {
-      frozen = true;
-      return true;
-    }
+    this.owner = (EntityBean) ownerBean;
   }
 
   @Override
   public String toString() {
-    return "InterceptReadOnly{frozen:" + frozen + " loaded:" + loadedPropertyNames() + '}';
+    return "InterceptReadOnly{" + owner + '}';
+  }
+
+  @Override
+  public EntityBean owner() {
+    return owner;
   }
 
   @Override
@@ -101,13 +94,18 @@ public final class InterceptReadOnly extends InterceptBase {
 
   }
 
+  @Override
+  public boolean isFullyLoadedBean() {
+    return false;
+  }
+
+  @Override
+  public void setFullyLoadedBean(boolean fullyLoadedBean) {
+
+  }
+
   @Override
   public boolean isPartial() {
-    for (boolean flag : loaded) {
-      if (!flag) {
-        return true;
-      }
-    }
     return false;
   }
 
@@ -138,14 +136,7 @@ public final class InterceptReadOnly extends InterceptBase {
 
   @Override
   public boolean hasIdOnly(int idIndex) {
-    for (int i = 0; i < loaded.length; i++) {
-      if (i == idIndex) {
-        if (!loaded[i]) return false;
-      } else if (loaded[i]) {
-        return false;
-      }
-    }
-    return true;
+    return false;
   }
 
   @Override
@@ -168,6 +159,16 @@ public final class InterceptReadOnly extends InterceptBase {
     return false;
   }
 
+  @Override
+  public boolean isReadOnly() {
+    return true;
+  }
+
+  @Override
+  public void setReadOnly(boolean readOnly) {
+
+  }
+
   @Override
   public void setForceUpdate(boolean forceUpdate) {
 
@@ -233,38 +234,44 @@ public final class InterceptReadOnly extends InterceptBase {
     return null;
   }
 
+  @Override
+  public int findProperty(String propertyName) {
+    return 0;
+  }
+
+  @Override
+  public String property(int propertyIndex) {
+    return null;
+  }
+
   @Override
   public int propertyLength() {
-    return loaded.length;
+    return 0;
   }
 
   @Override
   public void setPropertyLoaded(String propertyName, boolean loaded) {
-    final int position = findProperty(propertyName);
-    if (position == -1) {
-      throw new IllegalArgumentException("Property not found - " + propertyName);
-    }
-    this.loaded[position] = loaded;
+
   }
 
   @Override
   public void setPropertyUnloaded(int propertyIndex) {
-    loaded[propertyIndex] = false;
+
   }
 
   @Override
   public void setLoadedProperty(int propertyIndex) {
-    loaded[propertyIndex] = true;
+
   }
 
   @Override
   public void setLoadedPropertyAll() {
-    Arrays.fill(loaded, true);
+
   }
 
   @Override
   public boolean isLoadedProperty(int propertyIndex) {
-    return loaded[propertyIndex];
+    return false;
   }
 
   @Override
@@ -314,16 +321,7 @@ public final class InterceptReadOnly extends InterceptBase {
 
   @Override
   public Set<String> loadedPropertyNames() {
-    if (fullyLoadedBean) {
-      return null;
-    }
-    final Set<String> props = new LinkedHashSet<>();
-    for (int i = 0; i < loaded.length; i++) {
-      if (loaded[i]) {
-        props.add(property(i));
-      }
-    }
-    return props;
+    return Collections.emptySet();
   }
 
   @Override
@@ -371,11 +369,14 @@ public final class InterceptReadOnly extends InterceptBase {
 
   }
 
+  @Override
+  public StringBuilder loadedPropertyKey() {
+    return null;
+  }
+
   @Override
   public boolean[] loaded() {
-    final boolean[] ret = new boolean[loaded.length];
-    System.arraycopy(loaded, 0, ret, 0, ret.length);
-    return ret;
+    return new boolean[0];
   }
 
   @Override
@@ -393,9 +394,14 @@ public final class InterceptReadOnly extends InterceptBase {
 
   }
 
+  @Override
+  public void loadBeanInternal(int loadProperty, BeanLoader loader) {
+
+  }
+
   @Override
   public void initialisedMany(int propertyIndex) {
-    loaded[propertyIndex] = true;
+
   }
 
   @Override
@@ -410,14 +416,12 @@ public final class InterceptReadOnly extends InterceptBase {
 
   @Override
   public void preGetter(int propertyIndex) {
-    if (!loaded[propertyIndex]) {
-      throw new LazyInitialisationException("Property not loaded: " + property(propertyIndex));
-    }
+
   }
 
   @Override
   public void preSetterMany(boolean interceptField, int propertyIndex, Object oldValue, Object newValue) {
-    throw new UnmodifiableEntityException("Attempting to modify " + property(propertyIndex));
+
   }
 
   @Override
@@ -432,57 +436,57 @@ public final class InterceptReadOnly extends InterceptBase {
 
   @Override
   public void preSetter(boolean intercept, int propertyIndex, Object oldValue, Object newValue) {
-    throw new UnmodifiableEntityException("Attempting to modify " + property(propertyIndex));
+
   }
 
   @Override
   public void preSetter(boolean intercept, int propertyIndex, boolean oldValue, boolean newValue) {
-    throw new UnmodifiableEntityException("Attempting to modify " + property(propertyIndex));
+
   }
 
   @Override
   public void preSetter(boolean intercept, int propertyIndex, int oldValue, int newValue) {
-    throw new UnmodifiableEntityException("Attempting to modify " + property(propertyIndex));
+
   }
 
   @Override
   public void preSetter(boolean intercept, int propertyIndex, long oldValue, long newValue) {
-    throw new UnmodifiableEntityException("Attempting to modify " + property(propertyIndex));
+
   }
 
   @Override
   public void preSetter(boolean intercept, int propertyIndex, double oldValue, double newValue) {
-    throw new UnmodifiableEntityException("Attempting to modify " + property(propertyIndex));
+
   }
 
   @Override
   public void preSetter(boolean intercept, int propertyIndex, float oldValue, float newValue) {
-    throw new UnmodifiableEntityException("Attempting to modify " + property(propertyIndex));
+
   }
 
   @Override
   public void preSetter(boolean intercept, int propertyIndex, short oldValue, short newValue) {
-    throw new UnmodifiableEntityException("Attempting to modify " + property(propertyIndex));
+
   }
 
   @Override
   public void preSetter(boolean intercept, int propertyIndex, char oldValue, char newValue) {
-    throw new UnmodifiableEntityException("Attempting to modify " + property(propertyIndex));
+
   }
 
   @Override
   public void preSetter(boolean intercept, int propertyIndex, byte oldValue, byte newValue) {
-    throw new UnmodifiableEntityException("Attempting to modify " + property(propertyIndex));
+
   }
 
   @Override
   public void preSetter(boolean intercept, int propertyIndex, char[] oldValue, char[] newValue) {
-    throw new UnmodifiableEntityException("Attempting to modify " + property(propertyIndex));
+
   }
 
   @Override
   public void preSetter(boolean intercept, int propertyIndex, byte[] oldValue, byte[] newValue) {
-    throw new UnmodifiableEntityException("Attempting to modify " + property(propertyIndex));
+
   }
 
   @Override

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

@@ -2,7 +2,6 @@ package io.ebean.bean;
 
 import io.ebean.DB;
 import io.ebean.Database;
-import io.ebean.LazyInitialisationException;
 import io.ebean.ValuePair;
 
 import jakarta.persistence.EntityNotFoundException;
@@ -23,7 +22,7 @@ import java.util.concurrent.locks.ReentrantLock;
  * This provides the mechanisms to support deferred fetching of reference beans
  * and oldValues generation for concurrency checking.
  */
-public final class InterceptReadWrite extends InterceptBase {
+public final class InterceptReadWrite implements EntityBeanIntercept {
 
   private static final long serialVersionUID = -3664031775464862649L;
 
@@ -57,13 +56,18 @@ public final class InterceptReadWrite extends InterceptBase {
   private String ebeanServerName;
   private boolean deletedFromCollection;
 
+  /**
+   * The actual entity bean that 'owns' this intercept.
+   */
+  private final EntityBean owner;
   private EntityBean embeddedOwner;
   private int embeddedOwnerIndex;
   /**
-   * One of NEW, REFERENCE, LOADED.
+   * One of NEW, REF, UPD.
    */
   private int state;
   private boolean forceUpdate;
+  private boolean readOnly;
   private boolean dirty;
   /**
    * Flag set to disable lazy loading.
@@ -73,6 +77,7 @@ public final class InterceptReadWrite extends InterceptBase {
    * Flag set when lazy loading failed due to the underlying bean being deleted in the DB.
    */
   private boolean lazyLoadFailure;
+  private boolean fullyLoadedBean;
   private boolean loadedFromCache;
   private final byte[] flags;
   private Object[] origValues;
@@ -96,7 +101,7 @@ public final class InterceptReadWrite extends InterceptBase {
    * Create with a given entity.
    */
   public InterceptReadWrite(Object ownerBean) {
-    super(ownerBean);
+    this.owner = (EntityBean) ownerBean;
     this.flags = new byte[owner._ebean_getPropertyNames().length];
   }
 
@@ -104,20 +109,16 @@ public final class InterceptReadWrite extends InterceptBase {
    * EXPERIMENTAL - Constructor only for use by serialization frameworks.
    */
   public InterceptReadWrite() {
-    super();
+    this.owner = null;
     this.flags = null;
   }
 
-  @Override
-  public boolean freeze() {
-    throw new UnsupportedOperationException("never expected");
-  }
-
   @Override
   public String toString() {
     return "InterceptReadWrite@" + hashCode() + "{state=" + state +
       (dirty ? " dirty;" : "") +
       (forceUpdate ? " forceUpdate;" : "") +
+      (readOnly ? " readOnly;" : "") +
       (disableLazyLoad ? " disableLazyLoad;" : "") +
       (lazyLoadFailure ? " lazyLoadFailure;" : "") +
       (fullyLoadedBean ? " fullyLoadedBean;" : "") +
@@ -130,6 +131,11 @@ public final class InterceptReadWrite extends InterceptBase {
       '}';
   }
 
+  @Override
+  public EntityBean owner() {
+    return owner;
+  }
+
   @Override
   public PersistenceContext persistenceContext() {
     return persistenceContext;
@@ -194,6 +200,16 @@ public final class InterceptReadWrite extends InterceptBase {
     this.ebeanServerName = beanLoader.name();
   }
 
+  @Override
+  public boolean isFullyLoadedBean() {
+    return fullyLoadedBean;
+  }
+
+  @Override
+  public void setFullyLoadedBean(boolean fullyLoadedBean) {
+    this.fullyLoadedBean = fullyLoadedBean;
+  }
+
   @Override
   public boolean isPartial() {
     for (byte flag : flags) {
@@ -282,6 +298,16 @@ public final class InterceptReadWrite extends InterceptBase {
     return loadedFromCache;
   }
 
+  @Override
+  public boolean isReadOnly() {
+    return readOnly;
+  }
+
+  @Override
+  public void setReadOnly(boolean readOnly) {
+    this.readOnly = readOnly;
+  }
+
   @Override
   public void setForceUpdate(boolean forceUpdate) {
     this.forceUpdate = forceUpdate;
@@ -385,6 +411,25 @@ public final class InterceptReadWrite extends InterceptBase {
     return origValues[propertyIndex];
   }
 
+  @Override
+  public int findProperty(String propertyName) {
+    final String[] names = owner._ebean_getPropertyNames();
+    for (int i = 0; i < names.length; i++) {
+      if (names[i].equals(propertyName)) {
+        return i;
+      }
+    }
+    return -1;
+  }
+
+  @Override
+  public String property(int propertyIndex) {
+    if (propertyIndex == -1) {
+      return null;
+    }
+    return owner._ebean_getPropertyName(propertyIndex);
+  }
+
   @Override
   public int propertyLength() {
     return flags.length;
@@ -623,6 +668,18 @@ public final class InterceptReadWrite extends InterceptBase {
     }
   }
 
+  @Override
+  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(',');
+      }
+    }
+    return sb;
+  }
+
   @Override
   public boolean[] loaded() {
     final boolean[] ret = new boolean[flags.length];
@@ -646,15 +703,12 @@ public final class InterceptReadWrite extends InterceptBase {
   public void loadBean(int loadProperty) {
     lock.lock();
     try {
-      if (disableLazyLoad) {
-        throw new LazyInitialisationException("Property not loaded: " + property(loadProperty));
-      }
       if (beanLoader == null) {
         final Database database = DB.byName(ebeanServerName);
         if (database == null) {
           throw new PersistenceException(ebeanServerName == null ? "No registered default server" : "Database [" + ebeanServerName + "] is not registered");
         }
-        // For stand-alone reference bean or after deserialisation lazy load
+        // For stand alone reference bean or after deserialisation lazy load
         // using the ebeanServer. Synchronise only on the bean.
         loadBeanInternal(loadProperty, database.pluginApi().beanLoader());
         return;
@@ -672,7 +726,8 @@ public final class InterceptReadWrite extends InterceptBase {
     }
   }
 
-  private void loadBeanInternal(int loadProperty, BeanLoader loader) {
+  @Override
+  public void loadBeanInternal(int loadProperty, BeanLoader loader) {
     if ((flags[loadProperty] & FLAG_LOADED_PROP) != 0) {
       // race condition where multiple threads calling preGetter concurrently
       return;
@@ -774,7 +829,7 @@ public final class InterceptReadWrite extends InterceptBase {
   @Override
   public void preGetter(int propertyIndex) {
     preGetterCallback(propertyIndex);
-    if (state == STATE_NEW) {
+    if (state == STATE_NEW || disableLazyLoad) {
       return;
     }
     if (!isLoadedProperty(propertyIndex)) {
@@ -790,12 +845,18 @@ public final class InterceptReadWrite extends InterceptBase {
     if (state == STATE_NEW) {
       setLoadedProperty(propertyIndex);
     } else {
+      if (readOnly) {
+        throw new IllegalStateException("This bean is readOnly");
+      }
       setChangeLoaded(propertyIndex);
     }
   }
 
   @Override
   public void setChangedPropertyValue(int propertyIndex, boolean setDirtyState, Object origValue) {
+    if (readOnly) {
+      throw new IllegalStateException("This bean is readOnly");
+    }
     setChangedProperty(propertyIndex);
     if (setDirtyState) {
       setOriginalValue(propertyIndex, origValue);

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

@@ -1,6 +1,6 @@
 package io.ebean.cache;
 
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.Nullable;
 import io.ebean.meta.MetricVisitor;
 
 import java.util.LinkedHashMap;

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

@@ -17,6 +17,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   private static final long serialVersionUID = 3365725236140187588L;
 
   protected final ReentrantLock lock = new ReentrantLock();
+  protected boolean readOnly;
   protected boolean disableLazyLoad;
   /**
    * The Database this is associated with. (used for lazy fetch).
@@ -54,6 +55,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
     this.ebeanServerName = loader.name();
     this.ownerBean = ownerBean;
     this.propertyName = propertyName;
+    this.readOnly = ownerBean != null && ownerBean._ebean_getIntercept().isReadOnly();
   }
 
   @Override
@@ -101,6 +103,22 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
     this.ebeanServerName = loader.name();
   }
 
+  @Override
+  public boolean isReadOnly() {
+    return readOnly;
+  }
+
+  @Override
+  public void setReadOnly(boolean readOnly) {
+    this.readOnly = readOnly;
+  }
+
+  void checkReadOnly() {
+    if (readOnly) {
+      throw new IllegalStateException("This collection is in ReadOnly mode");
+    }
+  }
+
   // ---------------------------------------------------------
   // Support for modify additions deletions etc - ManyToMany
   // ---------------------------------------------------------
@@ -194,4 +212,14 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
     return modifyHolder != null && modifyHolder.wasTouched();
   }
 
+  /**
+   * Copies all relevant properties for a clone. See {@link #shallowCopy()}
+   */
+  protected void setFromOriginal(AbstractBeanCollection<E> other) {
+    this.disableLazyLoad = other.disableLazyLoad;
+    this.ebeanServerName = other.ebeanServerName;
+    this.loader = other.loader;
+    this.ownerBean = other.ownerBean;
+    this.propertyName = other.propertyName;
+  }
 }

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

@@ -2,6 +2,7 @@ package io.ebean.common;
 
 import io.ebean.bean.*;
 
+import java.io.Serializable;
 import java.util.*;
 
 /**
@@ -38,17 +39,6 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
     super(loader, ownerBean, propertyName);
   }
 
-  @Override
-  public List<E> freeze() {
-    if (list == null) {
-      return null;
-    } else if (list.isEmpty()) {
-      return List.of();
-    } else {
-      return Collections.unmodifiableList(list);
-    }
-  }
-
   @Override
   public void toString(ToStringBuilder builder) {
     builder.addCollection(list);
@@ -233,6 +223,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
 
   @Override
   public void add(int index, E element) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       modifyAddition(element);
@@ -247,6 +238,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
 
   @Override
   public boolean add(E bean) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       if (list.add(bean)) {
@@ -261,6 +253,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
 
   @Override
   public boolean addAll(Collection<? extends E> beans) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       // all elements in c are added (no contains checking)
@@ -271,6 +264,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
 
   @Override
   public boolean addAll(int index, Collection<? extends E> beans) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       // all elements in c are added (no contains checking)
@@ -281,6 +275,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
 
   @Override
   public void clear() {
+    checkReadOnly();
     // TODO: when clear() and not initialised could be more clever
     // and fetch just the Id's
     initClear();
@@ -325,6 +320,9 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
   @Override
   public Iterator<E> iterator() {
     init();
+    if (readOnly) {
+      return new ReadOnlyListIterator<>(list.listIterator());
+    }
     if (modifyListening) {
       return new ModifyIterator<>(this, list.iterator());
     }
@@ -340,6 +338,9 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
   @Override
   public ListIterator<E> listIterator() {
     init();
+    if (readOnly) {
+      return new ReadOnlyListIterator<>(list.listIterator());
+    }
     if (modifyListening) {
       return new ModifyListIterator<>(this, list.listIterator());
     }
@@ -349,6 +350,9 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
   @Override
   public ListIterator<E> listIterator(int index) {
     init();
+    if (readOnly) {
+      return new ReadOnlyListIterator<>(list.listIterator(index));
+    }
     if (modifyListening) {
       return new ModifyListIterator<>(this, list.listIterator(index));
     }
@@ -364,6 +368,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
 
   @Override
   public E remove(int index) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       E o = list.remove(index);
@@ -375,6 +380,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
 
   @Override
   public boolean remove(Object bean) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       boolean isRemove = list.remove(bean);
@@ -388,6 +394,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
 
   @Override
   public boolean removeAll(Collection<?> beans) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       boolean changed = false;
@@ -405,6 +412,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
 
   @Override
   public boolean retainAll(Collection<?> retainBeans) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       boolean changed = false;
@@ -425,6 +433,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
 
   @Override
   public E set(int index, E element) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       E o = list.set(index, element);
@@ -444,6 +453,9 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
   @Override
   public List<E> subList(int fromIndex, int toIndex) {
     init();
+    if (readOnly) {
+      return Collections.unmodifiableList(list.subList(fromIndex, toIndex));
+    }
     if (modifyListening) {
       return new ModifyList<>(this, list.subList(fromIndex, toIndex));
     }
@@ -463,4 +475,67 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
     return list.toArray(array);
   }
 
+  private static final class ReadOnlyListIterator<E> implements ListIterator<E>, Serializable {
+
+    private static final long serialVersionUID = 3097271091406323699L;
+
+    private final ListIterator<E> i;
+
+    ReadOnlyListIterator(ListIterator<E> i) {
+      this.i = i;
+    }
+
+    @Override
+    public void add(E o) {
+      throw new IllegalStateException("This collection is in ReadOnly mode");
+    }
+
+    @Override
+    public void remove() {
+      throw new IllegalStateException("This collection is in ReadOnly mode");
+    }
+
+    @Override
+    public void set(E o) {
+      throw new IllegalStateException("This collection is in ReadOnly mode");
+    }
+
+    @Override
+    public boolean hasNext() {
+      return i.hasNext();
+    }
+
+    @Override
+    public boolean hasPrevious() {
+      return i.hasPrevious();
+    }
+
+    @Override
+    public E next() {
+      return i.next();
+    }
+
+    @Override
+    public int nextIndex() {
+      return i.nextIndex();
+    }
+
+    @Override
+    public E previous() {
+      return i.previous();
+    }
+
+    @Override
+    public int previousIndex() {
+      return i.previousIndex();
+    }
+
+  }
+
+  @Override
+  public BeanCollection<E> shallowCopy() {
+    BeanList<E> copy = new BeanList<>(new CopyOnFirstWriteList<>(list));
+    copy.setFromOriginal(this);
+    return copy;
+  }
 }

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

@@ -37,11 +37,6 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
     super(ebeanServer, ownerBean, propertyName);
   }
 
-  @Override
-  public Map<K, E> freeze() {
-    return map == null ? null : Collections.unmodifiableMap(map);
-  }
-
   @Override
   public void toString(ToStringBuilder builder) {
     if (map == null || map.isEmpty()) {
@@ -222,6 +217,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
 
   @Override
   public void clear() {
+    checkReadOnly();
     initClear();
     if (modifyListening) {
       // add all beans to the removal list
@@ -247,6 +243,9 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   @Override
   public Set<Entry<K, E>> entrySet() {
     init();
+    if (readOnly) {
+      return Collections.unmodifiableSet(map.entrySet());
+    }
     return modifyListening ? new ModifyEntrySet<>(this, map.entrySet()) : map.entrySet();
   }
 
@@ -265,11 +264,15 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   @Override
   public Set<K> keySet() {
     init();
+    if (readOnly) {
+      return Collections.unmodifiableSet(map.keySet());
+    }
     return modifyListening ? new ModifyKeySet<>(this, map.keySet()) : map.keySet();
   }
 
   @Override
   public E put(K key, E value) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       E oldBean = map.put(key, value);
@@ -286,6 +289,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
 
   @Override
   public void putAll(Map<? extends K, ? extends E> puts) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       for (Entry<? extends K, ? extends E> entry : puts.entrySet()) {
@@ -302,16 +306,17 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
 
   @Override
   public void addBean(E bean) {
-    throw new UnsupportedOperationException("Method not allowed on Map. Please use List instead.");
+    throw new IllegalStateException("Method not allowed on Map. Please use List instead.");
   }
 
   @Override
   public void removeBean(E bean) {
-    throw new UnsupportedOperationException("Method not allowed on Map. Please use List instead.");
+    throw new IllegalStateException("Method not allowed on Map. Please use List instead.");
   }
 
   @Override
   public E remove(Object key) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       E o = map.remove(key);
@@ -330,6 +335,16 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   @Override
   public Collection<E> values() {
     init();
+    if (readOnly) {
+      return Collections.unmodifiableCollection(map.values());
+    }
     return modifyListening ? new ModifyCollection<>(this, map.values()) : map.values();
   }
+
+  @Override
+  public BeanCollection<E> shallowCopy() {
+    BeanMap<K, E> copy = new BeanMap<>(new LinkedHashMap<>(map));
+    copy.setFromOriginal(this);
+    return copy;
+  }
 }

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

@@ -3,7 +3,10 @@ package io.ebean.common;
 import io.ebean.bean.*;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 /**
  * Set capable of lazy loading and modification aware.
@@ -35,11 +38,6 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
     super(loader, ownerBean, propertyName);
   }
 
-  @Override
-  public Set<E> freeze() {
-    return set == null ? null : Collections.unmodifiableSet(set);
-  }
-
   @Override
   public void toString(ToStringBuilder builder) {
     builder.addCollection(set);
@@ -213,6 +211,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
 
   @Override
   public boolean add(E bean) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       if (set.add(bean)) {
@@ -227,6 +226,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
 
   @Override
   public boolean addAll(Collection<? extends E> beans) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       boolean changed = false;
@@ -244,6 +244,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
 
   @Override
   public void clear() {
+    checkReadOnly();
     initClear();
     if (modifyListening) {
       for (E bean : set) {
@@ -274,6 +275,9 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
   @Override
   public Iterator<E> iterator() {
     init();
+    if (readOnly) {
+      return new ReadOnlyIterator<>(set.iterator());
+    }
     if (modifyListening) {
       return new ModifyIterator<>(this, set.iterator());
     }
@@ -282,6 +286,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
 
   @Override
   public boolean remove(Object bean) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       if (set.remove(bean)) {
@@ -295,6 +300,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
 
   @Override
   public boolean removeAll(Collection<?> beans) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       boolean changed = false;
@@ -311,6 +317,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
 
   @Override
   public boolean retainAll(Collection<?> beans) {
+    checkReadOnly();
     init();
     if (modifyListening) {
       boolean changed = false;
@@ -348,4 +355,36 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
     return set.toArray(array);
   }
 
+  private static final class ReadOnlyIterator<E> implements Iterator<E>, Serializable {
+
+    private static final long serialVersionUID = 2577697326745352605L;
+
+    private final Iterator<E> it;
+
+    ReadOnlyIterator(Iterator<E> it) {
+      this.it = it;
+    }
+
+    @Override
+    public boolean hasNext() {
+      return it.hasNext();
+    }
+
+    @Override
+    public E next() {
+      return it.next();
+    }
+
+    @Override
+    public void remove() {
+      throw new IllegalStateException("This collection is in ReadOnly mode");
+    }
+  }
+
+  @Override
+  public BeanCollection<E> shallowCopy() {
+    BeanSet<E> copy = new BeanSet<>(new LinkedHashSet<>(set));
+    copy.setFromOriginal(this);
+    return copy;
+  }
 }

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

@@ -0,0 +1,185 @@
+package io.ebean.common;
+
+import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
+
+/**
+ * List that copies itself on first write access. Needed to keep memory footprint low and the ability
+ * to modify lists from cache.
+ *
+ * @author Roland Praml, FOCONIS AG
+ */
+public final class CopyOnFirstWriteList<E> extends AbstractList<E> implements List<E>, Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  private final ReentrantLock lock = new ReentrantLock();
+
+  /**
+   * The underlying List implementation.
+   */
+  private List<E> list;
+
+  public CopyOnFirstWriteList(List<E> list) {
+    super();
+    this.list = list;
+  }
+
+  private volatile boolean copied = false;
+
+  @Override
+  public int size() {
+    return list.size();
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return list.isEmpty();
+  }
+
+  @Override
+  public boolean contains(Object o) {
+    return list.contains(o);
+  }
+
+  @Override
+  public Object[] toArray() {
+    return list.toArray();
+  }
+
+  @Override
+  public <T> T[] toArray(T[] a) {
+    return list.toArray(a);
+  }
+
+  @Override
+  public boolean add(E e) {
+    checkCopyOnWrite();
+    return list.add(e);
+  }
+
+  @Override
+  public boolean remove(Object o) {
+    checkCopyOnWrite();
+    return list.remove(o);
+  }
+
+  @Override
+  public boolean containsAll(Collection<?> c) {
+    return list.containsAll(c);
+  }
+
+  @Override
+  public boolean addAll(Collection<? extends E> c) {
+    checkCopyOnWrite();
+    return list.addAll(c);
+  }
+
+  @Override
+  public boolean addAll(int index, Collection<? extends E> c) {
+    checkCopyOnWrite();
+    return list.addAll(index, c);
+  }
+
+  @Override
+  public boolean removeAll(Collection<?> c) {
+    checkCopyOnWrite();
+    return list.removeAll(c);
+  }
+
+  @Override
+  public boolean retainAll(Collection<?> c) {
+    checkCopyOnWrite();
+    return list.retainAll(c);
+  }
+
+  @Override
+  public void replaceAll(UnaryOperator<E> operator) {
+    checkCopyOnWrite();
+    list.replaceAll(operator);
+  }
+
+  @Override
+  public boolean removeIf(Predicate<? super E> filter) {
+    checkCopyOnWrite();
+    return list.removeIf(filter);
+  }
+
+  @Override
+  public void sort(Comparator<? super E> c) {
+    checkCopyOnWrite();
+    list.sort(c);
+  }
+
+  @Override
+  public void clear() {
+    if (!copied) {
+      list = new ArrayList<>();
+      copied = true;
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return list.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return list.hashCode();
+  }
+
+  @Override
+  public E get(int index) {
+    return list.get(index);
+  }
+
+  @Override
+  public E set(int index, E element) {
+    checkCopyOnWrite();
+    return list.set(index, element);
+  }
+
+  @Override
+  public void add(int index, E element) {
+    checkCopyOnWrite();
+    list.add(index, element);
+  }
+
+  @Override
+  public E remove(int index) {
+    checkCopyOnWrite();
+    return list.remove(index);
+  }
+
+  @Override
+  public int indexOf(Object o) {
+    return list.indexOf(o);
+  }
+
+  @Override
+  public int lastIndexOf(Object o) {
+    return list.lastIndexOf(o);
+  }
+
+  private void checkCopyOnWrite() {
+    if (!copied) {
+      lock.lock();
+      try {
+        if (!copied) {
+          list = new ArrayList<>(list);
+          copied = true;
+        }
+      } finally {
+        lock.unlock();
+      }
+    }
+  }
+}

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

@@ -1,7 +1,5 @@
 package io.ebean.config;
 
-import io.ebean.plugin.Lookups;
-
 /**
  * Helper to find classes taking into account the context class loader.
  */
@@ -75,8 +73,9 @@ public class ClassLoadConfig {
    */
   public Object newInstance(String className) {
     try {
-      return Lookups.newDefaultInstance(forName(className));
-    } catch (Throwable e) {
+      Class<?> cls = forName(className);
+      return cls.getDeclaredConstructor().newInstance();
+    } catch (Exception e) {
       throw new IllegalArgumentException("Error constructing " + className, e);
     }
   }

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

@@ -129,7 +129,7 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    * When true then include a sql comment in generated SELECT queries with the query
    * label or profile location label.
    */
-  private boolean includeLabelInSql = true;
+  private boolean includeLabelInSql;
 
   /**
    * Interesting classes such as entities, embedded, ScalarTypes,

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

@@ -1,15 +0,0 @@
-package io.ebean.config;
-
-import java.lang.invoke.MethodHandles.Lookup;
-
-/**
- * Provides a Lookup instance for accessing entity/dto fields.
- */
-public interface LookupProvider {
-
-  /**
-   * Return the Lookup.
-   */
-  Lookup provideLookup();
-
-}

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

@@ -1,29 +1,50 @@
 package io.ebean.config;
 
-import io.ebean.ProfileLocation;
 import io.ebean.bean.ObjectGraphNode;
 
-import java.util.List;
-
 /**
- * The data for the slow query.
+ * Slow query event.
  */
-public interface SlowQueryEvent {
+public class SlowQueryEvent {
+
+  private final String sql;
+
+  private final long timeMillis;
+
+  private final int rowCount;
+
+  private final ObjectGraphNode originNode;
+
+  /**
+   * Construct with the SQL and execution time in millis.
+   */
+  public SlowQueryEvent(String sql, long timeMillis, int rowCount, ObjectGraphNode originNode) {
+    this.sql = sql;
+    this.timeMillis = timeMillis;
+    this.rowCount = rowCount;
+    this.originNode = originNode;
+  }
 
   /**
    * Return the SQL for the slow query.
    */
-  String getSql();
+  public String getSql() {
+    return sql;
+  }
 
   /**
    * Return the execution time in millis.
    */
-  long getTimeMillis();
+  public long getTimeMillis() {
+    return timeMillis;
+  }
 
   /**
    * Return the total row count associated with the query.
    */
-  int getRowCount();
+  public int getRowCount() {
+    return rowCount;
+  }
 
   /**
    * Return the origin point for the root query.
@@ -32,20 +53,7 @@ public interface SlowQueryEvent {
    * shows the code that invoked the query.
    * </p>
    */
-  ObjectGraphNode getOriginNode();
-
-  /**
-   * Return the bind parameters.
-   */
-  List<Object> getBindParams();
-
-  /**
-   * Return the label.
-   */
-  String getLabel();
-
-  /**
-   * Return the profile location.
-   */
-  ProfileLocation getProfileLocation();
+  public ObjectGraphNode getOriginNode() {
+    return originNode;
+  }
 }

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

@@ -4,8 +4,22 @@ public final class AnsiSqlRowsLimiter implements SqlLimiter {
 
   @Override
   public SqlLimitResponse limit(SqlLimitRequest request) {
-    final var ansiSql = request.ansiOffsetRows();
-    final var sql = request.getDbPlatform().completeSql(ansiSql, request.getOrmQuery());
+    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();
+    if (firstRow > 0) {
+      sb.append(" offset ").append(firstRow).append(" rows");
+    }
+    int maxRows = request.getMaxRows();
+    if (maxRows > 0) {
+      sb.append(" fetch next ").append(maxRows).append(" rows only");
+    }
+    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
     return new SqlLimitResponse(sql);
   }
 }

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

@@ -172,6 +172,7 @@ public class DbPlatformType implements ExtraDbTypes {
    * </p>
    */
   public String renderType(int deployLength, int deployScale, boolean strict) {
+
     int len = deployLength != 0 ? deployLength : defaultLength;
     if (len > maxLength) {
       return fallback.renderType(deployLength, deployScale, strict);
@@ -181,6 +182,7 @@ public class DbPlatformType implements ExtraDbTypes {
       if ((canHaveLength || !strict) && len > 0) {
         renderLengthScale(len, deployScale, sb);
       }
+
       return sb.toString();
     }
   }

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

@@ -7,16 +7,23 @@ public final class LimitOffsetSqlLimiter implements SqlLimiter {
 
   @Override
   public SqlLimitResponse limit(SqlLimitRequest request) {
-    final var buffer = request.selectDistinctOnSql();
+    String dbSql = request.getDbSql();
+    StringBuilder sb = new StringBuilder(50 + dbSql.length());
+    sb.append("select ");
+    if (request.isDistinct()) {
+      sb.append("distinct ");
+    }
+    sb.append(dbSql);
     int maxRows = request.getMaxRows();
     if (maxRows > 0) {
-      buffer.append(" limit ").append(maxRows);
+      sb.append(" limit ").append(maxRows);
     }
     int firstRow = request.getFirstRow();
     if (firstRow > 0) {
-      buffer.append(" offset ").append(firstRow);
+      sb.append(" offset ").append(firstRow);
     }
-    return new SqlLimitResponse(request.getDbPlatform().completeSql(buffer.toString(), request.getOrmQuery()));
+    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
+    return new SqlLimitResponse(sql);
   }
 
 }

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

@@ -157,7 +157,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
       if (newIds.isEmpty()) {
         throw new PersistenceException("Always expecting more than 1 row from " + sql);
       }
-      connection.commit();
+
       return newIds;
 
     } catch (SQLException e) {

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

@@ -8,21 +8,6 @@ import io.ebean.Query;
  */
 public interface SqlLimitRequest {
 
-  /**
-   * Return ANSI SQL Offset and next rows.
-   */
-  String ansiOffsetRows();
-
-  /**
-   * Create and return buffer including the select distinct clause.
-   */
-  StringBuilder selectDistinct();
-
-  /**
-   * Create and return buffer including the select distinct on clause.
-   */
-  StringBuilder selectDistinctOnSql();
-
   /**
    * Return true if the query uses distinct.
    */

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

@@ -1,6 +1,5 @@
 package io.ebean.event;
 
-import io.ebean.plugin.Lookups;
 
 /**
  * Helper to find classes taking into account the context class loader.
@@ -13,8 +12,8 @@ class ClassUtil {
   static Object newInstance(String className) {
     try {
       Class<?> cls = forName(className);
-      return Lookups.newDefaultInstance(cls);
-    } catch (Throwable e) {
+      return cls.getDeclaredConstructor().newInstance();
+    } catch (Exception e) {
       String msg = "Error constructing " + className;
       throw new IllegalArgumentException(msg, e);
     }

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

@@ -0,0 +1,40 @@
+package io.ebean.event;
+
+import jakarta.servlet.ServletContextEvent;
+
+/**
+ * Deprecated for removal - no intention to replace. Create your own copy of this
+ * ServletContextListener if needed for your application.
+ * <p>
+ * Listens for webserver server starting and stopping events.
+ * <p>
+ * This should be used when the deployment is into a servlet container where the webapp
+ * can be shutdown or redeployed without the JVM stopping.
+ * </p>
+ * <p>
+ * If deployment is into a container where the JVM is completely shutdown (like spring boot,
+ * runnable war or when using a servlet container that only contains the single webapp and
+ * the JVM is shutdown then this isn't required. Instead we can just rely on the JVM shutdown
+ * hook that Ebean registers.
+ * </p>
+ */
+@Deprecated(forRemoval = true)
+public class ServletContextListener implements jakarta.servlet.ServletContextListener {
+
+  /**
+   * The servlet container is stopping.
+   */
+  @Override
+  public void contextDestroyed(ServletContextEvent event) {
+    ShutdownManager.shutdown();
+  }
+
+  /**
+   * Do nothing on startup.
+   */
+  @Override
+  public void contextInitialized(ServletContextEvent event) {
+
+  }
+
+}

ebean-api/src/main/java/io/ebean/metric/MetricFactory.java

@@ -1,19 +1,17 @@
 package io.ebean.metric;
 
 import io.ebean.ProfileLocation;
-import io.ebean.XBootstrapService;
-import io.ebean.service.BootstrapService;
 
 /**
  * Factory to create timed metric counters.
  */
-public interface MetricFactory extends BootstrapService {
+public interface MetricFactory {
 
   /**
    * Return the factory instance.
    */
   static MetricFactory get() {
-    return XBootstrapService.metricFactory();
+    return MetricServiceProvider.get();
   }
 
   /**

ebean-api/src/main/java/io/ebean/metric/MetricServiceProvider.java

@@ -0,0 +1,28 @@
+package io.ebean.metric;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+/**
+ * Lookup MetricFactory service.
+ */
+final class MetricServiceProvider {
+
+  private static final MetricFactory metricFactory = init();
+
+  private static MetricFactory init() {
+    Iterator<MetricFactory> loader = ServiceLoader.load(MetricFactory.class).iterator();
+    if (loader.hasNext()) {
+      return loader.next();
+    }
+    throw new IllegalStateException("MetricFactory not service loaded?");
+  }
+
+  /**
+   * Return the MetricFactory implementation.
+   */
+  static MetricFactory get() {
+    return metricFactory;
+  }
+
+}

ebean-api/src/main/java/io/ebean/plugin/AOPTransactionScope.java

@@ -1,43 +0,0 @@
-package io.ebean.plugin;
-
-import io.ebean.DB;
-import io.ebean.TxScope;
-
-/**
- * Helper object to make AOP generated code simpler.
- */
-public final class AOPTransactionScope {
-  private static boolean enabled = true;
-
-  /**
-   * Entering an enhanced transactional method.
-   */
-  public static void enter(TxScope txScope) {
-    if (enabled) {
-      server().scopedTransactionEnter(txScope);
-    }
-  }
-
-  /**
-   * Exiting an enhanced transactional method.
-   */
-  public static void exit(Object returnOrThrowable, int opCode) {
-    if (enabled) {
-      server().scopedTransactionExit(returnOrThrowable, opCode);
-    }
-  }
-
-  private static SpiServer server() {
-    return (SpiServer) DB.getDefault();
-  }
-
-  /**
-   * Defines if the @Transactional does what is supposed to do or is disabled
-   * (useful only unit testing)
-   *
-   * @param enabled if set to false, @Transactional will not create a transaction
-   */
-  public static void setEnabled(boolean enabled) {
-    AOPTransactionScope.enabled = enabled;
-  }
-}

ebean-api/src/main/java/io/ebean/plugin/Lookups.java

@@ -1,41 +0,0 @@
-package io.ebean.plugin;
-
-import static java.util.stream.Collectors.toMap;
-
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodHandles.Lookup;
-import java.lang.invoke.MethodType;
-import java.util.Map;
-import java.util.ServiceLoader;
-
-import io.ebean.config.LookupProvider;
-
-/**
- * Provides Lookup instances using potentially module specific Lookups.
- */
-public final class Lookups {
-
-  private static final Map<String, Lookup> LOOKUP_MAP =
-      ServiceLoader.load(LookupProvider.class).stream()
-          .collect(toMap(p -> p.type().getModule().getName(), p -> p.get().provideLookup()));
-
-  private static final Lookup DEFAULT_LOOKUP = MethodHandles.publicLookup();
-
-  private static final MethodType VOID = MethodType.methodType(void.class);
-
-  /**
-   * Return a Lookup ideally for the module associated with the given type.
-   */
-  public static Lookup getLookup(Class<?> type) {
-    return LOOKUP_MAP.getOrDefault(type.getModule().getName(), DEFAULT_LOOKUP);
-  }
-
-  /**
-   * Find the default constructor and return a new instance for the given type
-   * potentially using a module specific Lookup instance.
-   */
-  @SuppressWarnings("unchecked")
-  public static <T> T newDefaultInstance(Class<?> type) throws Throwable {
-    return (T) getLookup(type).findConstructor(type, VOID).invoke();
-  }
-}

ebean-api/src/main/java/io/ebean/plugin/SpiServer.java

@@ -1,7 +1,6 @@
 package io.ebean.plugin;
 
 import io.ebean.Database;
-import io.ebean.TxScope;
 import io.ebean.bean.BeanLoader;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.DatabaseBuilder;
@@ -64,15 +63,4 @@ public interface SpiServer extends Database {
    * Typically due to serialisation or multiple stateless updates.
    */
   void loadBean(EntityBeanIntercept ebi);
-
-  /**
-   * Start an enhanced transactional method.
-   */
-  void scopedTransactionEnter(TxScope txScope);
-
-  /**
-   * Handle the end of an enhanced Transactional method.
-   */
-  void scopedTransactionExit(Object returnOrThrowable, int opCode);
-
 }