Version 14.8.0

Merge pull request #3507 from ebean-orm/feature/agent-1480
Bump ebean-agent to 14.8.0
2026-09-20 19:17:55 +00:00 · 2024-10-25 14:28:58 +13:00 · 2024-10-25 14:18:20 +13:00 · 2024-10-25 14:17:46 +13:00 · 2024-10-24 16:13:01 +13:00 · 2024-10-24 16:12:45 +13:00
170 changed files with 1731 additions and 665 deletions
@@ -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 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.5.2</version>
+    <version>14.8.0</version>
    <relativePath>../..</relativePath>
  </parent>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-net-postgis-types</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-postgis-types</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
    </dependency>

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

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

  <name>ebean api</name>
@@ -26,14 +26,10 @@
      <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>
@@ -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();
@@ -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 {

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

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

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

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

  /**
@@ -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,7 +20,7 @@ import java.util.stream.Stream;
 * @param <SELF> The type of the builder
 * @param <T>    The entity bean type
 */
-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.
@@ -324,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.
   */
@@ -6,7 +6,7 @@ package io.ebean;
 * @param <SELF> The builder type
 * @param <T>    The entity bean type
 */
-public interface QueryBuilderProjection<SELF, T> {
+public interface QueryBuilderProjection<SELF extends QueryBuilderProjection<SELF, T>, T> {

  /**
   * Apply the path properties replacing the select and fetch clauses.
@@ -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,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,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,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.
@@ -1,18 +1,13 @@
 module io.ebean.api {

  uses io.ebean.config.AutoConfigure;
-  uses io.ebean.config.dbplatform.DatabasePlatformProvider;
  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;
@@ -1 +1 @@
-ebean-version: 143
+ebean-version: 148
@@ -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) {
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.5.2</version>
+    <version>14.8.0</version>
  </parent>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis-types</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>14.5.2</version>
+        <version>14.8.0</version>
      </dependency>

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

  <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.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.2</version>
+    <version>14.8.0</version>
  </parent>

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

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

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

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

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

@@ -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,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;
@@ -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;
@@ -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).
@@ -105,6 +105,9 @@ final class DefaultBeanLoader {
    if (ebi.isReadOnly()) {
      query.setReadOnly(true);
    }
+    if (many.hasOrderColumn()) {
+      query.orderBy(many.path() + "." +  many.fetchOrderBy());
+    }

    server.findOne(query);
    if (beanCollection != null) {
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.core;

-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import io.ebean.*;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.TxIsolation;
@@ -70,7 +70,7 @@ import static java.util.stream.StreamSupport.stream;
 /**
 * The default server side implementation of EbeanServer.
 */
-@NonNullApi
+@NullMarked
 public final class DefaultServer implements SpiServer, SpiEbeanServer {

  private static final System.Logger log = CoreLog.internal;
@@ -1689,6 +1689,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
      for (Object bean : beans) {
        persister.insert(checkEntityBean(bean), options, txn);
      }
+      txn.flushBatchOnCollection();
      return 0;
    }, transaction);
  }
@@ -146,6 +146,7 @@ public abstract class PersistRequest extends BeanRequest implements BatchPostExe
  public void initTransIfRequired() {
    createImplicitTransIfRequired();
    persistCascade = transaction.isPersistCascade();
+    transaction.markNotQueryOnly();
  }

  /**
@@ -228,6 +228,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
      docStoreMode = calcDocStoreMode(transaction, type);
    }
    checkBatchEscalationOnCascade();
+    transaction.markNotQueryOnly();
  }

  /**
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.core;

-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import io.ebean.*;
 import io.ebean.bean.EntityBean;
 import io.ebean.meta.MetricVisitor;
@@ -62,6 +62,11 @@ class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
    ctx.appendParseSelect(parsedFormula, alias);
  }

+  @Override
+  public final void appendGroupBy(DbSqlContext ctx, boolean subQuery) {
+    ctx.appendParseSelect(parsedFormula, null);
+  }
+
  @Override
  public boolean isLobForPlatform() {
    return false;
@@ -54,7 +54,7 @@ public final class IdBinderEmbedded implements IdBinder {
      if (i > 0) {
        sb.append(" and ");
      }
-      sb.append("${").append(prefix).append('.').append(embIdProperty.name()).append('}').append(props[i].name()).append(" is null");
+      sb.append("${").append(prefix).append('}').append(props[i].dbColumn()).append(" is null");
    }
    sb.append(") or (").append(filterManyExpression).append("))");
    return sb.toString();
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy.meta;

-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import io.ebean.annotation.*;
 import io.ebean.config.ScalarTypeConverter;
 import io.ebean.config.dbplatform.DbDefaultValue;
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.el;

-import io.avaje.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import io.ebean.Filter;
 import io.ebeaninternal.server.deploy.BeanDescriptor;

@@ -12,7 +12,7 @@ import java.util.regex.Pattern;
 /**
 * Default implementation of the Filter interface.
 */
-@NonNullApi
+@NullMarked
 public final class ElFilter<T> implements Filter<T> {

  private final BeanDescriptor<T> beanDescriptor;
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.executor;

 import io.avaje.applog.AppLog;
-import io.avaje.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import io.ebean.config.BackgroundExecutorWrapper;
 import io.ebeaninternal.api.SpiBackgroundExecutor;

@@ -12,7 +12,7 @@ import static java.lang.System.Logger.Level.*;
 /**
 * The default implementation of the BackgroundExecutor.
 */
-@NonNullApi
+@NullMarked
 public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor {

  private static final System.Logger log = AppLog.getLogger("io.ebean.BackgroundExecutor");
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.expression;

-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import io.ebean.*;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.search.*;
@@ -18,7 +18,7 @@ import java.util.function.Predicate;
 /**
 * Default implementation of ExpressionList.
 */
-@NonNullApi
+@NullMarked
 public class DefaultExpressionList<T> implements SpiExpressionList<T> {

  private static final String AND = " and ";
@@ -33,6 +33,10 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
   */
  private final boolean textRoot;

+  public static <P> ExpressionList<P> forFetchGroup(Query<P> q) {
+    return new DefaultExpressionList<>(q, null, null, null, false);
+  }
+
  /**
   * Construct for Text root expression list - this handles implicit Bool Should, Must etc.
   */
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.expression;

-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import io.ebean.*;
 import io.ebeaninternal.api.SpiExpressionList;
 import io.ebeaninternal.api.SpiQuery;
@@ -9,7 +9,7 @@ import io.ebeaninternal.api.SpiQuery;
 import jakarta.persistence.PersistenceException;
 import java.util.*;

-@NonNullApi
+@NullMarked
 public final class FilterExpressionList<T> extends DefaultExpressionList<T> {

  private static final String notAllowedMessage = "This method is not allowed on a filter";
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.expression;

-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import io.ebean.*;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.search.*;
@@ -18,7 +18,7 @@ import java.util.function.Predicate;
 /**
 * Junction implementation.
 */
-@NonNullApi
+@NullMarked
 final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, ExpressionList<T> {

  DefaultExpressionList<T> exprList;
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.query;

-import io.avaje.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import io.ebean.FetchConfig;
 import io.ebean.FetchGroup;
 import io.ebean.FetchGroupBuilder;
@@ -10,7 +10,7 @@ import io.ebeaninternal.server.querydefn.SpiFetchGroup;
 /**
 * Default implementation of the FetchGroupBuilder.
 */
-@NonNullApi
+@NullMarked
 final class DFetchGroupBuilder<T> implements FetchGroupBuilder<T> {

  private static final FetchConfig DEFAULT_FETCH = FetchConfig.ofDefault();
@@ -1,33 +1,11 @@
 package io.ebeaninternal.server.query;

-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
-import io.ebean.CacheMode;
-import io.ebean.CountDistinctOrder;
-import io.ebean.Database;
-import io.ebean.DtoQuery;
-import io.ebean.Expression;
-import io.ebean.ExpressionFactory;
-import io.ebean.ExpressionList;
-import io.ebean.FetchConfig;
-import io.ebean.FetchGroup;
-import io.ebean.FetchPath;
-import io.ebean.FutureIds;
-import io.ebean.FutureList;
-import io.ebean.FutureRowCount;
-import io.ebean.OrderBy;
-import io.ebean.PagedList;
-import io.ebean.PersistenceContextScope;
-import io.ebean.ProfileLocation;
-import io.ebean.Query;
-import io.ebean.QueryIterator;
-import io.ebean.QueryType;
-import io.ebean.RawSql;
-import io.ebean.Transaction;
-import io.ebean.UpdateQuery;
-import io.ebean.Version;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+import io.ebean.*;
 import io.ebean.service.SpiFetchGroupQuery;
 import io.ebeaninternal.api.SpiQueryFetch;
+import io.ebeaninternal.server.expression.DefaultExpressionList;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.querydefn.SpiFetchGroup;

@@ -45,7 +23,7 @@ import java.util.stream.Stream;
 /**
 * Implementation of FetchGroup query for use to create FetchGroup via query beans.
 */
-@NonNullApi
+@NullMarked
 final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQueryFetch {

  private static final FetchConfig FETCH_CACHE = FetchConfig.ofCache();
@@ -53,6 +31,7 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
  private static final FetchConfig FETCH_LAZY = FetchConfig.ofLazy();

  private OrmQueryDetail detail = new OrmQueryDetail();
+  private OrderBy<T> orderBy;

  @Override
  public FetchGroup<T> buildFetchGroup() {
@@ -438,7 +417,7 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery

  @Override
  public ExpressionList<T> where() {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
+    return DefaultExpressionList.forFetchGroup(this);
  }

  @Override
@@ -468,7 +447,10 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery

  @Override
  public OrderBy<T> orderBy() {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
+    if (orderBy == null) {
+      orderBy = new OrderBy<>();
+    }
+    return orderBy;
  }

  @Override
@@ -506,6 +488,11 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

+  @Override
+  public Query<T> setPaging(Paging paging) {
+    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
+  }
+
  @Override
  public Query<T> setMapKey(String mapKey) {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
@@ -92,6 +92,13 @@ public interface STreeProperty extends ScalarDataReader<Object> {
   */
  void appendSelect(DbSqlContext ctx, boolean subQuery);

+  /**
+   * Append to group by.
+   */
+  default void appendGroupBy(DbSqlContext ctx, boolean subQuery) {
+    appendSelect(ctx, subQuery);
+  }
+
  /**
   * Append to the from clause.
   */
@@ -11,6 +11,7 @@ import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.querydefn.OrmQueryProperties;
+import jakarta.persistence.PersistenceException;

 import java.util.*;

@@ -440,12 +441,9 @@ public final class SqlTreeBuilder {

    } else {
      // find the property including searching the
-      // sub class hierarchy if required
      STreeProperty p = desc.findPropertyWithDynamic(propName, queryProps.getPath());
      if (p == null) {
-        log.log(ERROR, "property [{0}] not found on {1} for query - excluding it.", propName, desc);
-        p = desc.findProperty("id");
-        selectProps.add(p);
+        throw new PersistenceException("Property not found - " + SplitName.add(queryProps.getPath(), propName));

      } else if (p.isId() && excludeIdProperty()) {
        // do not bother to include id for normal queries as the
@@ -163,7 +163,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
    }
    for (STreeProperty property : properties) {
      if (!property.isAggregation()) {
-        property.appendSelect(ctx, subQuery);
+        property.appendGroupBy(ctx, subQuery);
      }
    }
    for (SqlTreeNode child : children) {
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.querydefn;

-import io.avaje.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import io.ebean.DtoQuery;
 import io.ebean.ProfileLocation;
 import io.ebean.QueryIterator;
@@ -23,7 +23,7 @@ import java.util.stream.Stream;
 /**
 * Default implementation of DtoQuery.
 */
-@NonNullApi
+@NullMarked
 public final class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQuery<T> {

  private final SpiEbeanServer server;
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.querydefn;

-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import io.ebean.*;
 import io.ebean.bean.CallOrigin;
 import io.ebean.bean.ObjectGraphNode;
@@ -35,7 +35,7 @@ import java.util.stream.Stream;
 /**
 * Default implementation of an Object Relational query.
 */
-@NonNullApi
+@NullMarked
 public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {

  private static final String DEFAULT_QUERY_NAME = "default";
@@ -1827,6 +1827,22 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    return this;
  }

+  @Override
+  @SuppressWarnings("unchecked")
+  public Query<T> setPaging(@Nullable Paging paging) {
+    if (paging != null && paging.pageSize() > 0) {
+      firstRow = paging.pageIndex() * paging.pageSize();
+      maxRows = paging.pageSize();
+      orderBy = (OrderBy<T>) paging.orderBy();
+      if (orderBy == null || orderBy.isEmpty()) {
+        // should not be paging without any order by clause so set
+        // orderById such that the Id property is used
+        orderById = true;
+      }
+    }
+    return this;
+  }
+
  @Override
  public final String mapKey() {
    return mapKey;
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.querydefn;

-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import io.ebean.*;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -10,6 +10,7 @@ import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.transaction.ExternalJdbcTransaction;

 import java.sql.Connection;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -18,7 +19,7 @@ import java.util.function.Predicate;
 /**
 * Default implementation of SQuery - SQL Query.
 */
-@NonNullApi
+@NullMarked
 public final class DefaultRelationalQuery extends AbstractQuery implements SpiSqlQuery {

  private static final long serialVersionUID = -1098305779779591068L;
@@ -133,12 +134,24 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
    return this;
  }

+  @Override
+  public DefaultRelationalQuery setArrayParameter(int position, Collection<?> value) {
+    bindParams.setArrayParameter(position, value);
+    return this;
+  }
+
  @Override
  public DefaultRelationalQuery setParameter(String paramName, Object value) {
    bindParams.setParameter(paramName, value);
    return this;
  }

+  @Override
+  public DefaultRelationalQuery setArrayParameter(String paramName, Collection<?> value) {
+    bindParams.setArrayParameter(paramName, value);
+    return this;
+  }
+
  @Override
  public String toString() {
    return "SqlQuery " + query;
@@ -417,6 +417,10 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
  @Override
  public final void markNotQueryOnly() {
    this.queryOnly = false;
+    // if the transaction is readonly, it should not allow updates/deletes
+    if (localReadOnly){
+      throw new IllegalStateException("This transaction is read-only");
+    }
  }

  @Override
@@ -1,6 +1,6 @@
 package io.ebeanservice.docstore.none;

-import io.avaje.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import io.ebean.DocStoreQueueEntry;
 import io.ebean.DocumentStore;
 import io.ebean.PagedList;
@@ -17,7 +17,7 @@ import java.util.function.Predicate;
 /**
 * DocumentStore that barfs it is used.
 */
-@NonNullApi
+@NullMarked
 public final class NoneDocStore implements DocumentStore {

  public static IllegalStateException implementationNotInClassPath() {
@@ -73,11 +73,12 @@ module io.ebean.core {
  exports io.ebeaninternal.server.transaction to io.ebean.test, io.ebean.elastic, io.ebean.spring.txn, io.ebean.k8scache;
  exports io.ebeaninternal.server.util to io.ebean.querybean;

-  provides io.ebean.metric.MetricFactory with io.ebeaninternal.server.profile.DMetricFactory;
-  provides io.ebean.service.SpiContainerFactory with io.ebeaninternal.server.DContainerFactory;
-  provides io.ebean.service.SpiFetchGroupService with io.ebeaninternal.server.query.DFetchGroupService;
-  provides io.ebean.service.SpiJsonService with io.ebeaninternal.json.DJsonService;
-  provides io.ebean.service.SpiProfileLocationFactory with io.ebeaninternal.server.profile.DProfileLocationFactory;
-  provides io.ebean.service.SpiRawSqlService with io.ebeaninternal.server.rawsql.DRawSqlService;
+  provides io.ebean.service.BootstrapService with
+    io.ebeaninternal.server.DContainerFactory,
+    io.ebeaninternal.server.query.DFetchGroupService,
+    io.ebeaninternal.server.profile.DProfileLocationFactory,
+    io.ebeaninternal.server.rawsql.DRawSqlService,
+    io.ebeaninternal.server.profile.DMetricFactory,
+    io.ebeaninternal.json.DJsonService;

 }
@@ -1 +0,0 @@
-io.ebeaninternal.server.profile.DMetricFactory
@@ -0,0 +1,6 @@
+io.ebeaninternal.server.DContainerFactory
+io.ebeaninternal.server.rawsql.DRawSqlService
+io.ebeaninternal.server.query.DFetchGroupService
+io.ebeaninternal.server.profile.DProfileLocationFactory
+io.ebeaninternal.server.profile.DMetricFactory
+io.ebeaninternal.json.DJsonService
@@ -1 +0,0 @@
-io.ebeaninternal.server.DContainerFactory
@@ -1 +0,0 @@
-io.ebeaninternal.server.query.DFetchGroupService
@@ -1 +0,0 @@
-io.ebeaninternal.json.DJsonService
@@ -1 +0,0 @@
-io.ebeaninternal.server.profile.DProfileLocationFactory
@@ -1 +0,0 @@
-io.ebeaninternal.server.rawsql.DRawSqlService
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.5.2</version>
+    <version>14.8.0</version>
  </parent>

  <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
      <scope>provided</scope>
    </dependency>

@@ -65,7 +65,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>14.5.2</version>
+      <version>14.8.0</version>
      <scope>test</scope>
    </dependency>

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	4610dbb26e	Version 14.8.0	2024-10-25 14:28:58 +13:00
Rob Bygrave	b26382f99c	Merge pull request #3507 from ebean-orm/feature/agent-1480 Bump ebean-agent to 14.8.0	2024-10-25 14:18:20 +13:00
Rob Bygrave	2fba89f846	Bump ebean-agent to 14.8.0 This ebean agent is required to support the fluid QueryBuilder API change.	2024-10-25 14:17:46 +13:00
Rob Bygrave	e4f13da868	Merge branch 'dynamic-property-group-by'	2024-10-24 16:13:01 +13:00
Rob Bygrave	32cd081fce	#3504 Tidy test only and final method	2024-10-24 16:12:45 +13:00
Rob Bygrave	f6da332998	Add test for TestReflectiveModificationUpdate	2024-10-24 08:37:02 +13:00
Alexander Wagner	d8f321d87b	Fix: dynamic property group by with alias	2024-10-22 13:24:12 +02:00
Rob Bygrave	c868d8a23b	Fix test for Postgres TestDistinctOnQuery	2024-10-22 19:00:52 +13:00
Rob Bygrave	d77c14d866	Fix test for Postgres TestDistinctOnQuery	2024-10-22 08:14:01 +13:00
Rob Bygrave	423d906848	Merge pull request #3499 from ebean-orm/feature/3489 Potentially breaking change: Throw PersistenceException for unknown property in select clause	2024-10-18 19:25:46 +13:00
Rob Bygrave	100d33cc94	Potentially breaking change: Throw PersistenceException for unknown property in select clause	2024-10-18 19:12:53 +13:00
Rob Bygrave	20cf6a9c00	Merge pull request #3498 from ebean-orm/feature/migrate-avaje-lang-to-jspecify Migrate to JSpecify NullMarked/Nullable from avaje.lang NonNullApi/Nullable	2024-10-18 16:56:19 +13:00
Rob Bygrave	e2c12268f7	Merge branch 'master' into feature/migrate-avaje-lang-to-jspecify	2024-10-18 16:52:53 +13:00
Rob Bygrave	937f6296e1	Merge pull request #3497 from ebean-orm/feature/fluid-self-querybuilder Fix SELF of QueryBuilder, QueryBean, IQueryBean for fluid use	2024-10-18 16:48:26 +13:00
Rob Bygrave	24749567d2	Migrate to JSpecify NullMarked/Nullable from avaje.lang NonNullApi/Nullable	2024-10-18 16:46:41 +13:00
Rob Bygrave	7045240778	Merge branch 'transaction-readonly'	2024-10-18 16:27:18 +13:00
Rob Bygrave	6ceea85b94	Move markNotQueryOnly() into init transaction methods of PersistRequest	2024-10-18 16:26:49 +13:00
Rob Bygrave	e04ac50800	Fix SELF of QueryBuilder, QueryBean, IQueryBean for fluid use Currently, the SELF response type of QueryBuilder returns as Object when really we want it to return the SELF generic type of QueryBuilder, QueryBean, IQueryBean etc Note that this change requires an updated ebean-agent	2024-10-18 16:18:39 +13:00
Noemi Praml	a452fc0e21	call request.markNotQueryOnly	2024-10-17 16:30:42 +02:00
Noemi Praml	4438d5db7d	Fixes in DefaultPersister	2024-10-17 16:19:19 +02:00
Noemi Praml	9ca6fa31e5	more tests	2024-10-17 16:19:03 +02:00
Rob Bygrave	e0a00bea34	Merge pull request #3496 from mumbler6/fix-flaky fixed flaky test in ToStringBuilderTest.java	2024-10-17 21:36:15 +13:00
mumbler6	b24b549298	fixed flaky test in ToStringBuilderTest.java	2024-10-15 22:41:51 -05:00
Rob Bygrave	51d0f4efcc	Fix test TestOrderedList for Postgres ANY	2024-10-15 22:14:45 +13:00
Noemi Praml	e08985d7c5	suggested solution	2024-10-14 16:53:48 +02:00
Noemi Praml	4f984ff2d4	add: failing test	2024-10-14 16:53:00 +02:00
Rob Bygrave	b6843c6db0	Version 14.7.0	2024-10-10 23:48:29 +13:00
Rob Bygrave	57782c05b5	Update ebean-agent to 14.7.0 (Updates to ASM 9.7.1)	2024-10-10 23:46:37 +13:00
Rob Bygrave	a2ee8b61f8	Merge pull request #3487 from FOCONIS/batch-ordering-bug Bug: Batch ordering - Regression introduced in version 13.26.1, insertAll() leaves batchMode=true enabled ... when it should not	2024-10-10 22:31:15 +13:00
Rob Bygrave	1225a2776f	Merge pull request #3485 from FOCONIS/ordercolumn-cache-queries Fix orderBy for cached many requests	2024-10-10 22:30:23 +13:00
Rob Bygrave	a499c8c26a	Merge pull request #3493 from ebean-orm/feature/3490 #3490 filterMany generates invalid sql when the many side uses @EmbeddedId to model composite primary key	2024-10-10 22:27:58 +13:00
Rob Bygrave	8e627c756f	#3490 filterMany generates invalid sql when the many side uses @EmbeddedId to model composite primary key	2024-10-10 22:24:24 +13:00
Rob Bygrave	45cc78bb0a	#3490 filterMany generates invalid sql when the many side uses @EmbeddedId to model composite primary key	2024-10-10 22:11:20 +13:00
Rob Bygrave	38a8e95b36	#3491 Update javadocs and SqlQuery Postgres ANY tests	2024-10-10 20:08:03 +13:00
Rob Bygrave	bca381104b	Merge pull request #3491 from ajcamilo/master Add setArrayParameter to SqlQuery	2024-10-10 20:07:08 +13:00
André Camilo	7e0c6795ff	add setArrayParameter to SqlQuery	2024-10-09 13:24:52 +01:00
Roland Praml	8b4804be22	Fix: after DB.inserAll, transaction may stay in batchmode	2024-10-08 13:16:37 +02:00
Roland Praml	a8418a3d75	Created test for batch escalation	2024-10-08 13:16:32 +02:00
Rob Bygrave	bb0f63e38a	Merge pull request #3488 from ebean-orm/dependabot/maven/ebean-test/commons-io-commons-io-2.14.0 Bump commons-io:commons-io from 2.7 to 2.14.0 in /ebean-test	2024-10-08 18:28:32 +13:00
Rob Bygrave	978ed26b78	Update ebean-agent 14.6.1 for #3484	2024-10-08 18:23:46 +13:00
Rob Bygrave	5cfa7295f8	Update tests for test-kotlin with latest agent	2024-10-08 18:17:08 +13:00
Noemi Praml	88d8b4fb5e	Fix orderBy for cached many requests	2024-10-07 15:04:46 +02:00
dependabot[bot]	93155d3c8f	Bump commons-io:commons-io from 2.7 to 2.14.0 in /ebean-test Bumps commons-io:commons-io from 2.7 to 2.14.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-03 18:46:07 +00:00
Rob Bygrave	6d5f740337	TestQueryPaging example to H2 and Postgres due to use of nulls first nulls first isn't supports by mysql	2024-09-20 21:21:57 +12:00
Rob Bygrave	bd06b57144	Add valhalla EA build	2024-09-18 20:49:40 +12:00
Rob Bygrave	77383f4d29	Version 14.6.0	2024-09-17 22:23:13 +12:00
Rob Bygrave	29fcbbfe97	Bump ebean-agent to 14.6.0	2024-09-17 22:09:44 +12:00
Rob Bygrave	d9e0a35efb	Merge pull request #3481 from ebean-orm/feature/boostrap-service Use io.ebean.service.BootstrapService as common marker interface for service loading bootstrapped services	2024-09-17 22:03:52 +12:00
Rob Bygrave	0c01ecbac7	Merge pull request #3478 from ebean-orm/feature/3462 #3462 Add Paging as alternative to maxRows + firstRow + orderBy	2024-09-17 22:03:13 +12:00
Rob Bygrave	5095583cc8	Merge pull request #3473 from ebean-orm/feature/3455-query-beans-improvement #3455 - Improve query beans such that filterMany() expressions are only on ToMany relationships	2024-09-17 22:02:40 +12:00
Rob Bygrave	92f04a2353	Use io.ebean.service.BootstrapService as common marker interface for service loading bootstrapped services	2024-09-17 21:58:19 +12:00
Rob Bygrave	acbce35182	Merge pull request #3480 from ebean-orm/feature/emptylist Change EmptyPagedList to be deprecated from public use	2024-09-16 21:07:40 +12:00
Rob Bygrave	d6165f4b17	Change EmptyPagedList to be deprecated from public use This should never have been public really	2024-09-16 20:58:40 +12:00
Rob Bygrave	95656360a9	Mark OrderBy constructors as deprecated The plan is to migrate OrderBy into an interface	2024-09-15 19:21:17 +12:00
Rob Bygrave	65d7df5488	#3462 Add Paging as alternative to maxRows + firstRow + orderBy Paging is an alternative to specifying the maxRows + firstRow + orderBy on a query. Example: ```java var orderBy = OrderBy.of("lastName desc nulls first, firstName asc"); var paging = Paging.of(0, 100, orderBy); DB.find(Contact.class) .setPaging(paging) .where().startsWith("lastName", "foo") .findList(); ```	2024-09-12 22:54:35 +12:00
Rob Bygrave	12648cd37d	Fix test TestQueryFilterMany	2024-09-12 20:31:37 +12:00
Rob Bygrave	a2e66bcb89	#3455 - Improve query beans such that filterMany() expressions are only on ToMany relationships Use protected helper methods on TQAssocBean for the filterMany() methods generated onto AssocMany beans.	2024-09-10 00:24:41 +12:00
Rob Bygrave	4d79815779	#3455 - Improve query beans such that filterMany() expressions are only on ToMany relationships Changes the query bean code generation for "Associated beans" to have separate AssocOne and AssocMany for ToOne and ToMany relationships. Moves the filterMany() expressions such that they are only available on the *ToMany relationships.	2024-09-09 23:26:13 +12:00
				`@@ -1 +0,0 @@`
				`io.ebeaninternal.server.profile.DMetricFactory`
				`@@ -1 +0,0 @@`
				`io.ebeaninternal.server.query.DFetchGroupService`
				`@@ -1 +0,0 @@`
				`io.ebeaninternal.server.profile.DProfileLocationFactory`
				`@@ -1 +0,0 @@`
				`io.ebeaninternal.server.rawsql.DRawSqlService`