#3461 - Add also() for query beans that takes QueryBuilder

2026-09-20 11:17:36 +00:00 · 2024-08-27 23:10:38 +12:00
639 changed files with 4009 additions and 8962 deletions
@@ -2,7 +2,6 @@
 name: Build

 on:
-  workflow_dispatch:
  pull_request:
  push:
    branches: master
@@ -40,5 +39,5 @@ jobs:
 #    - name: Maven single test
 #      run: mvn --batch-mode clean verify -Dtest="io.ebeaninternal.server.core.DefaultServer_getReferenceTest" -DfailIfNoTests=false
    - name: Build with Maven
-      run: mvn -T 8 clean test -Pdefault
+      run: mvn -T 8 clean test

@@ -16,7 +16,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [GA,EA]
+        java_version: [GA,EA,23]
        os: [ubuntu-latest]

    steps:
@@ -37,5 +37,5 @@ jobs:
    - name: Maven version
      run: mvn --version
    - name: Build with Maven
-      run: mvn test -Pea
+      run: mvn -T 8 test

@@ -34,5 +34,5 @@ jobs:
        path:
          ~/.m2
        key: build-${{ env.cache-name }}
-    - name: mariadb 10.11
+    - name: mariadb 10.6
      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-mariadb.properties
@@ -34,5 +34,5 @@ jobs:
        path:
          ~/.m2
        key: build-${{ env.cache-name }}
-    - name: sqlserver 2022
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-sqlserver.properties
+    - name: sqlserver 2017
+      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-sqlserver17.properties
@@ -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
@@ -4,7 +4,7 @@ name: Yugabyte
 on:
  workflow_dispatch:
  schedule:
-    - cron: '10 3 * * 3'
+    - cron: '10 3 * * *'

 jobs:
  build:
@@ -59,6 +59,11 @@ Work at the highest level of abstraction and drop down levels as needed.
          <img width="222px" src="https://group.foconis.com/download/ci/logo/png-72dpi/logo-quer/foconis-analytics-quer.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">
        <a href="https://www.premium-minds.com" target="_blank">
          <img width="222px" src="https://ebean.io/images/logo-med-principal.png">
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -22,13 +22,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -47,19 +47,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-net-postgis-types</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

  </dependencies>
@@ -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>16.2.0</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-pgvector</name>
-  <description>ebean-pgvector composite</description>
-  <artifactId>ebean-pgvector</artifactId>
-
-  <properties>
-    <pgvector.version>0.1.6</pgvector.version>
-    <postgres.jdbc.version>42.7.2</postgres.jdbc.version>
-  </properties>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>16.2.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>16.2.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.2.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-pgvector-types</artifactId>
-      <version>16.2.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>com.pgvector</groupId>
-      <artifactId>pgvector</artifactId>
-      <version>${pgvector.version}</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.pgvector.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.pgvector {
-
-  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;
-
-}
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -22,13 +22,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -47,19 +47,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-postgis-types</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -41,7 +41,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
@@ -60,13 +60,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>16.2.0</version>
+      <version>14.5.0</version>
    </dependency>

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

  <artifactId>composites</artifactId>
@@ -25,7 +25,6 @@
    <module>ebean-postgres</module>
    <module>ebean-postgis</module>
    <module>ebean-net-postgis</module>
-    <module>ebean-pgvector</module>
 <!--    <module>sqlanywhere</module>-->
    <module>ebean-sqlite</module>
    <module>ebean-sqlserver</module>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.2.0</version>
+    <version>14.5.0</version>
  </parent>

  <name>ebean api</name>
@@ -26,16 +26,20 @@
      <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>
      <groupId>io.avaje</groupId>
      <artifactId>avaje-config</artifactId>
