Version 14.11.0

Merge pull request #3611 from ebean-orm/feature/fix-native-image-mappedSuper
Fix NPE with native-image with @MappedSuperclass
2026-09-20 11:17:36 +00:00 · 2025-04-01 21:32:48 +13:00 · 2025-04-01 20:45:17 +13:00 · 2025-04-01 20:29:26 +13:00 · 2025-04-01 08:07:46 +13:00 · 2025-04-01 08:07:04 +13:00
448 changed files with 5009 additions and 2338 deletions
@@ -2,6 +2,7 @@
 name: Build

 on:
+  workflow_dispatch:
  pull_request:
  push:
    branches: master
@@ -16,7 +16,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [GA,EA,23]
+        java_version: [GA,EA]
        os: [ubuntu-latest]

    steps:
@@ -0,0 +1,41 @@
+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 * * *'
+    - cron: '10 3 * * 3'

 jobs:
  build:
@@ -59,11 +59,6 @@ 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>14.5.0</version>
+    <version>14.11.0</version>
    <relativePath>../..</relativePath>
  </parent>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  <name>ebean api</name>
@@ -26,20 +26,16 @@
      <version>1.0</version>
    </dependency>

-    <!--
-    Class retention Nonnull and Nullable annotations
-    to assist with IDE auto-completion with Ebean API
-    -->
    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-lang</artifactId>
-      <version>1.1</version>
+      <groupId>org.jspecify</groupId>
+      <artifactId>jspecify</artifactId>
+      <version>1.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.avaje</groupId>
      <artifactId>avaje-config</artifactId>
-      <version>3.12</version>
+      <version>4.0</version>
    </dependency>

    <dependency>
@@ -90,23 +86,6 @@
      <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,10 +1,9 @@
 package io.ebean;

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

 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;

@@ -20,7 +19,7 @@ import java.util.concurrent.TimeUnit;
 * This also propagates MDC context from the current thread to the
 * background task if defined.
 */
