#3433 - Put test back from desc -> description as desc as a column name isn't widely supported by other databases

#3433 - Entity property called desc used with query order by desc generates bad sql
2026-09-24 19:30:06 +00:00 · 2024-07-08 21:52:36 +12:00 · 2024-07-04 00:01:00 +12:00
244 changed files with 844 additions and 3350 deletions
@@ -1,41 +0,0 @@
-name: Valhalla EA
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '39 2 * * 3'
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [valhalla]
-        os: [ubuntu-latest]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Java
-        uses: oracle-actions/setup-java@v1
-        with:
-          website: jdk.java.net
-          release: ${{ matrix.java_version }}
-      - name: Maven cache
-        uses: actions/cache@v4
-        env:
-          cache-name: maven-cache
-        with:
-          path:
-            ~/.m2
-          key: build-${{ env.cache-name }}
-      - name: Maven version
-        run: mvn --version
-#      - name: Prepare
-#        run: ./jakarta-to-valhalla.sh
-      - name: Build with Maven
-        run: mvn package
@@ -56,7 +56,7 @@ Work at the highest level of abstraction and drop down levels as needed.
    <tr>
      <td align="center" valign="middle">
        <a href="https://www.foconis.de/" target="_blank">
-          <img width="222px" src="https://group.foconis.com/download/ci/logo/png-72dpi/logo-quer/foconis-analytics-quer.png">
+          <img width="222px" src="https://www.foconis.de/templates/yootheme/cache/foconis_logo_322-709da1de.png">
        </a>
      </td>
      <td align="center" valign="middle">
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.8.0</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  </dependencies>
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.8.0</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-net-postgis</name>
-  <description>ebean-net-postgis composite</description>
-  <artifactId>ebean-net-postgis</artifactId>
-
-  <properties>
-    <postgis.jdbc.version>2023.1.0</postgis.jdbc.version>
-    <postgres.jdbc.version>42.7.2</postgres.jdbc.version>
-  </properties>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.8.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.8.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.8.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.8.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-net-postgis-types</artifactId>
-      <version>14.8.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <version>${postgres.jdbc.version}</version>
-      <exclusions>
-        <!-- exclude unnecessary checker framework -->
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>net.postgis</groupId>
-      <artifactId>postgis-jdbc</artifactId>
-      <version>${postgis.jdbc.version}</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.postgis.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,10 +0,0 @@
-module io.ebean.postgis {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.postgres;
-  // requires transitive io.ebean.postgis.types;
-
-}
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.8.0</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  <name>ebean api</name>
@@ -26,10 +26,14 @@
      <version>1.0</version>
    </dependency>

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

    <dependency>
@@ -1,9 +1,10 @@
 package io.ebean;

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

 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;

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

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

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

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

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

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

 import java.util.Collection;
@@ -36,7 +36,7 @@ import java.util.Collection;
 * @param <I> The ID type
 * @param <T> The Bean type
 */
-@NullMarked
+@NonNullApi
 public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {

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

-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.plugin.Property;
@@ -57,7 +57,7 @@ import java.util.concurrent.Callable;
 *
 * }</pre>
 */