-      <version>4.2</version>
+      <version>3.12</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>
@@ -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 {

  /**
@@ -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);
-  }
-}
@@ -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;
@@ -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> {

  /**
@@ -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
@@ -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
@@ -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));
-  }
-
-}
@@ -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 {

  /**
@@ -137,7 +137,6 @@ public interface Database {
  /**
   * Return the associated read only DataSource for this Database instance (can be null).
   */
-  @Nullable
  DataSource readOnlyDataSource();

  /**
@@ -401,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
@@ -773,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>
@@ -989,14 +989,6 @@ public interface DatabaseBuilder {
  @Deprecated
  DatabaseBuilder setNamingConvention(NamingConvention namingConvention);

-  /**
-   * Set the AggregateFormulaContext which is used to determine if a database function
-   * is an aggregate function (like sum, min, max, avg etc).
-   * <p>
-   * Use this to override the default known aggregation functions.
-   */
-  DatabaseConfig aggregateFormulaContext(AggregateFormulaContext aggregateFormulaContext);
-
  /**
   * Set to true if all DB column and table names should use quoted identifiers.
   * <p>
@@ -1070,11 +1062,6 @@ public interface DatabaseBuilder {
   */
  DatabaseBuilder readOnlyDatabase(boolean readOnlyDatabase);

-  /**
-   * Set to false such that the instance does not register a JVM shutdown hook.
-   */
-  DatabaseBuilder shutdownHook(boolean shutdownHook);
-
  /**
   * Set a DataSource.
   */
@@ -1981,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.
@@ -2032,11 +2019,6 @@ public interface DatabaseBuilder {
  @Deprecated
  DatabaseBuilder setQueryPlanTTLSeconds(int queryPlanTTLSeconds);

-  /**
-   * Set the EXPLAIN (with options) to use for query plan capture.
-   */
-  DatabaseBuilder queryPlanExplain(String queryPlanExplain);
-
  /**
   * Create a new PlatformConfig based of the one held but with overridden properties by reading
   * properties with the given path and prefix.
@@ -2618,11 +2600,6 @@ public interface DatabaseBuilder {
     */
    NamingConvention getNamingConvention();

-    /**
-     * Return the AggregateFormulaContext.
-     */
-    AggregateFormulaContext aggregateFormulaContext();
-
    /**
     * Return true if all DB column and table names should use quoted identifiers.
     */
@@ -2661,11 +2638,6 @@ public interface DatabaseBuilder {
     */
    boolean readOnlyDatabase();

-    /**
-     * Return if a JVM shutdown hook should be registered.
-     */
-    boolean shutdownHook();
-
    /**
     * Return the DataSource.
     */
@@ -3072,11 +3044,6 @@ public interface DatabaseBuilder {
     */
    int getQueryPlanTTLSeconds();

-    /**
-     * Return the EXPLAIN (with options) to use for capturing query plans.
-     */
-    String getQueryPlanExplain();
-
    /**
     * Return mapping locations to search for xml mapping via class path search.
     */
@@ -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?");
  }
 }
@@ -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 {

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

@@ -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() {
@@ -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,21 @@ public interface ExpressionList<T> {
   */
  int delete();

+  /**
+   * @deprecated migrate to {@link #usingTransaction(Transaction)} then delete().
+   * <p>
+   * 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.
+   */
+  @Deprecated(forRemoval = true, since = "13.1.0")
+  int delete(Transaction transaction);
+
  /**
   * Execute as a update query.
   *
@@ -213,6 +244,17 @@ public interface ExpressionList<T> {
   */
  int update();

+  /**
+   * @deprecated migrate to {@link #usingTransaction(Transaction)} then update().
+   * <p>
+   * Execute as a update query with the given transaction.
+   *
+   * @return the number of rows that were updated.
+   * @see UpdateQuery
+   */
+  @Deprecated(forRemoval = true, since = "13.1.0")
+  int update(Transaction transaction);
+
  /**
   * Execute the query returning true if a row is found.
   * <p>
@@ -313,7 +355,7 @@ public interface ExpressionList<T> {
   *  List<String> names =
   *    DB.find(Customer.class)
   *      .select("name")
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .findSingleAttributeList();
   *
   * }</pre>
@@ -326,7 +368,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 +1713,7 @@ public interface ExpressionList<T> {
   *        .eq("status", Customer.Status.ACTIVE)
   *        .gt("id", 0)
   *        .endAnd()
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .findList();
   * }</pre>
   */
@@ -1692,7 +1734,7 @@ public interface ExpressionList<T> {
   *    .or()
   *      .eq("status", Customer.Status.ACTIVE)
   *      .isNull("anniversary")
-   *    .orderBy().asc("name")
+   *    .order().asc("name")
   *    .findList();
   *
   * }</pre>
@@ -1712,7 +1754,7 @@ public interface ExpressionList<T> {
   *        .eq("status", Customer.Status.ACTIVE)
   *        .gt("id", 0)
   *        .endAnd()
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .findList();
   *
   * }</pre>
@@ -1746,7 +1788,7 @@ public interface ExpressionList<T> {
   *       .gt("id", 1)
   *       .eq("anniversary", onAfter)
   *       .endNot()
-   *     .orderBy()
+   *     .order()
   *       .asc("name")
   *     .findList();
   *
@@ -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);
+
+}
@@ -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);
  }

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

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

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

  /**
@@ -1,74 +0,0 @@
-package io.ebean;
-
-import jakarta.persistence.PersistenceException;
-
-import java.util.Map;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * FutureMap represents the result of a background query execution that will
- * return a map of entities.
- * <p>
- * It extends the java.util.concurrent.Future with the ability to cancel the
- * query, check if it is finished and get the resulting list waiting for the
- * query to finish (ie. the standard features of java.util.concurrent.Future).
- * </p>
- * <p>
- * A simple example:
- * </p>
- * <pre>{@code
- *
- *  // create a query to find all orders
- * Query<Long,Order> query = DB.find(Order.class)
- * .setMapKey("id");
- *
- *  // execute the query in a background thread
- *  // immediately returning the futureMap
- * FutureMap<Long,Order> futureMap = query.findFutureMap();
- *
- *  // do something else ...
- *
- * if (!futureMap.isDone()){
- * 	// we can cancel the query execution. This will cancel
- * // the underlying query if that is supported by the JDBC
- * // driver and database
- * 	futureMap.cancel(true);
- * }
- *
- * if (!futureMap.isCancelled()){
- * 	// wait for the query to finish and return the map
- * 	Map<Long,Order> map = futureMap.get();
- * 	...
- * }
- *
- * }</pre>
- */
-public interface FutureMap<K, T> extends Future<Map<K, T>> {
-
-  /**
-   * Return the query that is being executed by a background thread.
-   */
-  Query<T> getQuery();
-
-  /**
-   * Same as {@link #get()} but wraps InterruptedException and ExecutionException in the
-   * unchecked PersistenceException.
-   *
-   * @return The query list result
-   * @throws PersistenceException when a InterruptedException or ExecutionException occurs.
-   */
-  Map<K, T> getUnchecked();
-
-  /**
-   * Same as {@link #get(long, TimeUnit)} but wraps InterruptedException
-   * and ExecutionException in the unchecked PersistenceException.
-   *
-   * @return The query list result
-   * @throws TimeoutException     if the wait timed out
-   * @throws PersistenceException if a InterruptedException or ExecutionException occurs.
-   */
-  Map<K, T> getUnchecked(long timeout, TimeUnit unit) throws TimeoutException;
-
-}
@@ -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.
@@ -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();
@@ -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);
-  }
-}
@@ -16,7 +16,4 @@ public interface ModifyAwareType {
   */
  void setMarkedDirty(boolean markedDirty);

-  default Object freeze() {
-    return this; // throw new UnsupportedOperationException();
-  }
 }