-@NonNullApi
+@NullMarked
 public interface BackgroundExecutor {

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

-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import java.util.List;
 import java.util.Optional;

@@ -30,7 +30,7 @@ import java.util.Optional;
 *
 * @see BeanRepository
 */
-@NonNullApi
+@NullMarked
 public abstract class BeanFinder<I,T> {

  protected final Database database;
@@ -1,6 +1,6 @@
 package io.ebean;

-import io.avaje.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 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
 */
-@NonNullApi
+@NullMarked
 public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {

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

-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.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>
 */
-@NonNullApi
+@NullMarked
 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")
-   *     .order("id")
+   *     .orderBy("id")
   *     .findList();
   *
   *   // sort by customer name ascending, then by order shipDate
@@ -0,0 +1,50 @@
+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 io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.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
 */
-@NonNullApi
+@NullMarked
 public interface Database {

  /**
@@ -400,7 +400,7 @@ public interface Database {
   *   // find orders and their customers
   *   List<Order> list = database.find(Order.class)
   *     .fetch("customer")
-   *     .order("id")
+   *     .orderBy("id")
   *     .findList();
   *
   *   // sort by customer name ascending, then by order shipDate
@@ -772,18 +772,6 @@ 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>
@@ -1968,8 +1968,8 @@ public interface DatabaseBuilder {
  DatabaseBuilder setLocalOnlyL2Cache(boolean localOnlyL2Cache);

  /**
-   * Controls if Ebean should ignore <code>&x64;javax.validation.contstraints.NotNull</code> or
-   * <code>&x64;jakarta.validation.contstraints.NotNull</code>
+   * Controls if Ebean should ignore <code>&#64;javax.validation.contstraints.NotNull</code> or
+   * <code>&#64;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.
@@ -2019,6 +2019,11 @@ 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.
@@ -3044,6 +3049,11 @@ 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,8 +5,6 @@ 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;

 /**
@@ -157,10 +155,10 @@ public final class DatabaseFactory {
   * Create the container instance using the configuration.
   */
  private static SpiContainer createContainer(ContainerConfig containerConfig) {
-    Iterator<SpiContainerFactory> factories = ServiceLoader.load(SpiContainerFactory.class).iterator();
-    if (factories.hasNext()) {
-      return factories.next().create(containerConfig);
+    SpiContainerFactory factory = XBootstrapService.containerFactory();
+    if (factory == null) {
+      throw new IllegalStateException("Service loader didn't find a SpiContainerFactory?");
    }
-    throw new IllegalStateException("Service loader didn't find a SpiContainerFactory?");
+    return factory.create(containerConfig);
  }
 }
@@ -1,7 +1,7 @@
 package io.ebean;

-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import io.ebean.docstore.DocQueryContext;
 import io.ebean.docstore.RawDoc;

@@ -14,7 +14,7 @@ import java.util.function.Predicate;
 /**
 * Document storage operations.
 */
-@NonNullApi
+@NullMarked
 public interface DocumentStore {

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

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

 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -42,7 +42,7 @@ import java.util.stream.Stream;
 *
 * }</pre>
 */
-@NonNullApi
+@NullMarked
 public interface DtoQuery<T> extends CancelableQuery {

  /**
@@ -140,6 +140,17 @@ 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,6 +5,8 @@ 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
@@ -17,7 +19,8 @@ import java.util.concurrent.Future;
 *
 * }</pre>
 */
-public class EmptyPagedList<T> implements PagedList<T> {
+@Deprecated(forRemoval = true)
+public final class EmptyPagedList<T> implements PagedList<T> {

  @Override
  public void loadCount() {
@@ -1,7 +1,7 @@
 package io.ebean;

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

 import jakarta.persistence.NonUniqueResultException;
@@ -31,7 +31,7 @@ import java.util.function.Predicate;
 *
 * @see Query#where()
 */
-@NonNullApi
+@NullMarked
 public interface ExpressionList<T> {

  /**
@@ -53,14 +53,6 @@ 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.
@@ -71,14 +63,6 @@ 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.
@@ -221,21 +205,6 @@ 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.
   *
@@ -244,17 +213,6 @@ 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>
@@ -355,7 +313,7 @@ public interface ExpressionList<T> {
   *  List<String> names =
   *    DB.find(Customer.class)
   *      .select("name")
-   *      .order().asc("name")
+   *      .orderBy().asc("name")
   *      .findSingleAttributeList();
   *
   * }</pre>
@@ -368,7 +326,7 @@ public interface ExpressionList<T> {
   *      .setDistinct(true)
   *      .select("name")
   *      .where().eq("status", Customer.Status.NEW)
-   *      .order().asc("name")
+   *      .orderBy().asc("name")
   *      .setMaxRows(100)
   *      .findSingleAttributeList();
   *
@@ -1713,7 +1671,7 @@ public interface ExpressionList<T> {
   *        .eq("status", Customer.Status.ACTIVE)
   *        .gt("id", 0)
   *        .endAnd()
-   *      .order().asc("name")
+   *      .orderBy().asc("name")
   *      .findList();
   * }</pre>
   */
@@ -1734,7 +1692,7 @@ public interface ExpressionList<T> {
   *    .or()
   *      .eq("status", Customer.Status.ACTIVE)
   *      .isNull("anniversary")
-   *    .order().asc("name")
+   *    .orderBy().asc("name")
   *    .findList();
   *
   * }</pre>
@@ -1754,7 +1712,7 @@ public interface ExpressionList<T> {
   *        .eq("status", Customer.Status.ACTIVE)
   *        .gt("id", 0)
   *        .endAnd()
-   *      .order().asc("name")
+   *      .orderBy().asc("name")
   *      .findList();
   *
   * }</pre>
@@ -1788,7 +1746,7 @@ public interface ExpressionList<T> {
   *       .gt("id", 1)
   *       .eq("anniversary", onAfter)
   *       .endNot()
-   *     .order()
+   *     .orderBy()
   *       .asc("name")
   *     .findList();
   *
@@ -1,21 +0,0 @@
-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 io.avaje.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 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
 */
-@NonNullApi
+@NullMarked
 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 XServiceProvider.fetchGroupOf(cls, select);
+    return XBootstrapService.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 XServiceProvider.fetchGroupOf(cls);
+    return XBootstrapService.fetchGroupOf(cls);
  }

  /**
   * Return a query to be used by query beans for constructing FetchGroup.
   */
  static <T> SpiFetchGroupQuery<T> queryFor(Class<T> beanType) {
-    return XServiceProvider.fetchGroupQueryFor(beanType);
+    return XBootstrapService.fetchGroupQueryFor(beanType);
  }

 }
@@ -1,6 +1,6 @@
 package io.ebean;

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

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

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

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

 import java.util.List;
 import java.util.Set;
@@ -79,7 +79,7 @@ import java.util.Set;
 *
 * @param <T> the entity bean type
 */
-@NonNullApi
+@NullMarked
 public interface Filter<T> {

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

-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.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)
- *       .order("name")
+ *       .orderBy("name")
 *       .findList()
 *   }
 * }
@@ -60,7 +60,7 @@ import java.util.List;
 * @see BeanRepository
 * @see BeanFinder
 */
-@NonNullApi
+@NullMarked
 public class Finder<I, T> {

  /**
@@ -0,0 +1,74 @@
+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 io.avaje.lang.Nullable;
+import org.jspecify.annotations.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()
- *      .order().asc("name");
+ *      .orderBy().asc("name");
 *
 * q.findList();
 * String s = q.getGeneratedSql();
@@ -8,13 +8,11 @@ import java.util.Objects;
 /**
 * Represents an Order By for a Query.
 * <p>
- * Is a ordered list of OrderBy.Property objects each specifying a property and
+ * Is an 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 {

@@ -25,8 +23,22 @@ 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);
  }
@@ -36,20 +48,17 @@ public class OrderBy<T> implements Serializable {
  }

  /**
-   * 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 migrate to {@link OrderBy#of(String)}.
   */
+  @Deprecated(forRemoval = true)
  public OrderBy(String orderByClause) {
    this(null, orderByClause);
  }

  /**
-   * Construct with a given query and order by clause.
+   * @deprecated This method will be removed from public API.
   */
+  @Deprecated(forRemoval = true)
  public OrderBy(Query<T> query, String orderByClause) {
    this.query = query;
    this.list = new ArrayList<>(3);
@@ -110,8 +119,11 @@ 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)
- *       .order().asc("id")
+ *       .orderBy().asc("id")
 *       .setFirstRow(0)
 *       .setMaxRows(50)
 *       .findPagedList();
@@ -0,0 +1,90 @@
+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
- *   .order("sku desc")
+ *   .orderBy("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 XServiceProvider.profileLocationFactory().create();
+    return XBootstrapService.profileLocationFactory().create();
  }

  /**
   * Create and return a new ProfileLocation with line number.
   */
  static ProfileLocation createWithLine() {
-    return XServiceProvider.profileLocationFactory().createWithLine();
+    return XBootstrapService.profileLocationFactory().createWithLine();
  }

  /**
   * Create and return a new ProfileLocation with a given lineNumber and label.
   */
  static ProfileLocation create(String label) {
-    return XServiceProvider.profileLocationFactory().create(label);
+    return XBootstrapService.profileLocationFactory().create(label);
  }

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

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

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

  /**
@@ -218,29 +218,6 @@ 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.
   *
@@ -440,30 +417,6 @@ 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.
@@ -1,6 +1,6 @@
 package io.ebean;

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

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

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

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

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

+  SELF setPaging(Paging paging);
+
  /**
   * Set RawSql to use for this query.
   */
@@ -953,6 +952,16 @@ public interface QueryBuilder<SELF, T> extends QueryBuilderProjection<SELF, T> {
   */
  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,8 +6,7 @@ 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, T> {
+public interface QueryBuilderProjection<SELF extends QueryBuilderProjection<SELF, T>, 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)
- *     .order("id")
+ *     .orderBy("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)
- *     .order().desc("totalAmount")
+ *     .orderBy().desc("totalAmount")
 *     .setMaxRows(10)
 *     .findList();
 *
@@ -22,14 +22,14 @@ public interface RawSqlBuilder {
   * resultSet.
   */
  static RawSql resultSet(ResultSet resultSet, String... propertyNames) {
-    return XServiceProvider.rawSql().resultSet(resultSet, propertyNames);
+    return XBootstrapService.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 XServiceProvider.rawSql().sqlRow(resultSet, dbTrueValue, binaryOptimizedUUID);
+    return XBootstrapService.rawSql().sqlRow(resultSet, dbTrueValue, binaryOptimizedUUID);
  }

  /**
@@ -38,7 +38,7 @@ public interface RawSqlBuilder {
   * this query.
   */
  static RawSqlBuilder unparsed(String sql) {
-    return XServiceProvider.rawSql().unparsed(sql);
+    return XBootstrapService.rawSql().unparsed(sql);
  }

  /**
@@ -55,7 +55,7 @@ public interface RawSqlBuilder {
   * </p>
   */
  static RawSqlBuilder parse(String sql) {
-    return XServiceProvider.rawSql().parsed(sql);
+    return XBootstrapService.rawSql().parsed(sql);
  }

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

-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.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;
@@ -39,7 +40,7 @@ import java.util.function.Predicate;
 *
 * }</pre>
 */
-@NonNullApi
+@NullMarked
 public interface SqlQuery extends Serializable, CancelableQuery {

  /**
@@ -171,7 +172,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 ...
@@ -241,11 +242,45 @@ 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.
   */
@@ -0,0 +1,95 @@
+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);
+  }
+}
@@ -1,76 +0,0 @@
-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);
-  }
-}
@@ -1,5 +1,6 @@
 package io.ebean.cache;

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

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

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

  /**
   * Create with dependent tables and timestamp.
@@ -23,7 +24,7 @@ public 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, long timestamp) {
+  public QueryCacheEntry(Object value, Set<String> dependentTables, Instant timestamp) {
    this.value = value;
    this.dependentTables = dependentTables;
    this.timestamp = timestamp;
@@ -32,21 +33,21 @@ public class QueryCacheEntry {
  /**
   * Return the actual query result.
   */
-  public Object getValue() {
+  public Object value() {
    return value;
  }

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

  /**
   * Return the timestamp used to check for modifications on the dependent tables.
   */
-  public long getTimestamp() {
+  public Instant timestamp() {
    return timestamp;
  }
 }
@@ -1,6 +1,6 @@
 package io.ebean.cache;

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

 import java.util.LinkedHashMap;
@@ -1,5 +1,7 @@
 package io.ebean.config;

+import io.ebean.plugin.Lookups;
+
 /**
 * Helper to find classes taking into account the context class loader.
 */
@@ -73,9 +75,8 @@ public class ClassLoadConfig {
   */
  public Object newInstance(String className) {
    try {
-      Class<?> cls = forName(className);
-      return cls.getDeclaredConstructor().newInstance();
-    } catch (Exception e) {
+      return Lookups.newDefaultInstance(forName(className));
+    } catch (Throwable e) {
      throw new IllegalArgumentException("Error constructing " + className, e);
    }
  }
@@ -481,6 +481,7 @@ 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).
@@ -2151,6 +2152,7 @@ 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);
@@ -2402,6 +2404,17 @@ 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;
@@ -0,0 +1,15 @@
+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();
+
+}
@@ -172,7 +172,6 @@ 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);
@@ -182,7 +181,6 @@ public class DbPlatformType implements ExtraDbTypes {
      if ((canHaveLength || !strict) && len > 0) {
        renderLengthScale(len, deployScale, sb);
      }
-
      return sb.toString();
    }
  }
@@ -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,5 +1,6 @@
 package io.ebean.event;

+import io.ebean.plugin.Lookups;

 /**
 * Helper to find classes taking into account the context class loader.
@@ -12,8 +13,8 @@ class ClassUtil {
  static Object newInstance(String className) {
    try {
      Class<?> cls = forName(className);
-      return cls.getDeclaredConstructor().newInstance();
-    } catch (Exception e) {
+      return Lookups.newDefaultInstance(cls);
+    } catch (Throwable e) {
      String msg = "Error constructing " + className;
      throw new IllegalArgumentException(msg, e);
    }
@@ -1,40 +0,0 @@
-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) {
-
-  }
-
-}
@@ -1,18 +1,19 @@
 package io.ebean.meta;

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

 /**
 * 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 Set<String> hashes = new HashSet<>();
-
-  private long thresholdMicros;
+  private long defaultThresholdMicros;

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

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

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

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

  /**
-   * Set the specific hashes that we want to collect query plans on.
+   * Remove a hash from this request.
   */
-  public void hashes(Set<String> hashes) {
-    this.hashes = hashes;
+  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 +
+      '}';
  }
 }
