Version 14.9.0

Bump ebean-agent to 14.9.0 with module path support for @Transactional
Feature: Add a MethodHandles.Lookup SPI (#3535 )
2026-09-20 19:17:55 +00:00 · 2025-02-12 19:56:14 +13:00 · 2025-02-12 19:36:48 +13:00 · 2025-02-12 19:30:05 +13:00 · 2025-02-12 18:53:57 +13:00 · 2025-02-12 18:52:53 +13:00
298 changed files with 2049 additions and 1358 deletions
@@ -4,7 +4,7 @@ name: Yugabyte
 on:
  workflow_dispatch:
  schedule:
-    - cron: '10 3 * * *'
+    - cron: '10 3 * * 3'

 jobs:
  build:
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.7.0</version>
+    <version>14.9.0</version>
    <relativePath>../..</relativePath>
  </parent>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-net-postgis-types</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-postgis-types</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.0</version>
    </dependency>

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

  <artifactId>composites</artifactId>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.7.0</version>
+    <version>14.9.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>
@@ -90,23 +86,6 @@
      <optional>true</optional>
    </dependency>

-    <!-- JAVAX-DEPENDENCY-START ___
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <optional>true</optional>
-    </dependency>
-    ____ JAVAX-DEPENDENCY-END -->
-    <!-- JAKARTA-DEPENDENCY-START -->
-    <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
-      <version>6.0.0</version>
-      <optional>true</optional>
-    </dependency>
-    <!-- JAKARTA-DEPENDENCY-END -->
-
  </dependencies>

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

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

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

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

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

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

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

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

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

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

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

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

  private static final DbContext context = DbContext.getInstance();
@@ -605,7 +605,7 @@ public final class DB {
   *   // find orders and their customers
   *   List<Order> list = DB.find(Order.class)
   *     .fetch("customer")
-   *     .order("id")
+   *     .orderBy("id")
   *     .findList();
   *
   *   // sort by customer name ascending, then by order shipDate
@@ -1,7 +1,7 @@
 package io.ebean;

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

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

  /**
-   * Controls if Ebean should ignore <code>&x64;javax.validation.contstraints.NotNull</code> or
-   * <code>&x64;jakarta.validation.contstraints.NotNull</code>
+   * Controls if Ebean should ignore <code>&#64;javax.validation.contstraints.NotNull</code> or
+   * <code>&#64;jakarta.validation.contstraints.NotNull</code>
   * with respect to generating a <code>NOT NULL</code> column.
   * <p>
   * Normally when Ebean sees javax NotNull annotation it means that column is defined as NOT NULL.
@@ -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 {

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

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

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

  /**
@@ -53,14 +53,6 @@ public interface ExpressionList<T> {
   */
  Query<T> orderById(boolean orderById);

-  /**
-   * @deprecated migrate to {@link #orderBy(String)}
-   */
-  @Deprecated(since = "13.19", forRemoval = true)
-  default ExpressionList<T> order(String orderByClause) {
-    return orderBy(orderByClause);
-  }
-
  /**
   * Set the order by clause replacing the existing order by clause if there is
   * one.
@@ -71,14 +63,6 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> orderBy(String orderBy);

-  /**
-   * @deprecated migrate to {@link #orderBy()}.
-   */
-  @Deprecated(forRemoval = true)
-  default OrderBy<T> order() {
-    return orderBy();
-  }
-
  /**
   * Return the OrderBy so that you can append an ascending or descending
   * property to the order by clause.
@@ -221,21 +205,6 @@ public interface ExpressionList<T> {
   */
  int delete();

-  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then delete().
-   * <p>
-   * Execute as a delete query deleting the 'root level' beans that match the predicates
-   * in the query.
-   * <p>
-   * Note that if the query includes joins then the generated delete statement may not be
-   * optimal depending on the database platform.
-   * </p>
-   *
-   * @return the number of rows that were deleted.
-   */
-  @Deprecated(forRemoval = true, since = "13.1.0")
-  int delete(Transaction transaction);
-
  /**
   * Execute as a update query.
   *
@@ -244,17 +213,6 @@ public interface ExpressionList<T> {
   */
  int update();

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

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

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

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

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

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

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

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

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

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

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

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

 /**
 * Options to be used with insert such as ON CONFLICT DO UPDATE | NOTHING.
@@ -61,7 +61,7 @@ package io.ebean;
 *            .eq("status", Customer.Status.ACTIVE)
 *            .gt("id", 0)
 *            .endAnd()
- *      .order().asc("name");
+ *      .orderBy().asc("name");
 *
 * q.findList();
 * String s = q.getGeneratedSql();
@@ -25,7 +25,7 @@ import java.util.concurrent.Future;
 *
 *     PagedList<Order> pagedList = DB.find(Order.class)
 *       .where().eq("status", Order.Status.NEW)
- *       .order().asc("id")
+ *       .orderBy().asc("id")
 *       .setFirstRow(0)
 *       .setMaxRows(50)
 *       .findPagedList();
@@ -1,6 +1,6 @@
 package io.ebean;

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

 /**
 * Used to specify Paging on a Query as an alternative to setting each of the
@@ -30,7 +30,7 @@ import java.util.Objects;
 *   .where()
 *   .eq("store", "def")
 *   .inPairs(pairs)       // IN clause with 'pairs' of values
- *   .order("sku desc")
+ *   .orderBy("sku desc")
 *
 *   // query expressions cover the natural key properties
 *   // so we can choose to hit the L2 bean cache if we want
@@ -1,6 +1,6 @@
 package io.ebean;

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

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

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

-  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then delete().
-   * <p>
-   * Execute as a delete query returning the number of rows deleted using the given transaction.
-   * <p>
-   * Note that if the query includes joins then the generated delete statement may not be
-   * optimal depending on the database platform.
-   *
-   * @return the number of beans/rows that were deleted.
-   */
-  @Deprecated(forRemoval = true, since = "14.1.0")
-  int delete(Transaction transaction);
-
-  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then update().
-   * <p>
-   * Execute the UpdateQuery returning the number of rows updated using the given transaction.
-   *
-   * @return the number of beans/rows updated.
-   */
-  @Deprecated(forRemoval = true, since = "14.1.0")
-  int update(Transaction transaction);
-
  /**
   * Execute the UpdateQuery returning the number of rows updated.
   *
@@ -440,30 +417,6 @@ public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {
   */
  Query<T> having(Expression addExpressionToHaving);

-  /**
-   * @deprecated migrate to {@link #orderBy()}.
-   */
-  @Deprecated(since = "13.19", forRemoval = true)
-  default Query<T> order(String orderByClause) {
-    return orderBy(orderByClause);
-  }
-
-  /**
-   * @deprecated migrate to {@link #orderBy()}.
-   */
-  @Deprecated(since = "13.19", forRemoval = true)
-  default OrderBy<T> order() {
-    return orderBy();
-  }
-
-  /**
-   * @deprecated migrate to {@link #setOrderBy(OrderBy)}.
-   */
-  @Deprecated(since = "13.19", forRemoval = true)
-  default Query<T> setOrder(OrderBy<T> orderBy) {
-    return setOrderBy(orderBy);
-  }
-
  /**
   * Return the OrderBy so that you can append an ascending or descending
   * property to the order by clause.
@@ -1,6 +1,6 @@
 package io.ebean;

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

 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -20,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.
@@ -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.
@@ -25,7 +25,7 @@ import java.util.Iterator;
 *
 *  Query<Customer> query = database.find(Customer.class)
 *     .where().gt("id", 0)
- *     .order("id")
+ *     .orderBy("id")
 *     .setMaxRows(2);
 *
 *  QueryIterator<Customer> it = query.findIterate();
@@ -111,7 +111,7 @@ package io.ebean;
 *     .fetch("order.customer", "name")
 *     .where().gt("order.id", 0)
 *     .having().gt("totalAmount", 20)
- *     .order().desc("totalAmount")
+ *     .orderBy().desc("totalAmount")
 *     .setMaxRows(10)
 *     .findList();
 *
@@ -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.io.Serializable;
@@ -40,7 +40,7 @@ import java.util.function.Predicate;
 *
 * }</pre>
 */
-@NonNullApi
+@NullMarked
 public interface SqlQuery extends Serializable, CancelableQuery {

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

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

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

+import io.ebean.plugin.Lookups;
+
 /**
 * Helper to find classes taking into account the context class loader.
 */
@@ -73,9 +75,8 @@ public class ClassLoadConfig {
   */
  public Object newInstance(String className) {
    try {
-      Class<?> cls = forName(className);
-      return cls.getDeclaredConstructor().newInstance();
-    } catch (Exception e) {
+      return Lookups.newDefaultInstance(forName(className));
+    } catch (Throwable e) {
      throw new IllegalArgumentException("Error constructing " + className, e);
    }
  }
@@ -0,0 +1,15 @@
+package io.ebean.config;
+
+import java.lang.invoke.MethodHandles.Lookup;
+
+/**
+ * Provides a Lookup instance for accessing entity/dto fields.
+ */
+public interface LookupProvider {
+
+  /**
+   * Return the Lookup.
+   */
+  Lookup provideLookup();
+
+}
@@ -1,5 +1,6 @@
 package io.ebean.event;

+import io.ebean.plugin.Lookups;

 /**
 * Helper to find classes taking into account the context class loader.
@@ -12,8 +13,8 @@ class ClassUtil {
  static Object newInstance(String className) {
    try {
      Class<?> cls = forName(className);
-      return cls.getDeclaredConstructor().newInstance();
-    } catch (Exception e) {
+      return Lookups.newDefaultInstance(cls);
+    } catch (Throwable e) {
      String msg = "Error constructing " + className;
      throw new IllegalArgumentException(msg, e);
    }
@@ -1,40 +0,0 @@
-package io.ebean.event;
-
-import jakarta.servlet.ServletContextEvent;
-
-/**
- * Deprecated for removal - no intention to replace. Create your own copy of this
- * ServletContextListener if needed for your application.
- * <p>
- * Listens for webserver server starting and stopping events.
- * <p>
- * This should be used when the deployment is into a servlet container where the webapp
- * can be shutdown or redeployed without the JVM stopping.
- * </p>
- * <p>
- * If deployment is into a container where the JVM is completely shutdown (like spring boot,
- * runnable war or when using a servlet container that only contains the single webapp and
- * the JVM is shutdown then this isn't required. Instead we can just rely on the JVM shutdown
- * hook that Ebean registers.
- * </p>
- */
-@Deprecated(forRemoval = true)
-public class ServletContextListener implements jakarta.servlet.ServletContextListener {
-
-  /**
-   * The servlet container is stopping.
-   */
-  @Override
-  public void contextDestroyed(ServletContextEvent event) {
-    ShutdownManager.shutdown();
-  }
-
-  /**
-   * Do nothing on startup.
-   */
-  @Override
-  public void contextInitialized(ServletContextEvent event) {
-
-  }
-
-}
@@ -0,0 +1,43 @@
+package io.ebean.plugin;
+
+import io.ebean.DB;
+import io.ebean.TxScope;
+
+/**
+ * Helper object to make AOP generated code simpler.
+ */
+public final class AOPTransactionScope {
+  private static boolean enabled = true;
+
+  /**
+   * Entering an enhanced transactional method.
+   */
+  public static void enter(TxScope txScope) {
+    if (enabled) {
+      server().scopedTransactionEnter(txScope);
+    }
+  }
+
+  /**
+   * Exiting an enhanced transactional method.
+   */
+  public static void exit(Object returnOrThrowable, int opCode) {
+    if (enabled) {
+      server().scopedTransactionExit(returnOrThrowable, opCode);
+    }
+  }
+
+  private static SpiServer server() {
+    return (SpiServer) DB.getDefault();
+  }
+
+  /**
+   * Defines if the @Transactional does what is supposed to do or is disabled
+   * (useful only unit testing)
+   *
+   * @param enabled if set to false, @Transactional will not create a transaction
+   */
+  public static void setEnabled(boolean enabled) {
+    AOPTransactionScope.enabled = enabled;
+  }
+}
@@ -0,0 +1,41 @@
+package io.ebean.plugin;
+
+import static java.util.stream.Collectors.toMap;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.invoke.MethodType;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+import io.ebean.config.LookupProvider;
+
+/**
+ * Provides Lookup instances using potentially module specific Lookups.
+ */
+public final class Lookups {
+
+  private static final Map<String, Lookup> LOOKUP_MAP =
+      ServiceLoader.load(LookupProvider.class).stream()
+          .collect(toMap(p -> p.type().getModule().getName(), p -> p.get().provideLookup()));
+
+  private static final Lookup DEFAULT_LOOKUP = MethodHandles.publicLookup();
+
+  private static final MethodType VOID = MethodType.methodType(void.class);
+
+  /**
+   * Return a Lookup ideally for the module associated with the given type.
+   */
+  public static Lookup getLookup(Class<?> type) {
+    return LOOKUP_MAP.getOrDefault(type.getModule().getName(), DEFAULT_LOOKUP);
+  }
+
+  /**
+   * Find the default constructor and return a new instance for the given type
+   * potentially using a module specific Lookup instance.
+   */
+  @SuppressWarnings("unchecked")
+  public static <T> T newDefaultInstance(Class<?> type) throws Throwable {
+    return (T) getLookup(type).findConstructor(type, VOID).invoke();
+  }
+}
@@ -1,6 +1,7 @@
 package io.ebean.plugin;

 import io.ebean.Database;
+import io.ebean.TxScope;
 import io.ebean.bean.BeanLoader;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.DatabaseBuilder;
@@ -63,4 +64,15 @@ public interface SpiServer extends Database {
   * Typically due to serialisation or multiple stateless updates.
   */
  void loadBean(EntityBeanIntercept ebi);
+
+  /**
+   * Start an enhanced transactional method.
+   */
+  void scopedTransactionEnter(TxScope txScope);
+
+  /**
+   * Handle the end of an enhanced Transactional method.
+   */
+  void scopedTransactionExit(Object returnOrThrowable, int opCode);
+
 }
@@ -15,7 +15,7 @@
 *     .fetch("billingAddress","line1, city")
 *     .fetch("billingAddress.country", "*")
 *     .fetch("contacts", "firstName,email")
- *     .order().desc("id")
+ *     .orderBy().desc("id")
 *     .findList();
 *
 * JsonContext json = DB.json();
@@ -1,13 +1,14 @@
 module io.ebean.api {

  uses io.ebean.config.AutoConfigure;
+  uses io.ebean.config.LookupProvider;
  uses io.ebean.datasource.DataSourceAlertFactory;
  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;
@@ -17,20 +18,19 @@ module io.ebean.api {
  requires static io.ebean.types;
  requires static com.fasterxml.jackson.core;
  requires static com.fasterxml.jackson.databind;
-  requires static jakarta.servlet;

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

    final int id;

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


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

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis-types</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>14.7.0</version>
+        <version>14.9.0</version>
      </dependency>

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

  <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.7.0</version>
+      <version>14.9.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.7.0</version>
+    <version>14.9.0</version>
  </parent>

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

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

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

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

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

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

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

  </build>
@@ -1,34 +1,25 @@
 package io.ebeaninternal.api;

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

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

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

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

  /**
@@ -38,6 +29,6 @@ public final class HelpScopeTrans {
   * @param enabled if set to false, @Transactional will not create a transaction
   */
  public static void setEnabled(boolean enabled) {
-    HelpScopeTrans.enabled = enabled;
+    AOPTransactionScope.setEnabled(enabled);
  }
 }
@@ -34,8 +34,8 @@ public final class ScopeTrans {
   * Explicit set of Exceptions that DO cause a rollback to occur.
   */
  private final ArrayList<Class<? extends Throwable>> rollbackFor;
-  private Boolean restoreBatch;
-  private Boolean restoreBatchOnCascade;
+  private boolean restoreBatch;
+  private boolean restoreBatchOnCascade;
  private int restoreBatchSize;
  private Boolean restoreBatchGeneratedKeys;
  private boolean restoreBatchFlushOnQuery;
@@ -61,7 +61,7 @@ public final class ScopeTrans {
    this.noRollbackFor = txScope.getNoRollbackFor();
    this.rollbackFor = txScope.getRollbackFor();
    if (transaction != null) {
-      if (!created && txScope.isBatchSet() || txScope.isBatchOnCascadeSet() || txScope.isBatchSizeSet()) {
+      if (!created) {
        restoreBatch = transaction.isBatchMode();
        restoreBatchOnCascade = transaction.isBatchOnCascade();
        restoreBatchSize = transaction.getBatchSize();
@@ -143,15 +143,9 @@ public final class ScopeTrans {
    } else {
      nestedCommit = true;
      transaction.setFlushOnQuery(restoreBatchFlushOnQuery);
-      if (restoreBatch != null) {
-        transaction.setBatchMode(restoreBatch);
-      }
-      if (restoreBatchOnCascade != null) {
-        transaction.setBatchOnCascade(restoreBatchOnCascade);
-      }
-      if (restoreBatchSize > 0) {
-        transaction.setBatchSize(restoreBatchSize);
-      }
+      transaction.setBatchMode(restoreBatch);
+      transaction.setBatchOnCascade(restoreBatchOnCascade);
+      transaction.setBatchSize(restoreBatchSize);
      if (restoreBatchGeneratedKeys != null) {
        transaction.setGetGeneratedKeys(restoreBatchGeneratedKeys);
      }
@@ -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;
@@ -216,16 +216,6 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  void slowQueryCheck(long executionTimeMicros, int rowCount, SpiQuery<?> query);

-  /**
-   * Start an enhanced transactional method.
-   */
-  void scopedTransactionEnter(TxScope txScope);
-
-  /**
-   * Handle the end of an enhanced Transactional method.
-   */
-  void scopedTransactionExit(Object returnOrThrowable, int opCode);
-
  /**
   * SqlQuery find single attribute.
   */
@@ -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).
@@ -53,4 +53,9 @@ public interface SpiSqlBinding extends SpiCancelableQuery {
   */
  int getBufferFetchSizeHint();

+  /**
+   * Set the JDBC fetchSize buffer hint if not explicitly set.
+   */
+  void setDefaultFetchBuffer(int fetchSize);
+
 }
@@ -92,6 +92,12 @@ public abstract class AbstractSqlQueryRequest implements CancelableQuery {

  protected abstract void requestComplete();

+  /**
+   * Set the JDBC buffer fetchSize hint if not set explicitly.
+   */
+  public void setDefaultFetchBuffer(int fetchSize) {
+    query.setDefaultFetchBuffer(fetchSize);
+  }
  /**
   * Close the underlying resources.
   */
@@ -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;
@@ -300,11 +300,12 @@ public final class InternalConfiguration {
  }

  DtoQueryEngine createDtoQueryEngine() {
-    return new DtoQueryEngine(binder);
+    return new DtoQueryEngine(binder, config.getJdbcFetchSizeFindEach(), config.getJdbcFetchSizeFindList());
  }

  RelationalQueryEngine createRelationalQueryEngine() {
-    return new DefaultRelationalQueryEngine(binder, config.getDatabaseBooleanTrue(), config.getPlatformConfig().getDbUuid().useBinaryOptimized());
+    return new DefaultRelationalQueryEngine(binder, config.getDatabaseBooleanTrue(), config.getPlatformConfig().getDbUuid().useBinaryOptimized(),
+      config.getJdbcFetchSizeFindEach(), config.getJdbcFetchSizeFindList());
  }

  OrmQueryEngine createOrmQueryEngine() {
@@ -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;
@@ -11,14 +11,15 @@ import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
+import io.ebean.plugin.Lookups;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.api.CoreLog;
-
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import java.lang.annotation.Annotation;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
@@ -94,9 +95,9 @@ public class BootupClasses implements Predicate<Class<?>> {
  public void runServerConfigStartup(DatabaseBuilder config) {
    for (Class<?> cls : serverConfigStartupCandidates) {
      try {
-        ServerConfigStartup newInstance = (ServerConfigStartup) cls.getDeclaredConstructor().newInstance();
+        ServerConfigStartup newInstance = Lookups.newDefaultInstance(cls);
        newInstance.onStart(config);
-      } catch (Exception e) {
+      } catch (Throwable e) {
        // assume that the desired behavior is to fail - add your own try catch if needed
        throw new IllegalStateException("Error running ServerConfigStartup " + cls, e);
      }
@@ -206,12 +207,12 @@ public class BootupClasses implements Predicate<Class<?>> {
   */
  private <T> T create(Class<T> cls, boolean logOnException) {
    try {
-      return cls.getConstructor().newInstance();
+      return Lookups.newDefaultInstance(cls);
    } catch (NoSuchMethodException e) {
      log.log(DEBUG, "Ignore/expected - no default constructor: {0}", e.getMessage());
      return null;

-    } catch (Exception e) {
+    } catch (Throwable e) {
      if (logOnException) {
        // not expected but we log and carry on
        log.log(ERROR, "Error creating " + cls, e);
@@ -23,6 +23,7 @@ import io.ebean.meta.QueryPlanInit;
 import io.ebean.plugin.BeanDocType;
 import io.ebean.plugin.BeanType;
 import io.ebean.plugin.ExpressionPath;
+import io.ebean.plugin.Lookups;
 import io.ebean.plugin.Property;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.*;
@@ -414,8 +415,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
      return null;
    }
    try {
-      return (EntityBean) beanType.getDeclaredConstructor().newInstance();
-    } catch (Exception e) {
+      return Lookups.newDefaultInstance(beanType);
+    } catch (Throwable e) {
      throw new IllegalStateException("Error trying to create the prototypeEntityBean for " + beanType, e);
    }
  }
@@ -3186,8 +3187,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   * provides unique ordering of the rows (so that the paging is predicable).
   */
  public void appendOrderById(SpiQuery<T> query) {
-    if (idProperty != null && !idProperty.isEmbedded() && !query.order().containsProperty(idProperty.name())) {
-      query.order().asc(idProperty.name());
+    if (idProperty != null && !idProperty.isEmbedded() && !query.orderBy().containsProperty(idProperty.name())) {
+      query.orderBy().asc(idProperty.name());
    }
  }

@@ -3,6 +3,7 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.PersistenceIOException;
 import io.ebean.SqlUpdate;
 import io.ebean.bean.EntityBean;
+import io.ebean.plugin.Lookups;
 import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
@@ -22,8 +23,8 @@ class BeanDescriptorElementEmbedded<T> extends BeanDescriptorElement<T> {
  BeanDescriptorElementEmbedded(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
    super(owner, deploy, elementHelp);
    try {
-      this.prototype = (EntityBean) beanType.getDeclaredConstructor().newInstance();
-    } catch (Exception e) {
+      this.prototype = Lookups.newDefaultInstance(beanType);
+    } catch (Throwable e) {
      throw new IllegalStateException("Unable to create entity bean prototype for "+beanType);
    }
    BeanPropertyAssocOne<?>[] embedded = propertiesEmbedded();
@@ -427,7 +427,9 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    BeanProperty[] others = target.propertiesBaseScalar();
    if (descriptor.isRawSqlBased()) {
      String dbColumn = owner.dbColumn();
-      return new ImportedIdSimple(owner, dbColumn, null, idProp, 0);
+      if (dbColumn != null) {
+        return new ImportedIdSimple(owner, dbColumn, null, idProp, 0);
+      }
    }
    if (idProp == null) {
      return null;
@@ -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;
@@ -10,6 +10,7 @@ import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.event.*;
 import io.ebean.event.changelog.ChangeLogFilter;
+import io.ebean.plugin.Lookups;
 import io.ebean.text.PathProperties;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.ConcurrencyMode;
@@ -24,7 +25,7 @@ import io.ebeaninternal.server.rawsql.SpiRawSql;
 import jakarta.persistence.Entity;
 import jakarta.persistence.MappedSuperclass;

-import java.lang.reflect.Field;
+import java.lang.invoke.MethodHandles.Lookup;
 import java.util.*;

 /**
@@ -48,6 +49,7 @@ public class DeployBeanDescriptor<T> {

  private final DatabaseBuilder.Settings config;
  private final BeanDescriptorManager manager;
+
  /**
   * Map of BeanProperty Linked so as to preserve order.
   */
@@ -144,8 +146,8 @@ public class DeployBeanDescriptor<T> {

  private String[] readPropertyNames() {
    try {
-      Field field = beanType.getField("_ebean_props");
-      return (String[]) field.get(null);
+      final Lookup lookup = Lookups.getLookup(beanType);
+      return (String[]) lookup.findStaticVarHandle(beanType, "_ebean_props", String[].class).get();
    } catch (Exception e) {
      throw new IllegalStateException("Error getting _ebean_props field on type " + beanType, e);
    }
@@ -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,20 +1,19 @@
 package io.ebeaninternal.server.dto;

-import io.ebean.core.type.DataReader;
-import io.ebean.core.type.ScalarType;
-import io.ebeaninternal.server.type.TypeManager;
-
 import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Constructor;
 import java.sql.SQLException;

+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarType;
+import io.ebean.plugin.Lookups;
+import io.ebeaninternal.server.type.TypeManager;
+
 final class DtoMetaConstructor {

  private final Class<?>[] types;
  private final MethodHandle handle;
-  private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
  private final ScalarType<?>[] scalarTypes;

  DtoMetaConstructor(TypeManager typeManager, Constructor<?> constructor, Class<?> someClass) throws NoSuchMethodException, IllegalAccessException {
@@ -23,7 +22,7 @@ final class DtoMetaConstructor {
    for (int i = 0; i < types.length; i++) {
      scalarTypes[i] = typeManager.type(types[i]);
    }
-    this.handle = LOOKUP.findConstructor(someClass, typeFor(types));
+    this.handle = Lookups.getLookup(someClass).findConstructor(someClass, typeFor(types));
  }

  private MethodType typeFor(Class<?>[] types) {
@@ -1,19 +1,17 @@
 package io.ebeaninternal.server.dto;

-import io.ebean.core.type.DataReader;
-import io.ebean.core.type.ScalarType;
-import io.ebeaninternal.server.type.TypeManager;
-
 import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.sql.SQLException;

-final class DtoMetaProperty implements DtoReadSet {
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarType;
+import io.ebean.plugin.Lookups;
+import io.ebeaninternal.server.type.TypeManager;

-  private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+final class DtoMetaProperty implements DtoReadSet {

  private final Class<?> dtoType;
  private final String name;
@@ -33,7 +31,7 @@ final class DtoMetaProperty implements DtoReadSet {
  }

  private static MethodHandle lookupMethodHandle(Class<?> dtoType, Method method) throws NoSuchMethodException, IllegalAccessException {
-    return LOOKUP.findVirtual(dtoType, method.getName(), MethodType.methodType(method.getReturnType(), method.getParameterTypes()));
+    return Lookups.getLookup(dtoType).findVirtual(dtoType, method.getName(), MethodType.methodType(method.getReturnType(), method.getParameterTypes()));
  }

  static Type propertyType(Method method) {
@@ -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 ";
@@ -332,21 +332,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
    return query.delete();
  }

-  @Override
-  public int delete(Transaction transaction) {
-    return query.delete(transaction);
-  }
-
  @Override
  public int update() {
    return query.update();
  }

-  @Override
-  public int update(Transaction transaction) {
-    return query.update(transaction);
-  }
-
  @Override
  public FutureIds<T> findFutureIds() {
    return query.findFutureIds();
@@ -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";
@@ -172,7 +172,7 @@ public final class FilterExpressionList<T> extends DefaultExpressionList<T> {
      query.setMaxRows(maxRows);
    }
    if (orderByClause != null) {
-      query.order(orderByClause);
+      query.orderBy(orderByClause);
    }
  }

@@ -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;
@@ -337,21 +337,11 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
    return exprList.delete();
  }

-  @Override
-  public int delete(Transaction transaction) {
-    return exprList.delete(transaction);
-  }
-
  @Override
  public int update() {
    return exprList.update();
  }

-  @Override
-  public int update(Transaction transaction) {
-    return exprList.update(transaction);
-  }
-
  @Override
  public Query<T> asOf(Timestamp asOf) {
    return exprList.asOf(asOf);
@@ -152,7 +152,7 @@ class EqlAdapter<T> extends EqlWhereListener<T> {
      }
    }

-    query.order().add(new OrderBy.Property(path, asc, nulls, nullsFirstLast));
+    query.orderBy().add(new OrderBy.Property(path, asc, nulls, nullsFirstLast));
  }

  @Override
@@ -233,17 +233,19 @@ final class CQueryBuilder {
  <T> CQueryRowCount buildRowCountQuery(OrmQueryRequest<T> request) {
    SpiQuery<T> query = request.query();
    // always set the order by to null for row count query
-    query.setOrder(null);
+    query.setOrderBy(null);
    query.setFirstRow(0);
    query.setMaxRows(0);

    boolean countDistinct = query.isDistinct();
+    boolean useColumnAlias = selectCountWithColumnAlias;
    boolean withAgg = false;
    if (!countDistinct) {
      withAgg = includesAggregation(request, query);
-      if (!withAgg) {
+      if (!withAgg && request.descriptor().hasId()) {
        // minimise select clause for standard count
        query.setSelectId();
+        useColumnAlias = false;
      }
    }

@@ -256,7 +258,7 @@ final class CQueryBuilder {
    }

    predicates.prepare(true);
-    SqlTree sqlTree = createSqlTree(request, predicates, selectCountWithColumnAlias && withAgg);
+    SqlTree sqlTree = createSqlTree(request, predicates, useColumnAlias);
    if (SpiQuery.TemporalMode.CURRENT == query.temporalMode()) {
      sqlTree.addSoftDeletePredicate(query);
    }
@@ -240,7 +240,7 @@ public final class CQueryEngine {
    }

    // order by lower sys period desc
-    query.order().desc(sysPeriodLower);
+    query.orderBy().desc(sysPeriodLower);
    CQuery<T> cquery = queryBuilder.buildQuery(request);
    request.setCancelableQuery(cquery);
    try {
@@ -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();
@@ -295,9 +295,8 @@ final class DefaultDbSqlContext implements DbSqlContext {
    if (useColumnAlias) {
      sb.append(' ');
      sb.append(columnAliasPrefix);
-      sb.append(columnIndex);
+      sb.append(columnIndex++);
    }
-    columnIndex++;
  }

  @Override
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.query;

-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.service.SpiFetchGroupQuery;
 import io.ebeaninternal.api.SpiQueryFetch;
@@ -23,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();
@@ -340,21 +340,11 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Override
-  public int delete(Transaction transaction) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
  @Override
  public int update() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Override
-  public int update(Transaction transaction) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
  @Override
  public int findCount() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
@@ -29,12 +29,17 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  private final String dbTrueValue;
  private final boolean binaryOptimizedUUID;
  private final TimedMetricMap timedMetricMap;
+  private final int defaultFetchSizeFindEach;
+  private final int defaultFetchSizeFindList;

-  public DefaultRelationalQueryEngine(Binder binder, String dbTrueValue, boolean binaryOptimizedUUID) {
+  public DefaultRelationalQueryEngine(Binder binder, String dbTrueValue, boolean binaryOptimizedUUID,
+                                      int defaultFetchSizeFindEach, int defaultFetchSizeFindList) {
    this.binder = binder;
    this.dbTrueValue = dbTrueValue == null ? "true" : dbTrueValue;
    this.binaryOptimizedUUID = binaryOptimizedUUID;
    this.timedMetricMap = MetricFactory.get().createTimedMetricMap("sql.query.");
+    this.defaultFetchSizeFindEach = defaultFetchSizeFindEach;
+    this.defaultFetchSizeFindList = defaultFetchSizeFindList;
  }

  @Override
@@ -59,6 +64,9 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  @Override
  public void findEach(RelationalQueryRequest request, RowConsumer consumer) {
    try {
+      if (defaultFetchSizeFindEach > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+      }
      request.executeSql(binder, SpiQuery.Type.ITERATE);
      request.mapEach(consumer);
      request.logSummary();
@@ -74,6 +82,9 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  @Override
  public <T> void findEach(RelationalQueryRequest request, RowReader<T> reader, Predicate<T> consumer) {
    try {
+      if (defaultFetchSizeFindEach > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+      }
      request.executeSql(binder, SpiQuery.Type.ITERATE);
      while (request.next()) {
        if (!consumer.test(reader.read())) {
@@ -109,6 +120,9 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  @Override
  public <T> List<T> findList(RelationalQueryRequest request, RowReader<T> reader) {
    try {
+      if (defaultFetchSizeFindList > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindList);
+      }
      request.executeSql(binder, SpiQuery.Type.LIST);
      List<T> rows = new ArrayList<>();
      while (request.next()) {
@@ -129,6 +143,9 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  public <T> T findSingleAttribute(RelationalQueryRequest request, Class<T> cls) {
    ScalarType<T> scalarType = (ScalarType<T>) binder.getScalarType(cls);
    try {
+      if (defaultFetchSizeFindList > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindList);
+      }
      request.executeSql(binder, SpiQuery.Type.ATTRIBUTE);
      final DataReader dataReader = binder.createDataReader(request.resultSet());
      T value = null;
@@ -151,6 +168,9 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  public <T> List<T> findSingleAttributeList(RelationalQueryRequest request, Class<T> cls) {
    ScalarType<T> scalarType = (ScalarType<T>) binder.getScalarType(cls);
    try {
+      if (defaultFetchSizeFindList > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindList);
+      }
      request.executeSql(binder, SpiQuery.Type.ATTRIBUTE);
      final DataReader dataReader = binder.createDataReader(request.resultSet());
      List<T> rows = new ArrayList<>();
@@ -173,6 +193,9 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  public <T> void findSingleAttributeEach(RelationalQueryRequest request, Class<T> cls, Consumer<T> consumer) {
    ScalarType<T> scalarType = (ScalarType<T>) binder.getScalarType(cls);
    try {
+      if (defaultFetchSizeFindEach > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+      }
      request.executeSql(binder, SpiQuery.Type.ATTRIBUTE);
      final DataReader dataReader = binder.createDataReader(request.resultSet());
      while (dataReader.next()) {
@@ -4,8 +4,8 @@ import io.ebean.QueryIterator;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.DtoQueryRequest;
 import io.ebeaninternal.server.persist.Binder;
-
 import jakarta.persistence.PersistenceException;
+
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
@@ -15,13 +15,20 @@ import java.util.function.Predicate;
 public final class DtoQueryEngine {

  private final Binder binder;
+  private final int defaultFetchSizeFindEach;
+  private final int defaultFetchSizeFindList;

-  public DtoQueryEngine(Binder binder) {
+  public DtoQueryEngine(Binder binder, int defaultFetchSizeFindEach, int defaultFetchSizeFindList) {
    this.binder = binder;
+    this.defaultFetchSizeFindEach = defaultFetchSizeFindEach;
+    this.defaultFetchSizeFindList = defaultFetchSizeFindList;
  }

  public <T> List<T> findList(DtoQueryRequest<T> request) {
    try {
+      if (defaultFetchSizeFindList > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindList);
+      }
      request.executeSql(binder, SpiQuery.Type.LIST);
      List<T> rows = new ArrayList<>();
      while (request.next()) {
@@ -38,6 +45,9 @@ public final class DtoQueryEngine {

  public <T> QueryIterator<T> findIterate(DtoQueryRequest<T> request) {
    try {
+      if (defaultFetchSizeFindEach > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+      }
      request.executeSql(binder, SpiQuery.Type.ITERATE);
      return new DtoQueryIterator<>(request);
    } catch (SQLException e) {
@@ -46,7 +56,10 @@ public final class DtoQueryEngine {
  }

  public <T> void findEach(DtoQueryRequest<T> request, Consumer<T> consumer) {
-     try {
+    try {
+      if (defaultFetchSizeFindEach > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+      }
      request.executeSql(binder, SpiQuery.Type.ITERATE);
      while (request.next()) {
        consumer.accept(request.readNextBean());
@@ -61,6 +74,9 @@ public final class DtoQueryEngine {
  public <T> void findEach(DtoQueryRequest<T> request, int batchSize, Consumer<List<T>> consumer) {
    try {
      List<T> buffer = new ArrayList<>();
+      if (defaultFetchSizeFindEach > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+      }
      request.executeSql(binder, SpiQuery.Type.ITERATE);
      while (request.next()) {
        buffer.add(request.readNextBean());
@@ -82,6 +98,9 @@ public final class DtoQueryEngine {

  public <T> void findEachWhile(DtoQueryRequest<T> request, Predicate<T> consumer) {
    try {
+      if (defaultFetchSizeFindEach > 0) {
+        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+      }
      request.executeSql(binder, SpiQuery.Type.ITERATE);
      while (request.next()) {
        if (!consumer.test(request.readNextBean())) {
@@ -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.*;

@@ -46,7 +47,7 @@ public final class SqlTreeBuilder {
  private final boolean disableLazyLoad;
  private final boolean readOnly;
  private final SpiQuery.TemporalMode temporalMode;
-  private SqlTreeNode rootNode;
+  private final SqlTreeNode rootNode;
  private boolean sqlDistinct;
  private final boolean platformDistinctNoLobs;
  private final SqlTreeCommon common;
@@ -72,6 +73,7 @@ public final class SqlTreeBuilder {
    this.alias = null;
    this.ctx = null;
    this.common = new SqlTreeCommon(temporalMode, disableLazyLoad, readOnly, null);
+    this.rootNode = buildRootNode(desc);
  }

  /**
@@ -99,12 +101,13 @@ public final class SqlTreeBuilder {
    this.alias = new SqlTreeAlias(request.baseTableAlias(), temporalMode);
    this.distinctOnPlatform = builder.isPlatformDistinctOn();
    this.platformDistinctNoLobs = builder.isPlatformDistinctNoLobs();
+    this.common = new SqlTreeCommon(temporalMode, disableLazyLoad, readOnly, includeJoin);
+    this.rootNode = buildRootNode(desc);
    String fromForUpdate = builder.fromForUpdate(query);
    CQueryHistorySupport historySupport = builder.historySupport(query);
    CQueryDraftSupport draftSupport = builder.draftSupport(query);
-    String colAlias = subQuery ? null : columnAliasPrefix;
+    String colAlias = subQuery || rootNode.isSingleProperty() ? null : columnAliasPrefix;
    this.ctx = new DefaultDbSqlContext(alias, colAlias, historySupport, draftSupport, fromForUpdate);
-    this.common = new SqlTreeCommon(temporalMode, disableLazyLoad, readOnly, includeJoin);
  }

  /**
@@ -112,7 +115,6 @@ public final class SqlTreeBuilder {
   */
  public SqlTree build() {
    // build the appropriate chain of SelectAdapter's
-    buildRoot(desc);
    // build the actual String
    String distinctOn = null;
    String selectSql = null;
@@ -213,8 +215,8 @@ public final class SqlTreeBuilder {
    return ctx.content();
  }

-  private void buildRoot(STreeType desc) {
-    rootNode = buildSelectChain(null, null, desc, null);
+  private SqlTreeNode buildRootNode(STreeType desc) {
+    SqlTreeNode root = buildSelectChain(null, null, desc, null);
    if (!rawSql) {
      alias.addJoin(queryDetail.getFetchPaths(), desc);
      alias.addJoin(predicates.predicateIncludes(), desc);
@@ -223,6 +225,7 @@ public final class SqlTreeBuilder {
      alias.buildAlias();
      predicates.parseTableAlias(alias);
    }
+    return root;
  }

  /**
@@ -440,12 +443,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;
@@ -335,6 +335,13 @@ public final class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQue
    return bindParams;
  }

+  @Override
+  public void setDefaultFetchBuffer(int fetchSize) {
+    if (bufferFetchSizeHint == 0) {
+      bufferFetchSizeHint = fetchSize;
+    }
+  }
+
  @Override
  public DtoQuery<T> setBufferFetchSizeHint(int bufferFetchSizeHint) {
    this.bufferFetchSizeHint = bufferFetchSizeHint;
@@ -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";
@@ -1481,21 +1481,11 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    return server.delete(this);
  }

-  @Override
-  public final int delete(Transaction transaction) {
-    return server.delete(this);
-  }
-
  @Override
  public final int update() {
    return server.update(this);
  }

-  @Override
-  public final int update(Transaction transaction) {
-    return server.update(this);
-  }
-
  @Override
  public final <A> List<A> findIds() {
    // a copy of this query is made in the 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.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -19,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;
@@ -206,6 +206,13 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
    return bindParams;
  }

+  @Override
+  public final void setDefaultFetchBuffer(int fetchSize) {
+    if (bufferFetchSizeHint == 0) {
+      bufferFetchSizeHint = fetchSize;
+    }
+  }
+
  @Override
  public DefaultRelationalQuery setBufferFetchSizeHint(int bufferFetchSizeHint) {
    this.bufferFetchSizeHint = bufferFetchSizeHint;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	578a041c9e	Version 14.9.0	2025-02-12 19:56:14 +13:00
Rob Bygrave	b0b2a0d320	Bump ebean-agent to 14.9.0 with module path support for @Transactional	2025-02-12 19:36:48 +13:00
Josiah NoelandRob Bygrave	de81dfc067	Feature: Add a `MethodHandles.Lookup` SPI (#3535 ) * ServiceLoad lookups * remove more reflection * address comments * Update DefaultTypeManager.java * Javadoc and format changes --------- Co-authored-by: Rob Bygrave <robin.bygrave@gmail.com>	2025-02-12 19:30:05 +13:00
Rob Bygrave	2bd53cb52b	Merge pull request #3560 from ebean-orm/feature/3533-aop-transactional #3533 Support @Transactional on module path	2025-02-12 18:53:57 +13:00
Rob Bygrave	a6d792de64	Merge pull request #3563 from ebean-orm/feature/remove-deprecated-queryOrder Remove deprecated order() migrate to orderBy()	2025-02-12 18:52:53 +13:00
Rob Bygrave	c73d83ef33	Merge pull request #3562 from ebean-orm/feature/remove-deprecated-queryUpdTxn Remove deprecated query.update(txn) & query.delete(txn)	2025-02-12 18:52:18 +13:00
Rob Bygrave	9f1b4ba758	Remove deprecated order() migrate to orderBy()	2025-02-12 18:47:16 +13:00
Rob Bygrave	1f7117da25	Merge pull request #3561 from ebean-orm/feature/remove-deprecated-servletContextListener Remove deprecated ServletContextListener	2025-02-12 18:43:55 +13:00
Rob Bygrave	f0ceab43bf	Remove deprecated query.update(txn) & query.delete(txn) Migrate to query.usingTransaction(txn)	2025-02-12 18:42:23 +13:00
Rob Bygrave	1107e4ea4c	Remove deprecated ServletContextListener	2025-02-12 18:38:17 +13:00
Rob Bygrave	4dd8a5dfea	Merge pull request #3558 from ebean-orm/feature/3557-filterMany-removal #3557 [Query beans] Remove deprecated filterMany(String expressions, Object... params) from generated query beans	2025-02-12 18:01:39 +13:00
Rob Bygrave	195edf0355	Merge pull request #3514 from ebean-orm/feature/querybean-txn-ctor Remove deprecated QueryBean constructor that takes transaction, migrate to query.usingTransaction()	2025-02-12 18:01:03 +13:00
Rob Bygrave	e9c438adab	Merge branch 'master' into feature/querybean-txn-ctor	2025-02-12 15:05:57 +13:00
Rob Bygrave	e45cf5fab9	#3533 Bump ebean-agent to use the new AOPTransactionScope	2025-02-12 00:27:07 +13:00
Rob Bygrave	1bf9d1dd4f	Merge pull request #3559 from ebean-orm/feature/findCount-noId FindCount on entity bean without @Id + platform wants column alias	2025-02-12 00:01:24 +13:00
Rob Bygrave	657920c4a2	#3533 Support @Transactional on module path As HelpScopeTrans isn't in an exported package it's use fails with an error in module path. This adds AOPTransactionScope in the exported package io.ebean.plugin and moves the required methods from SpiEbeanServer to SpiServer to support this move. This also requires an associate change in ebean-agent to support this feature which will be in ebean-agent 14.9.0.	2025-02-11 23:57:18 +13:00
Rob Bygrave	6c47107436	FindCount on entity bean without @Id + platform wants column alias Internally in CQueryBuilder only use query.setSelectId(); for findCount when the entity bean has a @Id property [which it doesn't strictly need and likely won't have for view based entities]	2025-02-11 23:04:02 +13:00
Rob Bygrave	88cf4e001a	#3557 [Query beans] Remove deprecated filterMany(String expressions, Object... params) from generated query beans, migrate to filterManyRaw()	2025-02-11 22:06:20 +13:00
Rob Bygrave	7f1fcbcf92	Merge pull request #3556 from ebean-orm/feature/test-containers-bump Bump ebean-test-containers to 7.5	2025-02-10 21:55:18 +13:00
Rob Bygrave	95d5d5e467	Bump ebean-test-containers to 7.5	2025-02-10 21:54:54 +13:00
Rob Bygrave	2dde23d577	Merge pull request #3555 from ebean-orm/feature/3503-kotlin-querybean-gen-DbMap #3503 - Fix kotlin-querybean-generator for use of @DbMap	2025-02-10 14:01:09 +13:00
Rob Bygrave	1ec26d13f9	#3503 - Fix kotlin-querybean-generator for use of @DbMap	2025-02-10 11:35:44 +13:00
Rob Bygrave	bb1b55e897	Reduce frequency of running yugabyte CI test	2025-02-09 22:45:10 +13:00
Rob Bygrave	fb07447df4	Fix test only - test-kotlin bump kotlin-querybean-generator version	2025-02-09 22:43:02 +13:00
Rob Bygrave	ad18b6573c	Version 14.8.2	2025-02-09 22:07:28 +13:00
Rob Bygrave	11632c3a6e	Merge pull request #3554 from ebean-orm/feature/3536-kotlin-querybean-generator #3536 kotlin-querybean-generator update for filterMany() changes	2025-02-09 21:37:38 +13:00
Rob Bygrave	b066f9c072	#3536 kotlin-querybean-generator update for filterMany() changes Brings the kotlin-querybean-generator up to date with the [java] querybean-generator in terms of how it has specific "associated beans" for ToOne and ToMany type relationships	2025-02-09 21:24:51 +13:00
Rob Bygrave	1e38ed9efc	Test only, add Embedded bean as an inner class for querybean-generation	2025-02-09 21:19:39 +13:00
Roland Praml	2d48dd2fef	Pass create/configOptions to DB2 test container (#3550 ) This allows to pass collation/pagesize settings via the `ebean.test.createOptions=` property to the container	2025-02-08 19:47:20 +13:00
Rob Bygrave	60aa899a34	#3552 Column alias required for SQL Server + findCount + distinct (#3553 ) * #3552 Column alias required for SQL Server + findCount + distinct - Modifies CQueryBuilder with the main fix which is to use the database platform selectCountWithColumnAlias for all distinct queries [and later disable it for single column case] - Modifies SqlTreeBuilder because we need to NOT use the column alias for the count distinct SINGLE COLUMN case. So change here to: - build the root SqlTreeNode first as part of constructor - use rootNode.isSingleProperty() to NOT use column alias for the single column case - Hence need to initialise DefaultDbSqlContext AFTER the root SqlTreeNode - Modifies DefaultDbSqlContext with no effective change, just columnIndex++ ONLY when we are actually using column alias - Modifies H2Platform to also use selectCountWithColumnAlias true * #3552 selectCountWithColumnAlias true for MariaDB and MySql Plus fix TestRowCount for Oracle platform	2025-02-08 19:33:03 +13:00
Rob Bygrave	c38c75fdec	Merge pull request #3549 from ebean-orm/feature/3546 #3546 Reduce compiler warning on query bean generated code	2025-01-28 23:34:23 +13:00
Rob Bygrave	cf275f4edd	#3546 Reduce compiler warning on query bean generated code This method is effectively internal and called by generated code that also is Deprecated(forRemoval = true)	2025-01-28 23:31:23 +13:00
Rob Bygrave	121f4afed8	#3545 Support @SQL entity with a OneToOne with EmbeddedId - @Sql entity - Has a OneToOne or ManyToOne to a bean that uses @EmbeddedId	2025-01-28 23:26:09 +13:00
Rob Bygrave	c8621c3a29	Put back the querybean-generator version	2025-01-16 21:42:02 +13:00
Rob Bygrave	f83da15d5e	Merge pull request #3542 from ebean-orm/feature/3542-quarkus [querybean-generator] FilerException trying to write EntityClassRegister with Quarkus dev mode / hot reload #3541	2025-01-16 16:46:46 +13:00
Rob Bygrave	52729d9802	Missing import and adjust warning message	2025-01-16 16:40:43 +13:00
Rob Bygrave	69c25309da	[querybean-generator] FilerException trying to write EntityClassRegister with Quarkus dev mode / hot reload #3541 Drop to log at WARN level when we catch FilerException such that Quarkus dev mode / hot reload works	2025-01-16 16:31:52 +13:00
Rob Bygrave	723a12fd66	#3538 Restoring batchMode etc with nested transaction scopes This change is a simplification such that these batch attributes are always stored and restored for nested ScopeTrans. There are no expensive side effects of doing it this way. This fixes issues where the batch attributes are changed after the ScopeTrans is created (like the test for this PR).	2025-01-16 08:15:22 +13:00
Noemi Praml	5cf74f1ee9	Add: failing Unittest	2025-01-08 14:43:49 +01:00
Rob Bygrave	2c18b4fe97	Version 14.8.1	2024-12-20 15:34:07 +13:00
Rob Bygrave	9c9fb70999	Bump ebean agent to align	2024-12-20 15:24:08 +13:00
Rob Bygrave	18e6374a60	Merge pull request #3532 from ebean-orm/feature/sql-play-ebean #3408 play-ebean inline sql comment in test generated scripts	2024-12-20 14:59:54 +13:00
Rob Bygrave	3fea5ce93d	#3408 play-ebean inline sql comment in test generated scripts	2024-12-20 14:58:10 +13:00
Rob Bygrave	43675468ae	Merge pull request #3523 from FOCONIS/streaming-tests set defaultFetchBuffer in findEach/findList in SQL and DTO Queries	2024-12-19 11:04:01 +13:00
Rob Bygrave	1c038f4629	Merge pull request #3408 from mkurz/meta_datastored-procedures-DDL Add metadata to stored procedures for 3rd party libs	2024-12-19 10:47:14 +13:00
Rob Bygrave	49b6f3dec9	Merge pull request #3530 from SentryMan/fix/dto-lookup FIX: IllegalAccessError on modular DTO queries	2024-12-19 09:07:45 +13:00
Josiah Noel	346e30217a	Merge remote-tracking branch 'upstream/master' into fix/dto-lookup	2024-12-18 14:56:15 -05:00
Rob Bygrave	5dc165debf	Fix test TestLazyJoin2	2024-12-19 08:42:37 +13:00
Josiah Noel	d5cb7c3ff1	fix illegal access error on modular dtos When using a dto query on a JPMS application, I get an IllegalAccessError even though I export and open my package.	2024-12-18 00:20:08 -05:00
Roland Praml	4d08dce033	set defaultFetchBuffer in findEach/findList in relational/orm Queries	2024-11-27 17:05:15 +01:00
Roland Praml	beef4407e3	Add failing testcase	2024-11-27 17:02:15 +01:00
Matthias Kurz	e99f922de6	Add metadata to stored procedures for 3rd party libs This way a third party can parse the meta data and knows how to handle the bodies of a stored procedure	2024-11-26 23:36:30 +01:00
Rob Bygrave	103e8323f2	Merge pull request #3519 from FOCONIS/no-codechange-test-cleanup No productive code change: cleanup basic test data	2024-11-07 21:32:35 +13:00
Noemi Praml	59ed0bb015	fix delete contacts	2024-11-05 14:04:32 +01:00
Noemi Praml	c0eb896e1f	No productive code change: cleanup basic test data (#114 ) * Erste Tests bereinigt * fix * noch mehr Tests bereinigt * modify output * reformat	2024-11-05 13:16:47 +01:00
Rob Bygrave	ddb4b9d3e5	Remove deprecated QueryBean constructor that takes transaction, migrate to query.usingTransaction() Remove the constructor for QueryBean that takes transaction. Migrate code to use query.usingTransaction() instead.	2024-10-31 18:22:43 +13:00
Rob Bygrave	7035b4c74c	tests only: Update versions in test / test-kotlin maven plugin and apt	2024-10-31 18:19:36 +13:00
Rob Bygrave	85a575e353	Merge pull request #3513 from ebean-orm/feature/bump-parent-javadoc Bump java11-oss parent and tidy javadoc	2024-10-31 17:14:52 +13:00
robin.bygrave	eb05be286c	Bump java11-oss parent and tidy javadoc	2024-10-31 14:55:43 +13:00
Rob Bygrave	9f5a77fdaa	Merge pull request #3509 from FOCONIS/javadoc-fixes RFC: Fix some javadoc issues	2024-10-31 14:47:46 +13:00
Roland Praml	42ee75f212	RFC: Fix some javadoc issues	2024-10-25 08:46:34 +02:00
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