@@ -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) {
@@ -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();
@@ -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);
-
-}
@@ -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
@@ -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);
  }

  /**
@@ -1,7 +1,6 @@
 package io.ebean;

-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.NonNullApi;

 /**
 * Object relational query for finding a List, Set, Map or single entity bean.
@@ -14,7 +13,7 @@ import org.jspecify.annotations.Nullable;
 *     .where()
 *       .like("customer.name","rob%")
 *       .gt("orderDate",lastWeek)
- *     .orderBy("customer.id, id desc")
+ *     .order("customer.id, id desc")
 *     .setMaxRows(50)
 *     .findList();
 *
@@ -150,7 +149,7 @@ import org.jspecify.annotations.Nullable;
 *
 * @param <T> the type of Entity bean this query will fetch.
 */
-@NullMarked
+@NonNullApi
 public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {

  /**
@@ -219,6 +218,29 @@ public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {
   */
  boolean isCountDistinct();

+  /**
+   * @deprecated migrate to {@link #usingTransaction(Transaction)} then delete().
+   * <p>
+   * Execute as a delete query returning the number of rows deleted using the given transaction.
+   * <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.
+   */
+  @Deprecated(forRemoval = true, since = "14.1.0")
+  int delete(Transaction transaction);
+
+  /**
+   * @deprecated migrate to {@link #usingTransaction(Transaction)} then update().
+   * <p>
+   * Execute the UpdateQuery returning the number of rows updated using the given transaction.
+   *
+   * @return the number of beans/rows updated.
+   */
+  @Deprecated(forRemoval = true, since = "14.1.0")
+  int update(Transaction transaction);
+
  /**
   * Execute the UpdateQuery returning the number of rows updated.
   *
@@ -311,7 +333,6 @@ public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {
  /**
   * Return the Id value.
   */
-  @Nullable
  Object getId();

  /**
@@ -419,6 +440,30 @@ public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {
   */
  Query<T> having(Expression addExpressionToHaving);

+  /**
+   * @deprecated migrate to {@link #orderBy()}.
+   */
+  @Deprecated(since = "13.19", forRemoval = true)
+  default Query<T> order(String orderByClause) {
+    return orderBy(orderByClause);
+  }
+
+  /**
+   * @deprecated migrate to {@link #orderBy()}.
+   */
+  @Deprecated(since = "13.19", forRemoval = true)
+  default OrderBy<T> order() {
+    return orderBy();
+  }
+
+  /**
+   * @deprecated migrate to {@link #setOrderBy(OrderBy)}.
+   */
+  @Deprecated(since = "13.19", forRemoval = true)
+  default Query<T> setOrder(OrderBy<T> orderBy) {
+    return setOrderBy(orderBy);
+  }
+
  /**
   * Return the OrderBy so that you can append an ascending or descending
   * property to the order by clause.
@@ -448,13 +493,11 @@ public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {
  /**
   * Return the "for update" wait mode to use.
   */
-  @Nullable
  LockWait getForUpdateLockWait();

  /**
   * Return the lock type (strength) to use with "for update".
   */
-  @Nullable
  LockType getForUpdateLockType();

  /**
@@ -1,6 +1,6 @@
 package io.ebean;

-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.Nullable;

 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -20,7 +20,8 @@ import java.util.stream.Stream;
 * @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> {
+//public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends QueryBuilderProjection<SELF, T> {
+public interface QueryBuilder<SELF, T> extends QueryBuilderProjection<SELF, T> {

  /**
   * Set root table alias.
@@ -29,10 +30,12 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que

  /**
   * Apply changes to the query using a function.
+   * <p>
+   * This can be used to apply generic features to queries.
   *
-   * @param apply Function that applies changes to the query.
+   * @param apply The changes to apply to the query
   */
-  SELF also(Consumer<SELF> apply);
+  SELF also(Consumer<QueryBuilder<?, ?>> apply);

  /**
   * Apply changes to the query conditional on the supplied predicate.
@@ -324,8 +327,6 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que
   */
  SELF setMaxRows(int maxRows);

-  SELF setPaging(Paging paging);
-
  /**
   * Set RawSql to use for this query.
   */
@@ -388,19 +389,9 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que
  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}.