@@ -1,17 +1,19 @@
 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 {
+public interface MetricFactory extends BootstrapService {

  /**
   * Return the factory instance.
   */
  static MetricFactory get() {
-    return MetricServiceProvider.get();
+    return XBootstrapService.metricFactory();
  }

  /**
@@ -1,28 +0,0 @@
-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;
-  }
-
-}
@@ -0,0 +1,43 @@
+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;
+  }
+}
@@ -0,0 +1,41 @@
+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,6 +1,7 @@
 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;
@@ -63,4 +64,15 @@ 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);
+
 }
@@ -0,0 +1,7 @@
+package io.ebean.service;
+
+/**
+ * Marker interface for internal services loaded at startup.
+ */
+public interface BootstrapService {
+}
@@ -5,7 +5,7 @@ import io.ebean.config.ContainerConfig;
 /**
 * Provides shutdown of the entire container.
 */
-public interface SpiContainerFactory {
+public interface SpiContainerFactory extends BootstrapService {

  /**
   * Create the Container that builds EbeanServer instances.
@@ -6,7 +6,7 @@ import io.ebean.FetchGroupBuilder;
 /**
 * Service that parses FetchGroup expressions.
 */
-public interface SpiFetchGroupService {
+public interface SpiFetchGroupService extends BootstrapService {

  /**
   * Return the FetchGroup with the given select clause.
@@ -17,7 +17,7 @@ import java.util.Set;
 *
 * Supports converting between JSON content and simple java Maps/Lists.
 */
-public interface SpiJsonService {
+public interface SpiJsonService extends BootstrapService {

  /**
   * Write the nested Map/List as json.
@@ -5,7 +5,7 @@ import io.ebean.ProfileLocation;
 /**
 * Factory for creating profile locations.
 */
-public interface SpiProfileLocationFactory {
+public interface SpiProfileLocationFactory extends BootstrapService {

  /**
   * Create a profile location.
@@ -10,7 +10,7 @@ import java.sql.SQLException;
 /**
 * Service provided by Ebean for parsing and column mapping raw SQL queries.
 */
-public interface SpiRawSqlService {
+public interface SpiRawSqlService extends BootstrapService {

  /**
   * Create based on a JDBC ResultSet.
@@ -3,16 +3,15 @@ package io.ebean.text.json;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import io.ebean.XBootstrapService;
 import io.ebean.service.SpiJsonService;

 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.ServiceLoader;
 import java.util.Set;

 /**
@@ -20,16 +19,7 @@ import java.util.Set;
 */
 public class EJson {

-  private static SpiJsonService plugin = init();
-
-  private static SpiJsonService init() {
-
-    Iterator<SpiJsonService> loader = ServiceLoader.load(SpiJsonService.class).iterator();
-    if (loader.hasNext()) {
-      return loader.next();
-    }
-    throw new IllegalStateException("No service implementation found for SpiJsonService?");
-  }
+  private static final SpiJsonService plugin = XBootstrapService.jsonService();

  /**
   * Write the nested Map/List as json.
@@ -15,7 +15,7 @@
 *     .fetch("billingAddress","line1, city")
 *     .fetch("billingAddress.country", "*")
 *     .fetch("contacts", "firstName,email")
- *     .order().desc("id")
+ *     .orderBy().desc("id")
 *     .findList();
 *
 * JsonContext json = DB.json();
@@ -1,18 +1,14 @@
 module io.ebean.api {

  uses io.ebean.config.AutoConfigure;
-  uses io.ebean.config.dbplatform.DatabasePlatformProvider;
+  uses io.ebean.config.LookupProvider;
  uses io.ebean.datasource.DataSourceAlertFactory;
-  uses io.ebean.metric.MetricFactory;
-  uses io.ebean.service.SpiContainerFactory;
-  uses io.ebean.service.SpiRawSqlService;
-  uses io.ebean.service.SpiProfileLocationFactory;
-  uses io.ebean.service.SpiFetchGroupService;
+  uses io.ebean.service.BootstrapService;
  uses io.ebean.service.SpiJsonService;

  requires transitive java.sql;
  requires transitive io.avaje.config;
-  requires transitive io.avaje.lang;
+  requires transitive org.jspecify;
  requires transitive jakarta.persistence.api;
  requires transitive io.ebean.annotation;
  requires transitive io.ebean.datasource.api;
@@ -22,20 +18,19 @@ module io.ebean.api {
  requires static io.ebean.types;
  requires static com.fasterxml.jackson.core;
  requires static com.fasterxml.jackson.databind;
-  requires static jakarta.servlet;

  exports io.ebean;
  exports io.ebean.bean;
  exports io.ebean.cache;
-  exports io.ebean.meta;
+  exports io.ebean.common;
  exports io.ebean.config;
  exports io.ebean.config.dbplatform;
+  exports io.ebean.docstore;
  exports io.ebean.event;
  exports io.ebean.event.readaudit;
  exports io.ebean.event.changelog;
-  exports io.ebean.common;
-  exports io.ebean.docstore;
  exports io.ebean.plugin;
+  exports io.ebean.meta;
  exports io.ebean.metric;
  exports io.ebean.search;
  exports io.ebean.service;
@@ -1 +1 @@
-ebean-version: 143
+ebean-version: 149
@@ -213,7 +213,7 @@ class ToStringBuilderTest {

    final int id;

-    final Map<String, ParamValue> map = new HashMap<>();
+    final Map<String, ParamValue> map = new LinkedHashMap<>();


    ParamStore(final int id) {
@@ -84,6 +84,7 @@ class DatabaseConfigTest {
    props.setProperty("queryPlan.capturePeriodSecs", "42");
    props.setProperty("queryPlan.captureMaxTimeMillis", "560");
    props.setProperty("queryPlan.captureMaxCount", "7");
+    props.setProperty("queryPlan.explain", "explain (verbose)");

    config.loadFromProperties(props);

@@ -129,15 +130,18 @@ class DatabaseConfigTest {
    assertEquals(42, settings.getQueryPlanCapturePeriodSecs());
    assertEquals(560, settings.getQueryPlanCaptureMaxTimeMillis());
    assertEquals(7, settings.getQueryPlanCaptureMaxCount());
+    assertEquals("explain (verbose)", settings.getQueryPlanExplain());

    assertThat(settings.getMappingLocations()).containsExactly("classpath:/foo","bar");

    config.persistBatch(PersistBatch.NONE)
      .persistBatchOnCascade(PersistBatch.NONE)
      .lengthCheck(LengthCheck.ON)
-      .lengthCheck(LengthCheck.UTF8);
+      .lengthCheck(LengthCheck.UTF8)
+      .queryPlanExplain("explain (buffers)");


+    assertThat(config.settings().getQueryPlanExplain()).isEqualTo("explain (buffers)");
    Properties props1 = new Properties();
    props1.setProperty("ebean.persistBatch", "ALL");
    props1.setProperty("ebean.persistBatchOnCascade", "ALL");
@@ -182,6 +186,7 @@ class DatabaseConfigTest {
    assertEquals(600, config.getQueryPlanCapturePeriodSecs());
    assertEquals(10000L, config.getQueryPlanCaptureMaxTimeMillis());
    assertEquals(10, config.getQueryPlanCaptureMaxCount());
+    assertThat(config.getQueryPlanExplain()).isNull();
    assertThat(config.getLengthCheck()).isEqualTo(LengthCheck.OFF);
    assertTrue(config.isIncludeLabelInSql());

@@ -0,0 +1,43 @@
+package io.ebean.meta;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class QueryPlanInitTest {
+
+  @Test
+  void initialQueryPlanInit() {
+    var init = new QueryPlanInit();
+    assertThat(init.isEmpty()).isTrue();
+    assertThat(init.isAll()).isFalse();
+    assertThat(init.thresholdMicros()).isEqualTo(0L);
+  }
+
+  @Test
+  void add_all() {
+    var init = new QueryPlanInit();
+    init.add("all", 57L);
+
+    assertThat(init.isEmpty()).isFalse();
+    assertThat(init.isAll()).isTrue();
+    assertThat(init.thresholdMicros()).isEqualTo(57L);
+  }
+
+  @Test
+  void addWithThresholds() {
+    var init = new QueryPlanInit();
+    init.thresholdMicros(1000);
+    init.add("xOne", 0);
+    init.add("xTwo", 2000L);
+
+    assertThat(init.isEmpty()).isFalse();
+    assertThat(init.isAll()).isFalse();
+    assertThat(init.includeHash("xJunk")).isFalse();
+    assertThat(init.includeHash("xOne")).isTrue();
+    assertThat(init.includeHash("xTwo")).isTrue();
+    assertThat(init.thresholdMicros("xJunk")).isEqualTo(1000L);
+    assertThat(init.thresholdMicros("xOne")).isEqualTo(1000L);
+    assertThat(init.thresholdMicros("xTwo")).isEqualTo(2000L);
+  }
+}
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.5.0</version>
+    <version>14.11.0</version>
  </parent>

  <name>ebean bom</name>
@@ -89,25 +89,25 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>14.5.0</version>
+        <version>14.11.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>14.5.0</version>
+        <version>14.11.0</version>
      </dependency>

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

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

      <dependency>
@@ -125,13 +125,13 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-mapper</artifactId>
-        <version>14.5.0</version>
+        <version>14.11.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.5.0</version>
+        <version>14.11.0</version>
      </dependency>

      <dependency>
@@ -155,37 +155,37 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>14.5.0</version>
+        <version>14.11.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>14.5.0</version>
+        <version>14.11.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.5.0</version>
+        <version>14.11.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>14.5.0</version>
+        <version>14.11.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>14.5.0</version>
+        <version>14.11.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>14.5.0</version>
+        <version>14.11.0</version>
      </dependency>

      <!-- platforms -->
@@ -193,79 +193,79 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-clickhouse</artifactId>
-        <version>14.5.0</version>
+        <version>14.11.0</version>
      </dependency>

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

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

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

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

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

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

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

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

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

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

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

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

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

  <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.5.0</version>
+      <version>14.11.0</version>
    </dependency>

    <dependency>
@@ -1,6 +1,6 @@
 package io.ebean.core.type;

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

 import java.lang.annotation.Annotation;

@@ -1,6 +1,6 @@
 package io.ebean.core.type;

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

 /**
 * A ScalarType that has variations based on the mapped JDBC type (like VARCHAR, CLOB, JSON etc).
@@ -1,6 +1,6 @@
 package io.ebean.core.type;

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

 /**
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.5.0</version>
+    <version>14.11.0</version>
  </parent>

  <artifactId>ebean-core</artifactId>
@@ -22,7 +22,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.5.0</version>
+      <version>14.11.0</version>
    </dependency>

    <dependency>
@@ -46,7 +46,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>14.5.0</version>
+      <version>14.11.0</version>
    </dependency>

    <dependency>
@@ -159,21 +159,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.5.0</version>
+      <version>14.11.0</version>
      <scope>test</scope>
    </dependency>

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

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

@@ -235,26 +235,6 @@
        </configuration>
      </plugin>

-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <doctitle>Ebean 12</doctitle>
-          <overview>src/main/java/io/ebean/overview.html</overview>
-          <excludePackageNames>io.ebeaninternal.*:io.ebeanservice:io.ebean.common:io.ebean.bean:io.ebean.service:io.ebean.metric:io.ebean.util:io.ebean.config.properties:io.ebean.config.dbplatform</excludePackageNames>
-          <linksource>true</linksource>
-          <overview>src/main/java/com/avaje/ebean/overview.html</overview>
-        </configuration>
-        <executions>
-          <execution>
-            <id>attach-javadocs</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
    </plugins>

  </build>
@@ -231,6 +231,14 @@ public final class BindParams implements Serializable {
    return p;
  }

+  /**
+   * Set a named In parameter that is multi-valued.
+   */
+  public void setArrayParameter(int position, Collection<?> value) {
+    Param p = parameter(position);
+    p.setInValue(new MultiValueWrapper(value));
+  }
+
  /**
   * Set a named In parameter that is multi-valued.
   */
@@ -1,34 +1,25 @@
 package io.ebeaninternal.api;

-import io.ebean.DB;
 import io.ebean.TxScope;
+import io.ebean.plugin.AOPTransactionScope;

 /**
 * Helper object to make AOP generated code simpler.
 */
 public final class HelpScopeTrans {
-  private static boolean enabled = true;

  /**
   * Entering an enhanced transactional method.
   */
  public static void enter(TxScope txScope) {
-    if (enabled) {
-      server().scopedTransactionEnter(txScope);
-    }
+    AOPTransactionScope.enter(txScope);
  }

  /**
   * Exiting an enhanced transactional method.
   */
  public static void exit(Object returnOrThrowable, int opCode) {
-    if (enabled) {
-      server().scopedTransactionExit(returnOrThrowable, opCode);
-    }
-  }
-
-  private static SpiEbeanServer server() {
-    return (SpiEbeanServer) DB.getDefault();
+    AOPTransactionScope.exit(returnOrThrowable, opCode);
  }

  /**
@@ -38,6 +29,6 @@ public final class HelpScopeTrans {
   * @param enabled if set to false, @Transactional will not create a transaction
   */
  public static void setEnabled(boolean enabled) {
-    HelpScopeTrans.enabled = enabled;
+    AOPTransactionScope.setEnabled(enabled);
  }
 }
@@ -34,8 +34,8 @@ public final class ScopeTrans {
   * Explicit set of Exceptions that DO cause a rollback to occur.
   */
  private final ArrayList<Class<? extends Throwable>> rollbackFor;
-  private Boolean restoreBatch;
-  private Boolean restoreBatchOnCascade;
+  private boolean restoreBatch;
+  private boolean restoreBatchOnCascade;
  private int restoreBatchSize;
  private Boolean restoreBatchGeneratedKeys;
  private boolean restoreBatchFlushOnQuery;
@@ -61,7 +61,7 @@ public final class ScopeTrans {
    this.noRollbackFor = txScope.getNoRollbackFor();
    this.rollbackFor = txScope.getRollbackFor();
    if (transaction != null) {
-      if (!created && txScope.isBatchSet() || txScope.isBatchOnCascadeSet() || txScope.isBatchSizeSet()) {
+      if (!created) {
        restoreBatch = transaction.isBatchMode();
        restoreBatchOnCascade = transaction.isBatchOnCascade();
        restoreBatchSize = transaction.getBatchSize();
@@ -142,16 +142,12 @@ public final class ScopeTrans {
      transaction.commit();
    } else {
      nestedCommit = true;
+      transaction.flush();
+      // restore the batch settings
      transaction.setFlushOnQuery(restoreBatchFlushOnQuery);
-      if (restoreBatch != null) {
-        transaction.setBatchMode(restoreBatch);
-      }
-      if (restoreBatchOnCascade != null) {
-        transaction.setBatchOnCascade(restoreBatchOnCascade);
-      }
-      if (restoreBatchSize > 0) {
-        transaction.setBatchSize(restoreBatchSize);
-      }
+      transaction.setBatchMode(restoreBatch);
+      transaction.setBatchOnCascade(restoreBatchOnCascade);
+      transaction.setBatchSize(restoreBatchSize);
      if (restoreBatchGeneratedKeys != null) {
        transaction.setGetGeneratedKeys(restoreBatchGeneratedKeys);
      }
@@ -168,7 +168,7 @@ public final class ScopedTransaction extends SpiTransactionProxy {
  /**
   * Maybe rollback based on TxScope rollback on settings.
   */
-  public Exception caughtThrowable(Exception e) {
+  public <T extends Exception> T caughtThrowable(T e) {
    return current.caughtThrowable(e);
  }

@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;

-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import io.ebean.*;
 import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.CallOrigin;
@@ -26,7 +26,7 @@ import java.util.stream.Stream;
 /**
 * Service Provider extension to EbeanServer.
 */
-public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectionLoader {
+public interface SpiEbeanServer extends SpiServer, BeanCollectionLoader {

  /**
   * Return the NOW time from the Clock.
@@ -216,16 +216,6 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  void slowQueryCheck(long executionTimeMicros, int rowCount, SpiQuery<?> query);

-  /**
-   * Start an enhanced transactional method.
-   */
-  void scopedTransactionEnter(TxScope txScope);
-
-  /**
-   * Handle the end of an enhanced Transactional method.
-   */
-  void scopedTransactionExit(Object returnOrThrowable, int opCode);
-
  /**
   * SqlQuery find single attribute.
   */
@@ -358,6 +348,8 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio

  <T> FutureList<T> findFutureList(SpiQuery<T> query);

+  <K, T> FutureMap<K, T> findFutureMap(SpiQuery<T> query);
+
  <T> PagedList<T> findPagedList(SpiQuery<T> query);

  <T> Set<T> findSet(SpiQuery<T> query);
@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;

-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import io.ebean.CacheMode;
 import io.ebean.CountDistinctOrder;
 import io.ebean.ExpressionList;
@@ -580,7 +580,12 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
  /**
   * Convert joins as necessary to query joins etc.
   */
-  SpiQuerySecondary convertJoins();
+  SpiQueryManyJoin convertJoins();
+
+  /**
+   * Return secondary queries if required.
+   */
+  SpiQuerySecondary secondaryQuery();

  /**
   * Return the TransactionContext.
@@ -0,0 +1,22 @@
+package io.ebeaninternal.api;
+
+/**
+ * A SQL Join for a ToMany property included in the query.
+ */
+public interface SpiQueryManyJoin {
+
+  /**
+   * The full path of the many property to include in the query via join.
+   */
+  String path();
+
+  /**
+   * Order by clause defined via mapping on the ToMany property.
+   */
+  String fetchOrderBy();
+
+  /**
+   * Wrap the filter many expression with a condition allowing lEFT JOIN null matching row.
+   */
+  String idNullOr(String filterManyExpression);
+}
@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;

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

 /**
 * SQL query binding (for SqlQuery and DtoQuery).
@@ -53,4 +53,9 @@ public interface SpiSqlBinding extends SpiCancelableQuery {
   */
  int getBufferFetchSizeHint();

+  /**
+   * Set the JDBC fetchSize buffer hint if not explicitly set.
+   */
+  void setDefaultFetchBuffer(int fetchSize);
+
 }
@@ -14,6 +14,7 @@ import io.ebeanservice.docstore.api.DocStoreTransaction;
 import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.time.Instant;

 /**
 * Extends Transaction with additional API required on server.
@@ -95,7 +96,7 @@ public interface SpiTransaction extends Transaction {
  /**
   * Return the start timestamp for the transaction (JVM side).
   */
-  long startNanoTime();
+  Instant startTime();

  /**
   * Return true if this transaction has updateAllLoadedProperties set.
--- a/Show More
+++ b/Show More