-@NullMarked
+@NonNullApi
 public final class DB {

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

-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
@@ -83,7 +83,7 @@ import java.util.concurrent.Callable;
 * @see DatabaseFactory
 * @see DatabaseConfig
 */
-@NullMarked
+@NonNullApi
 public interface Database {

  /**
@@ -5,6 +5,8 @@ import io.ebean.service.SpiContainer;
 import io.ebean.service.SpiContainerFactory;
 import jakarta.persistence.PersistenceException;

+import java.util.Iterator;
+import java.util.ServiceLoader;
 import java.util.concurrent.locks.ReentrantLock;

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

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

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

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

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

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

  /**
@@ -140,17 +140,6 @@ public interface DtoQuery<T> extends CancelableQuery {
   * Bind the named multi-value array parameter which we would use with Postgres ANY.
   * <p>
   * For Postgres this binds an ARRAY rather than expands into multiple bind values.
-   * <pre>{@code
-   *
-   *   String sql = "select id, name from o_customer where id = any(:idList)";
-   *
-   *   var ids = List.of(1, 2, 3);
-   *
-   *   List<CustomerDto> list2 = DB.findDto(CustomerDto.class, sql)
-   *       .setArrayParameter("idList", ids)
-   *       .findList();
-   *
-   * }</pre>
   */
  DtoQuery<T> setArrayParameter(String name, Collection<?> values);

@@ -5,8 +5,6 @@ import java.util.List;
 import java.util.concurrent.Future;

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

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

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

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

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

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

 /**
@@ -61,7 +61,7 @@ import io.ebean.service.SpiFetchGroupQuery;
 *
 * @param <T> The bean type the Fetch group can be applied to
 */
-@NullMarked
+@NonNullApi
 public interface FetchGroup<T> {

  /**
@@ -84,7 +84,7 @@ public interface FetchGroup<T> {
   * @return The FetchGroup with the given select clause
   */
  static <T> FetchGroup<T> of(Class<T> cls, String select) {
-    return XBootstrapService.fetchGroupOf(cls, select);
+    return XServiceProvider.fetchGroupOf(cls, select);
  }

  /**
@@ -108,14 +108,14 @@ public interface FetchGroup<T> {
   * @return The FetchGroupBuilder with the given select clause which we will add fetch clauses to
   */
  static <T> FetchGroupBuilder<T> of(Class<T> cls) {
-    return XBootstrapService.fetchGroupOf(cls);
+    return XServiceProvider.fetchGroupOf(cls);
  }

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

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

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

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

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

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

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

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

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

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

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

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

 /**
 * Options to be used with insert such as ON CONFLICT DO UPDATE | NOTHING.
@@ -8,11 +8,13 @@ import java.util.Objects;
 /**
 * Represents an Order By for a Query.
 * <p>
- * Is an ordered list of OrderBy.Property objects each specifying a property and
+ * Is a ordered list of OrderBy.Property objects each specifying a property and
 * whether it is ascending or descending order.
+ * </p>
 * <p>
- * Typically, you will not construct an OrderBy yourself but use one that exists
+ * Typically you will not construct an OrderBy yourself but use one that exists
 * on the Query object.
+ * </p>
 */
 public class OrderBy<T> implements Serializable {

@@ -23,22 +25,8 @@ public class OrderBy<T> implements Serializable {
  private final List<Property> list;

  /**
-   * Create an OrderBy parsing the given order by clause.
-   * <p>
-   * The order by clause follows SQL order by clause with comma's between each
-   * property and optionally "asc" or "desc" to represent ascending or
-   * descending order respectively.
-   */
-  public static <P> OrderBy<P> of(String orderByClause) {
-    return new OrderBy<>(orderByClause);
-  }
-
-  /**
-   * @deprecated This method will be removed from public API.
-   * <p>
   * Create an empty OrderBy with no associated query.
   */
-  @Deprecated(forRemoval = true)
  public OrderBy() {
    this.list = new ArrayList<>(3);
  }
@@ -48,17 +36,20 @@ public class OrderBy<T> implements Serializable {
  }

  /**
-   * @deprecated migrate to {@link OrderBy#of(String)}.
+   * Create an orderBy parsing the order by clause.
+   * <p>
+   * The order by clause follows SQL order by clause with comma's between each
+   * property and optionally "asc" or "desc" to represent ascending or
+   * descending order respectively.
+   * </p>
   */
-  @Deprecated(forRemoval = true)
  public OrderBy(String orderByClause) {
    this(null, orderByClause);
  }

  /**
-   * @deprecated This method will be removed from public API.
+   * Construct with a given query and order by clause.
   */
-  @Deprecated(forRemoval = true)
  public OrderBy(Query<T> query, String orderByClause) {
    this.query = query;
    this.list = new ArrayList<>(3);
@@ -119,11 +110,8 @@ public class OrderBy<T> implements Serializable {
  }

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

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

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

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

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

 /**
 * Object relational query for finding a List, Set, Map or single entity bean.
@@ -149,7 +149,7 @@ import org.jspecify.annotations.NullMarked;
 *
 * @param <T> the type of Entity bean this query will fetch.
 */
-@NullMarked
+@NonNullApi
 public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {

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

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

 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -20,20 +20,13 @@ 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> {

  /**
   * Set root table alias.
   */
  SELF alias(String alias);

-  /**
-   * Apply changes to the query using a function.
-   *
-   * @param apply Function that applies changes to the query.
-   */
-  SELF also(Consumer<SELF> apply);
-
  /**
   * Apply changes to the query conditional on the supplied predicate.
   * <p>
@@ -324,8 +317,6 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que
   */
  SELF setMaxRows(int maxRows);

-  SELF setPaging(Paging paging);
-
  /**
   * Set RawSql to use for this query.
   */
@@ -6,7 +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> {

  /**
   * 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 XBootstrapService.rawSql().resultSet(resultSet, propertyNames);
+    return XServiceProvider.rawSql().resultSet(resultSet, propertyNames);
  }

  /**
   * Create and return a SqlRow based on the resultSet with dbTrueValue and binaryOptimizedUUID options.
   */
  static SqlRow sqlRow(ResultSet resultSet, final String dbTrueValue, boolean binaryOptimizedUUID) throws SQLException {
-    return XBootstrapService.rawSql().sqlRow(resultSet, dbTrueValue, binaryOptimizedUUID);
+    return XServiceProvider.rawSql().sqlRow(resultSet, dbTrueValue, binaryOptimizedUUID);
  }

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

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

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

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

 import javax.sql.DataSource;
 import java.io.Serializable;
 import java.sql.Connection;
-import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -40,7 +39,7 @@ import java.util.function.Predicate;
 *
 * }</pre>
 */
-@NullMarked
+@NonNullApi
 public interface SqlQuery extends Serializable, CancelableQuery {

  /**
@@ -172,7 +171,7 @@ public interface SqlQuery extends Serializable, CancelableQuery {
   *   List<SqlRow> list =
   *     DB.sqlQuery(sql)
   *       .setParameter("Rob")
-   *       .setParameter(Status.NEW)
+   *       .setParameter("Status.NEW)
   *       .findList();
   *
   *   // the same as ...
@@ -242,45 +241,11 @@ public interface SqlQuery extends Serializable, CancelableQuery {
   */
  SqlQuery setParameter(int position, Object value);

-  /**
-   * Bind the array parameter by its index position for use with Postgres ANY.
-   * <p>
-   * For Postgres this binds an ARRAY rather than expands into multiple bind values.
-   * <pre>{@code
-   *
-   *    String sql = "select name from customer where id = any(?)";
-   *
-   *    List<SqlRow> list =
-   *      DB.sqlQuery(sql)
-   *        .setArrayParameter(1, List.of(1, 2, 3))
-   *        .findList();
-   *
-   * }</pre>
-   */
-  SqlQuery setArrayParameter(int position, Collection<?> value);
-
  /**
   * Bind the named parameter value.
   */
  SqlQuery setParameter(String name, Object value);

-  /**
-   * Bind the named array parameter which we would use with Postgres ANY.
-   * <p>
-   * For Postgres this binds an ARRAY rather than expands into multiple bind values.
-   * <pre>{@code
-   *
-   *    String sql = "select name from customer where id = any(:idList)";
-   *
-   *    List<SqlRow> list =
-   *      DB.sqlQuery(sql)
-   *        .setArrayParameter("idList", List.of(1, 2, 3))
-   *        .findList();
-   *
-   * }</pre>
-   */
-  SqlQuery setArrayParameter(String name, Collection<?> value);
-
  /**
   * Set the index of the first row of the results to return.
   */
@@ -1,95 +0,0 @@
-package io.ebean;
-
-import io.ebean.metric.MetricFactory;
-import io.ebean.service.*;
-
-import java.util.ServiceLoader;
-
-/**
- * Bootstrap internal services.
- */
-public final class XBootstrapService {
-
-  private static final SpiContainerFactory containerFactory;
-  private static final SpiRawSqlService rawSqlService;
-  private static final SpiProfileLocationFactory profileLocationFactory;
-  private static final SpiFetchGroupService fetchGroupService;
-  private static final MetricFactory metricFactory;
-  private static final SpiJsonService jsonService;
-  static {
-    SpiContainerFactory _factory = null;
-    SpiRawSqlService _raw = null;
-    SpiProfileLocationFactory _profile = null;
-    SpiFetchGroupService _fetch = null;
-    MetricFactory _metric = null;
-    SpiJsonService _json = null;
-    for (BootstrapService extension : ServiceLoader.load(BootstrapService.class)) {
-      if (extension instanceof SpiContainerFactory) {
-        _factory = (SpiContainerFactory)extension;
-      } else if (extension instanceof SpiRawSqlService) {
-        _raw = (SpiRawSqlService)extension;
-      } else if (extension instanceof SpiProfileLocationFactory) {
-        _profile = (SpiProfileLocationFactory)extension;
-      } else if (extension instanceof SpiFetchGroupService) {
-        _fetch = (SpiFetchGroupService)extension;
-      } else if (extension instanceof MetricFactory) {
-        _metric = (MetricFactory)extension;
-      } else if (extension instanceof SpiJsonService) {
-        _json = (SpiJsonService)extension;
-      }
-    }
-    containerFactory = _factory;
-    rawSqlService = _raw;
-    profileLocationFactory = _profile;
-    fetchGroupService = _fetch;
-    metricFactory = _metric;
-    jsonService = _json;
-  }
-
-  /**
-   * Return the MetricFactory found in boostrap service loading.
-   */
-  public static MetricFactory metricFactory() {
-    return metricFactory;
-  }
-
-  /**
-   * Return the SpiJsonService found in boostrap service loading.
-   */
-  public static SpiJsonService jsonService() {
-    return jsonService;
-  }
-
-  static SpiContainerFactory containerFactory() {
-    return containerFactory;
-  }
-
-  static SpiRawSqlService rawSql() {
-    return rawSqlService;
-  }
-
-  static SpiProfileLocationFactory profileLocationFactory() {
-    return profileLocationFactory;
-  }
-
-  /**
-   * Return the FetchGroup with the given select clause.
-   */
-  static <T> FetchGroup<T> fetchGroupOf(Class<T> cls, String select) {
-    return fetchGroupService.of(cls, select);
-  }
-
-  /**
-   * Return the FetchGroupBuilder with the given select clause.
-   */
-  static <T> FetchGroupBuilder<T> fetchGroupOf(Class<T> cls) {
-    return fetchGroupService.of(cls);
-  }
-
-  /**
-   * Return the FetchGroup Query for building fetch groups via query beans.
-   */
-  static <T> SpiFetchGroupQuery<T> fetchGroupQueryFor(Class<T> cls) {
-    return fetchGroupService.queryFor(cls);
-  }
-}
@@ -0,0 +1,76 @@
+package io.ebean;
+
+import io.ebean.service.SpiFetchGroupQuery;
+import io.ebean.service.SpiFetchGroupService;
+import io.ebean.service.SpiProfileLocationFactory;
+import io.ebean.service.SpiRawSqlService;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+/**
+ * Lookup internal services.
+ */
+final class XServiceProvider {
+
+  private static SpiRawSqlService rawSqlService = initRawSql();
+
+  private static SpiProfileLocationFactory profileLocationFactory = initProfileLocation();
+
+  private static SpiFetchGroupService fetchGroupService = initSpiFetchGroupService();
+
+  private static SpiFetchGroupService initSpiFetchGroupService() {
+    return loadFirstService(SpiFetchGroupService.class);
+  }
+
+  private static SpiRawSqlService initRawSql() {
+    return loadFirstService(SpiRawSqlService.class);
+  }
+
+  private static SpiProfileLocationFactory initProfileLocation() {
+    return loadFirstService(SpiProfileLocationFactory.class);
+  }
+
+  private static <T> T loadFirstService(Class<T> cls) {
+    Iterator<T> loader = ServiceLoader.load(cls).iterator();
+    if (loader.hasNext()) {
+      return loader.next();
+    }
+    throw new IllegalStateException("No service implementation found for " + cls);
+  }
+
+  /**
+   * Return the RawSqlService implementation.
+   */
+  static SpiRawSqlService rawSql() {
+    return rawSqlService;
+  }
+
+  /**
+   * Return the RawSqlService implementation.
+   */
+  static SpiProfileLocationFactory profileLocationFactory() {
+    return profileLocationFactory;
+  }
+
+  /**
+   * Return the FetchGroup with the given select clause.
+   */
+  static <T> FetchGroup<T> fetchGroupOf(Class<T> cls, String select) {
+    return fetchGroupService.of(cls, select);
+  }
+
+  /**
+   * Return the FetchGroupBuilder with the given select clause.
+   */
+  static <T> FetchGroupBuilder<T> fetchGroupOf(Class<T> cls) {
+    return fetchGroupService.of(cls);
+  }
+
+  /**
+   * Return the FetchGroup Query for building fetch groups via query beans.
+   */
+  static <T> SpiFetchGroupQuery<T> fetchGroupQueryFor(Class<T> cls) {
+    return fetchGroupService.queryFor(cls);
+  }
+}
@@ -1,6 +1,6 @@
 package io.ebean.cache;

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

 import java.util.LinkedHashMap;
@@ -1,19 +1,17 @@
 package io.ebean.metric;

 import io.ebean.ProfileLocation;
-import io.ebean.XBootstrapService;
-import io.ebean.service.BootstrapService;

 /**
 * Factory to create timed metric counters.
 */
-public interface MetricFactory extends BootstrapService {
+public interface MetricFactory {

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

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

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

  /**
   * 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 extends BootstrapService {
+public interface SpiJsonService {

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

  /**
   * 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 extends BootstrapService {
+public interface SpiRawSqlService {

  /**
   * Create based on a JDBC ResultSet.
@@ -3,15 +3,16 @@ 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;

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

-  private static final SpiJsonService plugin = XBootstrapService.jsonService();
+  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?");
+  }

  /**
   * Write the nested Map/List as json.
@@ -1,13 +1,17 @@
 module io.ebean.api {

  uses io.ebean.config.AutoConfigure;
+  uses io.ebean.config.dbplatform.DatabasePlatformProvider;
  uses io.ebean.datasource.DataSourceAlertFactory;
-  uses io.ebean.service.BootstrapService;
-  uses io.ebean.service.SpiJsonService;
+  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;

  requires transitive java.sql;
  requires transitive io.avaje.config;
-  requires transitive org.jspecify;
+  requires transitive io.avaje.lang;
  requires transitive jakarta.persistence.api;
  requires transitive io.ebean.annotation;
  requires transitive io.ebean.datasource.api;
@@ -1 +1 @@
-ebean-version: 148
+ebean-version: 143
@@ -213,7 +213,7 @@ class ToStringBuilderTest {

    final int id;

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


    ParamStore(final int id) {
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.8.0</version>
+    <version>14.4.0</version>
  </parent>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 import java.lang.annotation.Annotation;

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

-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.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 org.jspecify.annotations.Nullable;
+import io.avaje.lang.Nullable;
 import io.ebean.DatabaseBuilder;

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

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

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

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

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

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

@@ -231,14 +231,6 @@ 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 org.jspecify.annotations.Nullable;
+import io.avaje.lang.Nullable;
 import io.ebean.*;
 import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.CallOrigin;
@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;

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

  /**
   * Return the TransactionContext.
@@ -1,22 +0,0 @@
-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 org.jspecify.annotations.Nullable;
+import io.avaje.lang.Nullable;

 /**
 * SQL query binding (for SqlQuery and DtoQuery).
@@ -105,9 +105,6 @@ 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 org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.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.
 */
-@NullMarked
+@NonNullApi
 public final class DefaultServer implements SpiServer, SpiEbeanServer {

  private static final System.Logger log = CoreLog.internal;
@@ -1689,7 +1689,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
      for (Object bean : beans) {
        persister.insert(checkEntityBean(bean), options, txn);
      }
-      txn.flushBatchOnCollection();
      return 0;
    }, transaction);
  }
@@ -41,9 +41,9 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
  private CQueryPlanKey queryPlanKey;
  private SpiQuerySecondary secondaryQueries;
  private List<T> cacheBeans;
+  private BeanPropertyAssocMany<?> manyProperty;
  private boolean inlineCountDistinct;
  private Set<String> dependentTables;
-  private SpiQueryManyJoin manyJoin;

  public OrmQueryRequest(SpiEbeanServer server, OrmQueryEngine queryEngine, SpiQuery<T> query, SpiTransaction t) {
    super(server, t);
@@ -168,8 +168,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   */
  @Override
  public void prepareQuery() {
-    manyJoin = query.convertJoins();
-    secondaryQueries = query.secondaryQuery();
+    secondaryQueries = query.convertJoins();
    beanDescriptor.prepareQuery(query);
    adapterPreQuery();
    queryPlanKey = query.prepare(this);
@@ -447,19 +446,19 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    return query;
  }

-  public SpiQueryManyJoin manyJoin() {
-    return manyJoin;
+  /**
+   * Determine and return the ToMany property that is included in the query.
+   */
+  public BeanPropertyAssocMany<?> determineMany() {
+    manyProperty = beanDescriptor.manyProperty(query);
+    return manyProperty;
  }

  /**
-   * Return true if there is a manyJoin that should be included with this query.
+   * Return the many property that is fetched in the query or null if there is not one.
   */
-  public boolean includeManyJoin() {
-    if (manyJoin == null || query.isSingleAttribute()) {
-      return false;
-    }
-    final Type type = query.type();
-    return type != Type.SQ_EX && type != Type.COUNT;
+  public BeanPropertyAssocMany<?> manyPropertyForOrderBy() {
+    return query.isSingleAttribute() ? null : manyProperty;
  }

  /**
@@ -146,7 +146,6 @@ public abstract class PersistRequest extends BeanRequest implements BatchPostExe
  public void initTransIfRequired() {
    createImplicitTransIfRequired();
    persistCascade = transaction.isPersistCascade();
-    transaction.markNotQueryOnly();
  }

  /**
@@ -228,7 +228,6 @@ 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 org.jspecify.annotations.Nullable;
+import io.avaje.lang.Nullable;
 import io.ebean.*;
 import io.ebean.bean.EntityBean;
 import io.ebean.meta.MetricVisitor;
@@ -1601,6 +1601,19 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
    return null;
  }

+  /**
+   * Return the many property included in the query or null if one is not.
+   */
+  public BeanPropertyAssocMany<?> manyProperty(SpiQuery<?> query) {
+    OrmQueryDetail detail = query.detail();
+    for (BeanPropertyAssocMany<?> many : propertiesMany) {
+      if (detail.includesPath(many.name())) {
+        return many;
+      }
+    }
+    return null;
+  }
+
  /**
   * Return a raw expression for 'where parent id in ...' clause.
   */
@@ -36,11 +36,6 @@ public final class BeanFkeyProperty implements ElPropertyValue {
    return "prefix:" + prefix + " name:" + name + " dbColumn:" + dbColumn + " ph:" + placeHolder;
  }

-  @Override
-  public String idNullOr(String filterManyExpression) {
-    throw new UnsupportedOperationException();
-  }
-
  @Override
  public boolean isAggregation() {
    return false;
@@ -512,11 +512,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    return owningType.isAssignableFrom(type);
  }

-  @Override
-  public String idNullOr(String filterManyExpression) {
-    throw new UnsupportedOperationException();
-  }
-
  @Override
  public void loadIgnore(DbReadContext ctx) {
    ctx.dataReader().incrementPos(1);
@@ -634,11 +634,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
    return fetchOrderBy;
  }

-  @Override
-  public String idNullOr(String filterManyExpression) {
-    return targetIdBinder.idNullOr(name, filterManyExpression);
-  }
-
  /**
   * Return the order by for use when lazy loading the associated collection.
   */
@@ -62,11 +62,6 @@ 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;
@@ -27,11 +27,6 @@ public interface IdBinder {
   */
  void initialise();

-  /**
-   * Wrap the filter many expression with a condition allowing lEFT JOIN null matching row.
-   */
-  String idNullOr(String name, String filterManyExpression);
-
  String idSelect();

  /**
@@ -46,20 +46,6 @@ public final class IdBinderEmbedded implements IdBinder {
    this.idInValueSql = idInExpandedForm ? idInExpanded() : idInCompressed();
  }

-  @Override
-  public String idNullOr(String prefix, String filterManyExpression) {
-    StringBuilder sb = new StringBuilder(100);
-    sb.append("((");
-    for (int i = 0; i < props.length; i++) {
-      if (i > 0) {
-        sb.append(" and ");
-      }
-      sb.append("${").append(prefix).append('}').append(props[i].dbColumn()).append(" is null");
-    }
-    sb.append(") or (").append(filterManyExpression).append("))");
-    return sb.toString();
-  }
-
  @Override
  public String idSelect() {
    return embIdProperty.name();
@@ -28,11 +28,6 @@ final class IdBinderEmpty implements IdBinder {
  public void initialise() {
  }

-  @Override
-  public String idNullOr(String name, String filterManyExpression) {
-    throw new UnsupportedOperationException();
-  }
-
  @Override
  public String idSelect() {
    return "";
@@ -260,9 +260,4 @@ public final class IdBinderSimple implements IdBinder {
    final Object value = idProperty.getValue(bean);
    return scalarType.format(value);
  }
-
-  @Override
-  public String idNullOr(String prefix, String filterManyExpression) {
-    return "(${" + prefix + "}" + idProperty.name() + " is null or (" + filterManyExpression + "))";
-  }
 }
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy.meta;

-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.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 org.jspecify.annotations.NullMarked;
+import io.avaje.lang.NonNullApi;
 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.
 */
-@NullMarked
+@NonNullApi
 public final class ElFilter<T> implements Filter<T> {

  private final BeanDescriptor<T> beanDescriptor;
@@ -286,8 +286,4 @@ public final class ElPropertyChain implements ElPropertyValue {
    }
  }

-  @Override
-  public String idNullOr(String filterManyExpression) {
-    throw new UnsupportedOperationException();
-  }
 }
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.el;

-import io.ebeaninternal.api.SpiQueryManyJoin;
 import io.ebeaninternal.server.deploy.BeanProperty;

 /**
@@ -11,7 +10,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 * joins and set place holders for table alias'.
 * </p>
 */
-public interface ElPropertyDeploy extends SpiQueryManyJoin {
+public interface ElPropertyDeploy {

  /**
   * This is the elPrefix for all root level properties.
@@ -81,14 +80,4 @@ public interface ElPropertyDeploy extends SpiQueryManyJoin {
   * is left as a 'join' and which get converted to query join.
   */
  int fetchPreference();
-
-  @Override
-  default String path() {
-    return elName();
-  }
-
-  @Override
-  default String fetchOrderBy() {
-    return beanProperty().fetchOrderBy();
-  }
 }
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.executor;

 import io.avaje.applog.AppLog;
-import org.jspecify.annotations.NullMarked;
+import io.avaje.lang.NonNullApi;
 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.
 */
-@NullMarked
+@NonNullApi
 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 org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.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.
 */
-@NullMarked
+@NonNullApi
 public class DefaultExpressionList<T> implements SpiExpressionList<T> {

  private static final String AND = " and ";
@@ -33,10 +33,6 @@ 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 org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.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.*;

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

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

 import io.ebean.OrderBy;
-import io.ebeaninternal.api.*;
+import io.ebeaninternal.api.BindParams;
+import io.ebeaninternal.api.CoreLog;
+import io.ebeaninternal.api.SpiExpressionList;
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.bind.DataBind;
 import io.ebeaninternal.server.core.OrmQueryRequest;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.DeployParser;
 import io.ebeaninternal.server.expression.DefaultExpressionRequest;
 import io.ebeaninternal.server.persist.Binder;
@@ -171,8 +175,9 @@ public final class CQueryPredicates {
    buildUpdateClause(buildSql, deployParser);
    buildBindWhereRawSql(buildSql);

+    BeanPropertyAssocMany<?> manyProperty = request.determineMany();
    if (buildSql) {
-      dbOrderBy = deriveOrderByWithMany(deployParser);
+      dbOrderBy = deriveOrderByWithMany(deployParser, request.manyPropertyForOrderBy());
      // create a copy of the includes required to support the orderBy
      orderByIncludes = new HashSet<>(deployParser.includes());
    }
@@ -183,16 +188,13 @@ public final class CQueryPredicates {
        dbWhere = where.buildSql();
      }
    }
-    SpiQueryManyJoin manyProperty = request.manyJoin();
    if (manyProperty != null) {
-      OrmQueryProperties chunk = query.detail().getChunk(manyProperty.path(), false);
-      if (chunk != null) {
-        SpiExpressionList<?> filterManyExpr = chunk.getFilterMany();
-        if (filterManyExpr != null) {
-          this.filterMany = new DefaultExpressionRequest(request, deployParser, binder, filterManyExpr);
-          if (buildSql) {
-            dbFilterMany = manyProperty.idNullOr(filterMany.buildSql());
-          }
+      OrmQueryProperties chunk = query.detail().getChunk(manyProperty.name(), false);
+      SpiExpressionList<?> filterManyExpr = chunk.getFilterMany();
+      if (filterManyExpr != null) {
+        this.filterMany = new DefaultExpressionRequest(request, deployParser, binder, filterManyExpr);
+        if (buildSql) {
+          dbFilterMany = filterMany.buildSql();
        }
      }
    }
@@ -246,9 +248,9 @@ public final class CQueryPredicates {
  /**
   * There is a many property we need to make sure the ordering is appropriate.
   */
-  private String deriveOrderByWithMany(DeployParser parser) {
+  private String deriveOrderByWithMany(DeployParser parser, BeanPropertyAssocMany<?> manyProp) {
    String orderBy = parseOrderBy(parser);
-    if (!request.includeManyJoin()) {
+    if (manyProp == null) {
      return orderBy;
    }
    String orderById = parser.parse(request.descriptor().defaultOrderBy());
@@ -256,10 +258,9 @@ public final class CQueryPredicates {
      orderBy = orderById;
    }
    // check for default ordering on the many property...
-    SpiQueryManyJoin manyProp = request.manyJoin();
    String manyOrderBy = manyProp.fetchOrderBy();
    if (manyOrderBy != null) {
-      orderBy = orderBy + ", " + parser.parse(CQueryBuilder.prefixOrderByFields(manyProp.path(), manyOrderBy));
+      orderBy = orderBy + ", " + parser.parse(CQueryBuilder.prefixOrderByFields(manyProp.name(), manyOrderBy));
    }
    if (request.isFindById()) {
      // only one master bean so should be fine...
@@ -272,7 +273,7 @@ public final class CQueryPredicates {
    if (idPos == 0) {
      return orderBy;
    }
-    int manyPos = orderBy.indexOf("${" + manyProp.path() + "}");
+    int manyPos = orderBy.indexOf("${" + manyProp.name() + "}");
    if (manyPos == -1) {
      // no ordering of the many
      if (idPos == -1) {
@@ -285,10 +286,10 @@ public final class CQueryPredicates {
    if (idPos == -1 || idPos >= manyPos) {
      if (idPos > manyPos) {
        // there was an error with the order by...
-        String msg = "A Query on [" + request.descriptor() + "] includes a join to a 'many' association [" + manyProp.path()
-          + "] with an incorrect orderBy [" + orderBy + "]. The id property [" + orderById
-          + "] must come before the many property [" + manyProp.path() + "] in the orderBy."
-          + " Ebean has automatically modified the orderBy clause to do this.";
+        String msg = "A Query on [" + request.descriptor() + "] includes a join to a 'many' association [" + manyProp.name()
+        + "] with an incorrect orderBy [" + orderBy + "]. The id property [" + orderById
+        + "] must come before the many property [" + manyProp.name() + "] in the orderBy."
+        + " Ebean has automatically modified the orderBy clause to do this.";
        CoreLog.log.log(WARNING, msg);
      }
      // the id needs to come before the manyPropName
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.query;

-import org.jspecify.annotations.NullMarked;
+import io.avaje.lang.NonNullApi;
 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.
 */
-@NullMarked
+@NonNullApi
 final class DFetchGroupBuilder<T> implements FetchGroupBuilder<T> {

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

-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
-import io.ebean.*;
+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 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;

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

  private static final FetchConfig FETCH_CACHE = FetchConfig.ofCache();
@@ -31,7 +53,6 @@ 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() {
@@ -209,11 +230,6 @@ 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> also(Consumer<Query<T>> apply) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
  @Override
  public Query<T> alsoIf(BooleanSupplier predicate, Consumer<Query<T>> apply) {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
@@ -417,7 +433,7 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery

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

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

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

  @Override
@@ -488,11 +501,6 @@ 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,13 +92,6 @@ 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,7 +11,6 @@ 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.*;

@@ -441,9 +440,12 @@ 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) {
-        throw new PersistenceException("Property not found - " + SplitName.add(queryProps.getPath(), propName));
+        log.log(ERROR, "property [{0}] not found on {1} for query - excluding it.", propName, desc);
+        p = desc.findProperty("id");
+        selectProps.add(p);

      } else if (p.isId() && excludeIdProperty()) {
        // do not bother to include id for normal queries as the
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	f27958210c	#3433 - Put test back from desc -> description as desc as a column name isn't widely supported by other databases	2024-07-08 21:52:36 +12:00
Rob Bygrave	70cfc77b5b	#3433 - Entity property called desc used with query order by desc generates bad sql	2024-07-04 00:01:00 +12:00