-   * <p>
-   * Attempting to mutate an unmodifiable bean will throw a <code>UnmodifiableEntityException</code>.
-   * Attempting to load an unloaded property will throw a <code>LazyInitialisationException</code>
-   *
-   * @see LazyInitialisationException
-   * @see UnmodifiableEntityException
+   * When set to true when you want the returned beans to be read only.
   */
-  SELF setUnmodifiable(boolean unmodifiable);
+  SELF setReadOnly(boolean readOnly);

  /**
   * Set a timeout on this query.
@@ -447,16 +438,6 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que

  /**
   * Set the {@link CacheMode} to use the query for executing this query.
-   * <p>
-   * Since version 16.x using the query bean will set the query to use unmodifiable (see
-   * {@link #setUnmodifiable(boolean)}) so the returned object graph is unmodifiable
-   * and safe to cache by the application.
-   * <p>
-   * Attempting to mutate an unmodifiable bean will throw a <code>UnmodifiableEntityException</code>.
-   * Attempting to load an unloaded property will throw a <code>LazyInitialisationException</code>
-   *
-   * @see LazyInitialisationException
-   * @see UnmodifiableEntityException
   */
  SELF setUseQueryCache(CacheMode cacheMode);

@@ -972,16 +953,6 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que
   */
  FutureList<T> findFutureList();

-  /**
-   * Execute find map 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 map result of the query
-   */
-  <K> FutureMap<K,T> findFutureMap();
-
  /**
   * Return a PagedList for this query using firstRow and maxRows.
   * <p>
@@ -6,7 +6,8 @@ package io.ebean;
 * @param <SELF> The builder type
 * @param <T>    The entity bean type
 */
-public interface QueryBuilderProjection<SELF extends QueryBuilderProjection<SELF, T>, T> {
+//public interface QueryBuilderProjection<SELF extends QueryBuilderProjection<SELF, T>, T> {
+public interface QueryBuilderProjection<SELF, T> {

  /**
   * Apply the path properties replacing the select and fetch clauses.
@@ -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();
@@ -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();
 *
@@ -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);
  }

  /**
@@ -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.
   */
@@ -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);
-  }
-}
@@ -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);
-  }
-}
@@ -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);
+  }
+}
@@ -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();
 }
@@ -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).
   */
@@ -540,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();
 }
@@ -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;
-  }
-}
@@ -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
@@ -400,7 +401,7 @@ public final class InterceptReadOnly extends InterceptBase {

  @Override
  public void initialisedMany(int propertyIndex) {
-    loaded[propertyIndex] = true;
+
  }

  @Override
@@ -415,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
@@ -437,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
@@ -22,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;

@@ -56,6 +56,10 @@ 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;
  /**
@@ -63,6 +67,7 @@ public final class InterceptReadWrite extends InterceptBase {
   */
  private int state;
  private boolean forceUpdate;
+  private boolean readOnly;
  private boolean dirty;
  /**
   * Flag set to disable lazy loading.
@@ -72,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;
@@ -95,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];
  }

@@ -103,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;" : "") +
@@ -129,6 +131,11 @@ public final class InterceptReadWrite extends InterceptBase {
      '}';
  }

+  @Override
+  public EntityBean owner() {
+    return owner;
+  }
+
  @Override
  public PersistenceContext persistenceContext() {
    return persistenceContext;
@@ -193,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) {
@@ -281,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;
@@ -384,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;
@@ -622,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];
@@ -650,7 +708,7 @@ public final class InterceptReadWrite extends InterceptBase {
        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;
@@ -787,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);
@@ -1,6 +1,5 @@
 package io.ebean.cache;

-import java.time.Instant;
 import java.util.Set;

 /**
@@ -11,11 +10,11 @@ import java.util.Set;
 * the query cache entry is treated as invalid.
 * </p>
 */
-public final class QueryCacheEntry {
+public class QueryCacheEntry {

  private final Object value;
  private final Set<String> dependentTables;
-  private final Instant timestamp;
+  private final long timestamp;

  /**
   * Create with dependent tables and timestamp.
@@ -24,7 +23,7 @@ public final class QueryCacheEntry {
   * @param dependentTables The extra tables the query is dependent on (joins to)
   * @param timestamp       The timestamp that the query uses to check for modifications
   */
-  public QueryCacheEntry(Object value, Set<String> dependentTables, Instant timestamp) {
+  public QueryCacheEntry(Object value, Set<String> dependentTables, long timestamp) {
    this.value = value;
    this.dependentTables = dependentTables;
    this.timestamp = timestamp;
@@ -33,21 +32,21 @@ public final class QueryCacheEntry {
  /**
   * Return the actual query result.
   */
-  public Object value() {
+  public Object getValue() {
    return value;
  }

  /**
   * Return the tables the query result is dependent on.
   */
-  public Set<String> dependentTables() {
+  public Set<String> getDependentTables() {
    return dependentTables;
  }

  /**
   * Return the timestamp used to check for modifications on the dependent tables.
   */
-  public Instant timestamp() {
+  public long getTimestamp() {
    return timestamp;
  }
 }
@@ -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;
@@ -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;
+  }
 }
@@ -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;
+  }
 }
@@ -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;
+  }
 }
@@ -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;
+  }
 }
@@ -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();
+      }
+    }
+  }
+}
@@ -1,66 +0,0 @@
-package io.ebean.config;
-
-import java.util.Set;
-
-/**
- * Used when parsing formulas to determine if they are aggregation formulas like
- * sum, min, max, avg, count etc.
- * <p>
- * Ebean needs to determine if they are aggregation formulas to determine which
- * properties should be included in a GROUP BY clause etc.
- */
-public interface AggregateFormulaContext {
-
-  /**
-   * Return true if the outer function is an aggregate function (like sum, count, min, max, avg etc).
-   */
-  boolean isAggregate(String outerFunction);
-
-  /**
-   * Return true if the aggregate function returns a BIGINT type.
-   * This is true for functions like count that return a numeric value regardless of the
-   * type of the property or expression inside the outer function.
-   */
-  boolean isCount(String outerFunction);
-
-  /**
-   * Return true if the aggregate function returns a VARCHAR type.
-   * This is true for functions that return a string concatenation like group_concat etc
-   * regardless of the type of the property used inside the outer function.
-   */
-  boolean isConcat(String outerFunction);
-
-  /**
-   * Return a builder for the AggregateFormulaContext.
-   */
-  static Builder builder() {
-    return new AggregateFormulaContextBuilder();
-  }
-
-  /**
-   * A builder for the AggregateFormulaContext.
-   */
-  interface Builder {
-
-    /**
-     * Override the default set of aggregation functions.
-     */
-    Builder aggregateFunctions(Set<String> count);
-
-    /**
-     * Override the default set of concat functions.
-     */
-    Builder concatFunctions(Set<String> concat);
-
-    /**
-     * Override the default set of count functions.
-     */
-    Builder countFunctions(Set<String> count);
-
-    /**
-     * Build the AggregateFormulaContext.
-     */
-    AggregateFormulaContext build();
-  }
-
-}
@@ -1,61 +0,0 @@
-package io.ebean.config;
-
-import java.util.Set;
-
-final class AggregateFormulaContextBuilder implements AggregateFormulaContext.Builder {
-
-  private Set<String> aggFunctions = Set.of("count", "max", "min", "avg", "sum", "group_concat", "string_agg", "listagg");
-  private Set<String> concat = Set.of("concat", "group_concat", "string_agg", "listagg");
-  private Set<String> count = Set.of("count");
-
-  @Override
-  public AggregateFormulaContext.Builder aggregateFunctions(Set<String> agg) {
-    this.aggFunctions = agg;
-    return this;
-  }
-
-  @Override
-  public AggregateFormulaContext.Builder concatFunctions(Set<String> concat) {
-    this.concat = concat;
-    return this;
-  }
-
-  @Override
-  public AggregateFormulaContext.Builder countFunctions(Set<String> count) {
-    this.count = count;
-    return this;
-  }
-
-  @Override
-  public AggregateFormulaContext build() {
-    return new FormulaContext(aggFunctions, concat, count);
-  }
-
-  private static final class FormulaContext implements AggregateFormulaContext {
-
-    private final Set<String> aggFunctions;
-    private final Set<String> concat;
-    private final Set<String> count;
-
-    private FormulaContext(Set<String> aggFunctions, Set<String> concat, Set<String> count) {
-      this.aggFunctions = aggFunctions;
-      this.concat = concat;
-      this.count = count;
-    }
-
-    @Override
-    public boolean isAggregate(String outerFunction) {
-      return aggFunctions.contains(outerFunction);
-    }
-
-    @Override
-    public boolean isCount(String outerFunction) {
-      return count.contains(outerFunction);
-    }
-
-    @Override
-    public boolean isConcat(String outerFunction) {
-      return concat.contains(outerFunction);
-    }
-  }
-}
@@ -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);
    }
  }
@@ -251,7 +251,7 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
  /**
   * The default batch size for lazy loading
   */
-  private int lazyLoadBatchSize = 100;
+  private int lazyLoadBatchSize = 10;

  /**
   * The default batch size for 'query joins'.
@@ -311,7 +311,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
  private boolean skipDataSourceCheck;

  private boolean readOnlyDatabase;
-  private boolean shutdownHook = true;

  /**
   * The data source (if programmatically provided).
@@ -356,8 +355,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
   */
  private NamingConvention namingConvention = new UnderscoreNamingConvention();

-  private AggregateFormulaContext aggregateFormulaContext = AggregateFormulaContext.builder().build();
-
  /**
   * Behaviour of updates in JDBC batch to by default include all properties.
   */
@@ -484,7 +481,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
   * Time to live for query plans - defaults to 5 minutes.
   */
  private int queryPlanTTLSeconds = 60 * 5;
-  private String queryPlanExplain;

  /**
   * Set to true to globally disable L2 caching (typically for performance testing).
@@ -1281,17 +1277,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    return this;
  }

-  @Override
-  public AggregateFormulaContext aggregateFormulaContext() {
-    return aggregateFormulaContext;
-  }
-
-  @Override
-  public DatabaseConfig aggregateFormulaContext(AggregateFormulaContext aggregateFormulaContext) {
-    this.aggregateFormulaContext = aggregateFormulaContext;
-    return this;
-  }
-
  @Override
  public boolean isAllQuotedIdentifiers() {
    return platformConfig.isAllQuotedIdentifiers();
@@ -1379,17 +1364,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    return readOnlyDatabase;
  }

-  @Override
-  public DatabaseBuilder shutdownHook(boolean shutdownHook) {
-    this.shutdownHook = shutdownHook;
-    return this;
-  }
-
-  @Override
-  public boolean shutdownHook() {
-    return shutdownHook;
-  }
-
  @Override
  public DataSource getDataSource() {
    return dataSource;
@@ -2162,7 +2136,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    loadDocStoreSettings(p);

    defaultServer = p.getBoolean("defaultServer", defaultServer);
-    shutdownHook = p.getBoolean("shutdownHook", shutdownHook);
    readOnlyDatabase = p.getBoolean("readOnlyDatabase", readOnlyDatabase);
    autoPersistUpdates = p.getBoolean("autoPersistUpdates", autoPersistUpdates);
    loadModuleInfo = p.getBoolean("loadModuleInfo", loadModuleInfo);
@@ -2178,7 +2151,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    queryPlanCapturePeriodSecs = p.getLong("queryPlan.capturePeriodSecs", queryPlanCapturePeriodSecs);
    queryPlanCaptureMaxTimeMillis = p.getLong("queryPlan.captureMaxTimeMillis", queryPlanCaptureMaxTimeMillis);
    queryPlanCaptureMaxCount = p.getInt("queryPlan.captureMaxCount", queryPlanCaptureMaxCount);
-    queryPlanExplain = p.get("queryPlan.explain", queryPlanExplain);
    docStoreOnly = p.getBoolean("docStoreOnly", docStoreOnly);
    disableL2Cache = p.getBoolean("disableL2Cache", disableL2Cache);
    localOnlyL2Cache = p.getBoolean("localOnlyL2Cache", localOnlyL2Cache);
@@ -2430,17 +2402,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    return queryPlanTTLSeconds;
  }

-  @Override
-  public String getQueryPlanExplain() {
-    return queryPlanExplain;
-  }
-
-  @Override
-  public DatabaseBuilder queryPlanExplain(String queryPlanExplain) {
-    this.queryPlanExplain = queryPlanExplain;
-    return this;
-  }
-
  @Override
  public DatabaseConfig setQueryPlanTTLSeconds(int queryPlanTTLSeconds) {
    this.queryPlanTTLSeconds = queryPlanTTLSeconds;
@@ -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();
-
-}
@@ -167,7 +167,6 @@ public class DatabasePlatform {
   * findIterate() and findVisit().
   */
  protected boolean forwardOnlyHintOnFindIterate;
-  protected boolean autoCommitFalseOnFindIterate;

  /**
   * If set then use the CONCUR_UPDATABLE hint when creating ResultSets.
@@ -529,10 +528,6 @@ public class DatabasePlatform {
    this.forwardOnlyHintOnFindIterate = forwardOnlyHintOnFindIterate;
  }

-  public boolean autoCommitFalseOnFindIterate() {
-    return autoCommitFalseOnFindIterate;
-  }
-
  /**
   * Return true if the ResultSet CONCUR_UPDATABLE Hint should be used on
   * createNativeSqlTree() PreparedStatements.
@@ -785,5 +780,4 @@ public class DatabasePlatform {
  public String inlineSqlHint(String hint) {
    return "/*+ " + hint + " */ ";
  }
-
 }
@@ -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();
    }
  }
@@ -46,11 +46,6 @@ public class DbPlatformTypeMapping {
  private static final DbPlatformType MULTILINESTRING = new DbPlatformType("multilinestring");
  private static final DbPlatformType MULTIPOLYGON = new DbPlatformType("multipolygon");

-  private static final DbPlatformType VECTOR = new DbPlatformType("vector", 2000, null);
-  private static final DbPlatformType VECTOR_HALF = new DbPlatformType("halfvec", 4000, null);
-  private static final DbPlatformType VECTOR_BIT = new DbPlatformType("bit", 64000, null);
-  private static final DbPlatformType VECTOR_SPARSE = new DbPlatformType("sparsevec", 1000, null);
-
  private final Map<DbType, DbPlatformType> typeMap = new EnumMap<>(DbType.class);

  /**
@@ -98,10 +93,6 @@ public class DbPlatformTypeMapping {
    put(DbType.MULTIPOINT, MULTIPOINT);
    put(DbType.MULTILINESTRING, MULTILINESTRING);
    put(DbType.MULTIPOLYGON, MULTIPOLYGON);
-    put(DbType.VECTOR, VECTOR);
-    put(DbType.VECTOR_HALF, VECTOR_HALF);
-    put(DbType.VECTOR_BIT, VECTOR_BIT);
-    put(DbType.VECTOR_SPARSE, VECTOR_SPARSE);

    if (logicalTypes) {
      // keep it logical for 2 layer DDL generation
@@ -51,12 +51,7 @@ public enum DbType {
  JSONB(ExtraDbTypes.JSONB),
  JSONCLOB(ExtraDbTypes.JSONClob),
  JSONBLOB(ExtraDbTypes.JSONBlob),
-  JSONVARCHAR(ExtraDbTypes.JSONVarchar),
-
-  VECTOR(ExtraDbTypes.VECTOR),
-  VECTOR_HALF(ExtraDbTypes.VECTOR_HALF),
-  VECTOR_BIT(ExtraDbTypes.VECTOR_BIT),
-  VECTOR_SPARSE(ExtraDbTypes.VECTOR_SPARSE);
+  JSONVARCHAR(ExtraDbTypes.JSONVarchar);

  private final int id;

@@ -74,24 +74,4 @@ public interface ExtraDbTypes {
   */
  int MULTILINESTRING = 6007;

-  /**
-   * PGVector base type
-   */
-  int VECTOR = 7000;
-
-  /**
-   * PGVector half precision float type
-   */
-  int VECTOR_HALF = 7001;
-
-  /**
-   * PGVector binary type (bit)
-   */
-  int VECTOR_BIT = 7002;
-
-  /**
-   * PGVector sparse type
-   */
-  int VECTOR_SPARSE = 7003;
-
 }
@@ -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) {
@@ -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);
    }
@@ -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) {
+
+  }
+
+}
@@ -97,7 +97,8 @@ public final class ShutdownManager {
  private static void registerShutdownHook() {
    lock.lock();
    try {
-      if ("true".equalsIgnoreCase(System.getProperty("ebean.registerShutdownHook", "true"))) {
+      String value = System.getProperty("ebean.registerShutdownHook");
+      if (value == null || !value.trim().equalsIgnoreCase("false")) {
        Runtime.getRuntime().addShutdownHook(shutdownHook);
      }
    } catch (IllegalStateException ex) {
@@ -1,19 +1,18 @@
 package io.ebean.meta;

-import java.util.*;
-
-import static java.util.Objects.requireNonNull;
+import java.util.HashSet;
+import java.util.Set;

 /**
 * Initiate query plan collection for plans by their hash or all query plans.
 */
 public class QueryPlanInit {

-  private final Map<String,Long> hashes = new HashMap<>();
-
  private boolean all;

-  private long defaultThresholdMicros;
+  private Set<String> hashes = new HashSet<>();
+
+  private long thresholdMicros;

  /**
   * Return true if this initiates bind collection on all query plans.
@@ -30,74 +29,39 @@ public class QueryPlanInit {
  }

  /**
-   * Return the default query execution time threshold which must be exceeded to initiate
+   * Return the query execution time threshold which must be exceeded to initiate
   * query plan collection.
   */
  public long thresholdMicros() {
-    return defaultThresholdMicros;
+    return thresholdMicros;
  }

  /**
-   * Set the default query execution time threshold which must be exceeded to initiate
+   * Set the query execution time threshold which must be exceeded to initiate
   * query plan collection.
   */
  public void thresholdMicros(long thresholdMicros) {
-    this.defaultThresholdMicros = thresholdMicros;
+    this.thresholdMicros = thresholdMicros;
  }

  /**
   * Return true if the query plan should be initiated based on it's hash.
   */
  public boolean includeHash(String hash) {
-    return all || hashes.containsKey(hash);
+    return all || hashes.contains(hash);
  }

  /**
   * Return the specific hashes that we want to collect query plans on.
-   *
-   * @param hash            The hash of the query plan.
-   * @param thresholdMicros The threshold in micros to use.
   */
-  public void add(String hash, long thresholdMicros) {
-    requireNonNull(hash);
-    if (!"all".equals(hash)) {
-      hashes.put(hash, thresholdMicros);
-    } else {
-      all = true;
-      if (thresholdMicros > 0) {
-        defaultThresholdMicros = thresholdMicros;
-      }
-    }
+  public Set<String> hashes() {
+    return hashes;
  }

  /**
-   * Remove a hash from this request.
+   * Set the specific hashes that we want to collect query plans on.
   */
-  public void remove(String hash) {
-    hashes.remove(hash);
-  }
-
-  /**
-   * Return the threshold in micros to use for the given hash.
-   */
-  public long thresholdMicros(String hash) {
-    Long threshold = hashes.get(hash);
-    return threshold == null || threshold < 1 ? defaultThresholdMicros : threshold;
-  }
-
-  /**
-   * Return true if there are no registered hashes and not collect <em>All</em> plans.
-   */
-  public boolean isEmpty() {
-    return !all && hashes.isEmpty();
-  }
-
-  @Override
-  public String toString() {
-    return "QueryPlanInit{" +
-      "all=" + all +
-      ", hashes=" + hashes +
-      ", thresholdMicros=" + defaultThresholdMicros +
-      '}';
+  public void hashes(Set<String> hashes) {
+    this.hashes = hashes;
  }
 }
@@ -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();
  }

  /**
@@ -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;
+  }
+
+}
@@ -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;
-  }
-}
@@ -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();
-  }
-}
@@ -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);
-
 }
@@ -1,7 +0,0 @@
-package io.ebean.service;
-
-/**
- * Marker interface for internal services loaded at startup.
- */
-public interface BootstrapService {
-}
--- a/Show More
+++ b/Show More