Fix for #3338 Potential shutdown hang with SpringContextShutdownHook and ebean ShutdownHook

2024-04-21 10:51:47 +00:00 · 2024-02-26 08:30:27 +13:00
113 changed files with 335 additions and 1530 deletions
@@ -1,10 +1,7 @@

 name: Build

-on:
-  pull_request:
-  push:
-    branches: master
+on: [push, pull_request]

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

@@ -14,7 +14,7 @@

  <properties>
    <postgis.jdbc.version>2.5.1</postgis.jdbc.version>
-    <postgres.jdbc.version>42.7.2</postgres.jdbc.version>
+    <postgres.jdbc.version>42.6.0</postgres.jdbc.version>
  </properties>

  <dependencies>
@@ -22,13 +22,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-postgis-types</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

@@ -17,31 +17,31 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-joda-time</artifactId>
-      <version>14.0.0</version>
+      <version>13.24.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>14.0.0</version>
+      <version>13.24.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

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

  <name>ebean api</name>
@@ -39,7 +39,7 @@
    <dependency>
      <groupId>io.avaje</groupId>
      <artifactId>avaje-config</artifactId>
-      <version>3.12</version>
+      <version>3.10</version>
    </dependency>

    <dependency>
@@ -3,7 +3,7 @@ package io.ebean;
 import jakarta.persistence.PersistenceException;

 /**
- * Thrown when a foreign key constraint is enforced or a field is too large.
+ * Thrown when a foreign key constraint is enforced.
 */
 public class DataIntegrityException extends PersistenceException {
  private static final long serialVersionUID = -6740171949170180970L;
@@ -14,11 +14,4 @@ public class DataIntegrityException extends PersistenceException {
  public DataIntegrityException(String message, Throwable cause) {
    super(message, cause);
  }
-
-  /**
-   * Create with message only.
-   */
-  public DataIntegrityException(String message) {
-    super(message);
-  }
 }
@@ -88,16 +88,16 @@ public interface Database {

  /**
   * Return a new database builder.
-   * <pre>{@code
-   *
-   *   // build the 'default' database using configuration
-   *   // from application.properties / application.yaml
-   *
-   *   Database db = Database.builder()
-   *     .loadFromProperties()
-   *     .build();
-   *
-   * }</pre>
+    * <pre>{@code
+ *
+ *   // build the 'default' database using configuration
+ *   // from application.properties / application.yaml
+ *
+ *   Database db = Database.builder()
+ *     .loadFromProperties()
+ *     .build();
+ *
+ * }</pre>
   */
  static DatabaseBuilder builder() {
    return new DatabaseConfig();
@@ -85,7 +85,6 @@ public interface DatabaseBuilder {
    }
    return this;
  }
-
  /**
   * Set the name of the Database.
   */
@@ -2178,11 +2177,6 @@ public interface DatabaseBuilder {
  @Deprecated
  DatabaseBuilder setMetricNaming(Function<String, String> metricNaming);

-  /**
-   * Sets the length check mode.
-   */
-  DatabaseConfig lengthCheck(LengthCheck lengthCheck);
-
  /**
   * Provides read access (getters) for the DatabaseBuilder configuration
   * that has been set.
@@ -3045,9 +3039,5 @@ public interface DatabaseBuilder {
     */
    Function<String, String> getMetricNaming();

-    /**
-     * Returns the length check mode.
-     */
-    LengthCheck getLengthCheck();
  }
 }
@@ -412,42 +412,6 @@ public interface ExpressionList<T> {
   */
  Optional<T> findOneOrEmpty();

-  /**
-   * Execute find row count query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   * </p>
-   *
-   * @return a Future object for the row count query
-   */
-  FutureRowCount<T> findFutureCount();
-
-  /**
-   * Execute find Id's query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   * </p>
-   *
-   * @return a Future object for the list of Id's
-   */
-  FutureIds<T> findFutureIds();
-
-  /**
-   * Execute find list query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   * </p>
-   *
-   * @return a Future object for the list result of the query
-   */
-  FutureList<T> findFutureList();
-
  /**
   * Return a PagedList for this query using firstRow and maxRows.
   * <p>
@@ -1,20 +0,0 @@
-package io.ebean;
-
-import java.util.List;
-import java.util.concurrent.Future;
-
-/**
- * FutureIds represents the result of a background query execution for the Id's.
- * <p>
- * It extends the java.util.concurrent.Future with the ability to get the Id's
- * while the query is still executing in the background.
- * </p>
- */
-public interface FutureIds<T> extends Future<List<Object>> {
-
-  /**
-   * Returns the original query used to fetch the Id's.
-   */
-  Query<T> getQuery();
-
-}
@@ -1087,41 +1087,6 @@ public interface Query<T> extends CancelableQuery {
   */
  int findCount();

-  /**
-   * Execute find row count query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   * </p>
-   *
-   * @return a Future object for the row count query
-   */
-  FutureRowCount<T> findFutureCount();
-
-  /**
-   * Execute find Id's query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   * </p>
-   *
-   * @return a Future object for the list of Id's
-   */
-  FutureIds<T> findFutureIds();
-
-  /**
-   * Execute find list query in a background thread.
-   * <p>
-   * This query will execute in it's own PersistenceContext and using its own transaction.
-   * What that means is that it will not share any bean instances with other queries.
-   * </p>
-   *
-   * @return a Future object for the list result of the query
-   */
-  FutureList<T> findFutureList();
-
  /**
   * Return a PagedList for this query using firstRow and maxRows.
   * <p>
@@ -531,8 +531,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {

  private String dumpMetricsOptions;

-  private LengthCheck lengthCheck = LengthCheck.OFF;
-
  private Function<String, String> metricNaming = MetricNamingMatch.INSTANCE;

  /**
@@ -2126,7 +2124,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    jdbcFetchSizeFindEach = p.getInt("jdbcFetchSizeFindEach", jdbcFetchSizeFindEach);
    jdbcFetchSizeFindList = p.getInt("jdbcFetchSizeFindList", jdbcFetchSizeFindList);
    databasePlatformName = p.get("databasePlatformName", databasePlatformName);
-    lengthCheck = p.getEnum(LengthCheck.class, "lengthCheck", lengthCheck);

    uuidVersion = p.getEnum(UuidVersion.class, "uuidVersion", uuidVersion);
    uuidStateFile = p.get("uuidStateFile", uuidStateFile);
@@ -2503,19 +2500,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    return this;
  }

-  /**
-   * Returns the length check mode.
-   */
-  public LengthCheck getLengthCheck() {
-    return lengthCheck;
-  }
-
-  @Override
-  public DatabaseConfig lengthCheck(LengthCheck lengthCheck) {
-    this.lengthCheck = lengthCheck;
-    return this;
-  }
-
  public enum UuidVersion {
    VERSION4,
    VERSION1,
@@ -1,22 +0,0 @@
-package io.ebean.config;
-
-/**
- * Defines the length-check mode.
- *
- * @author Roland Praml, FOCONIS AG
- */
-public enum LengthCheck {
-  /**
-   * By default, length checking is off. This means, strings/jsons and files are passed to the DB and the DB might or might not check the length.
-   * The DB has to check the data length. Note this is not possible for certain datatypes (e.g. clob without size)
-   */
-  OFF,
-  /**
-   * When enabling length check, ebean validates strings/json strings and files before saving them to DB.
-   */
-  ON,
-  /**
-   * Same as "ON", but take the UTF8-bytelength for validation. This may be useful, if you have an UTF8 based charset (default for DB2)
-   */
-  UTF8
-}
@@ -22,8 +22,6 @@ public class JsonWriteOptions {

  protected JsonConfig.Include include;

-  protected boolean includeLoadedImplicit = true;
-
  protected Map<String, JsonWriteBeanVisitor<?>> visitorMap;

  /**
@@ -75,20 +73,6 @@ public class JsonWriteOptions {
    this.include = include;
  }

-  /**
-   * Should loaded properties be included implicit, if no other fetch path is specified (default = true).
-   */
-  public boolean isIncludeLoadedImplicit() {
-    return includeLoadedImplicit;
-  }
-
-  /**
-   * Set include loaded properties implicit (default = true).
-   */
-  public void setIncludeLoadedImplicit(boolean includeLoadedImplicit) {
-    this.includeLoadedImplicit = includeLoadedImplicit;
-  }
-
  /**
   * Register a JsonWriteBeanVisitor for the root level.
   */
@@ -75,7 +75,6 @@ class DatabaseConfigTest {
    props.setProperty("defaultServer", "false");
    props.setProperty("skipDataSourceCheck", "true");
    props.setProperty("readOnlyDatabase", "true");
-    props.setProperty("lengthCheck", "ON");

    props.setProperty("queryPlan.enable", "true");
    props.setProperty("queryPlan.thresholdMicros", "10000");
@@ -96,7 +95,6 @@ class DatabaseConfigTest {
    assertTrue(settings.isLoadModuleInfo());
    assertTrue(settings.skipDataSourceCheck());
    assertTrue(settings.readOnlyDatabase());
-    assertThat(settings.getLengthCheck()).isEqualTo(LengthCheck.ON);

    assertTrue(settings.isIdGeneratorAutomatic());
    assertFalse(settings.getPlatformConfig().isCaseSensitiveCollation());
@@ -130,11 +128,8 @@ class DatabaseConfigTest {

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

-    config.persistBatch(PersistBatch.NONE)
-      .persistBatchOnCascade(PersistBatch.NONE)
-      .lengthCheck(LengthCheck.ON)
-      .lengthCheck(LengthCheck.UTF8);
-
+    config.setPersistBatch(PersistBatch.NONE);
+    config.setPersistBatchOnCascade(PersistBatch.NONE);

    Properties props1 = new Properties();
    props1.setProperty("ebean.persistBatch", "ALL");
@@ -151,7 +146,6 @@ class DatabaseConfigTest {

    assertEquals(PersistBatch.ALL, settings.getPersistBatch());
    assertEquals(PersistBatch.ALL, settings.getPersistBatchOnCascade());
-    assertEquals(LengthCheck.UTF8, settings.getLengthCheck());

    config.setEnabledL2Regions("r0,orgs");
    assertEquals("r0,orgs", settings.getEnabledL2Regions());
@@ -180,7 +174,6 @@ class DatabaseConfigTest {
    assertEquals(600, config.getQueryPlanCapturePeriodSecs());
    assertEquals(10000L, config.getQueryPlanCaptureMaxTimeMillis());
    assertEquals(10, config.getQueryPlanCaptureMaxCount());
-    assertThat(config.getLengthCheck()).isEqualTo(LengthCheck.OFF);

    config.setLoadModuleInfo(false);
    assertFalse(config.isAutoLoadModuleInfo());
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.0</version>
  </parent>

  <name>ebean bom</name>
@@ -89,103 +89,103 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-joda-time</artifactId>
-        <version>14.0.0</version>
+        <version>13.24.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-jsonnode</artifactId>
-        <version>14.0.0</version>
+        <version>13.24.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-mapper</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-api</artifactId>
-        <version>14.0.0</version>
+        <version>13.18.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>14.0.0</version>
+        <version>13.18.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-autotune</artifactId>
-        <version>14.0.0</version>
+        <version>13.18.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis-types</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>14.0.1</version>
+        <version>14.0.0</version>
      </dependency>

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

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

    <dependency>
@@ -30,7 +30,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.7.2</version>
+      <version>42.6.0</version>
      <optional>true</optional>
    </dependency>

@@ -174,9 +174,4 @@ public interface DataBinder {
   */
  String popJson();

-  /**
-   * Returns the last bound object (e.g. for BindValidation). Note for InputStreams you'll get an InputStreamInfo.
-   */
-  Object popLastObject();
-
 }
@@ -1,27 +0,0 @@
-package io.ebean.core.type;
-
-import java.io.InputStream;
-
-/**
- * Helper to transports length info of DataBind.setBinaryStream(stream, length) to BindValidation
- *
- * @author Roland Praml, FOCONIS AG
- */
-public final class InputStreamInfo {
-
-  private final InputStream stream;
-  private final long length;
-
-  public InputStreamInfo(InputStream stream, long length) {
-    this.stream = stream;
-    this.length = length;
-  }
-
-  public InputStream stream() {
-    return stream;
-  }
-
-  public long length() {
-    return length;
-  }
-}
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.0</version>
  </parent>

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

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

    <!--
@@ -139,7 +139,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.7.2</version>
+      <version>42.6.0</version>
      <optional>true</optional>
    </dependency>

@@ -147,21 +147,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

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

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

@@ -336,10 +336,6 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio

  <T> FutureRowCount<T> findFutureCount(SpiQuery<T> query);

-  <T> FutureIds<T> findFutureIds(SpiQuery<T> query);
-
-  <T> FutureList<T> findFutureList(SpiQuery<T> query);
-
  <T> PagedList<T> findPagedList(SpiQuery<T> query);

  <T> Set<T> findSet(SpiQuery<T> query);
@@ -1,14 +1,10 @@
 package io.ebeaninternal.server.bind;

 import io.ebean.core.type.DataBinder;
-import io.ebean.core.type.InputStreamInfo;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;

-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
+import java.io.*;
 import java.math.BigDecimal;
 import java.sql.*;
 import java.util.ArrayList;
@@ -27,8 +23,6 @@ public class DataBind implements DataBinder {
  protected int pos;
  private String json;

-  private Object lastObject = null;
-
  public DataBind(DataTimeZone dataTimeZone, PreparedStatement pstmt, Connection connection) {
    this.dataTimeZone = dataTimeZone;
    this.pstmt = pstmt;
@@ -71,19 +65,16 @@ public class DataBind implements DataBinder {
  @Override
  public void setObject(Object value) throws SQLException {
    pstmt.setObject(++pos, value);
-    lastObject = value;
  }

  @Override
  public final void setObject(Object value, int sqlType) throws SQLException {
    pstmt.setObject(++pos, value, sqlType);
-    lastObject = value;
  }

  @Override
  public void setNull(int jdbcType) throws SQLException {
    pstmt.setNull(++pos, jdbcType);
-    lastObject = null;
  }

  @Override
@@ -105,7 +96,7 @@ public class DataBind implements DataBinder {
    }
  }

-  public void closeInputStreams() {
+  private void closeInputStreams() {
    if (inputStreams != null) {
      for (InputStream inputStream : inputStreams) {
        try {
@@ -126,43 +117,36 @@ public class DataBind implements DataBinder {
  @Override
  public void setString(String value) throws SQLException {
    pstmt.setString(++pos, value);
-    lastObject = value;
  }

  @Override
  public final void setInt(int value) throws SQLException {
    pstmt.setInt(++pos, value);
-    lastObject = null;
  }

  @Override
  public final void setLong(long value) throws SQLException {
    pstmt.setLong(++pos, value);
-    lastObject = null;
  }

  @Override
  public final void setShort(short value) throws SQLException {
    pstmt.setShort(++pos, value);
-    lastObject = null;
  }

  @Override
  public final void setFloat(float value) throws SQLException {
    pstmt.setFloat(++pos, value);
-    lastObject = null;
  }

  @Override
  public final void setDouble(double value) throws SQLException {
    pstmt.setDouble(++pos, value);
-    lastObject = null;
  }

  @Override
  public final void setBigDecimal(BigDecimal value) throws SQLException {
    pstmt.setBigDecimal(++pos, value);
-    lastObject = null;
  }

  @Override
@@ -173,7 +157,6 @@ public class DataBind implements DataBinder {
    } else {
      pstmt.setDate(++pos, value);
    }
-    lastObject = null;
  }

  @Override
@@ -184,7 +167,6 @@ public class DataBind implements DataBinder {
    } else {
      pstmt.setTimestamp(++pos, value);
    }
-    lastObject = null;
  }

  @Override
@@ -195,31 +177,26 @@ public class DataBind implements DataBinder {
    } else {
      pstmt.setTime(++pos, value);
    }
-    lastObject = null;
  }

  @Override
  public void setBoolean(boolean value) throws SQLException {
    pstmt.setBoolean(++pos, value);
-    lastObject = null;
  }

  @Override
  public void setBytes(byte[] value) throws SQLException {
    pstmt.setBytes(++pos, value);
-    lastObject = value;
  }

  @Override
  public void setByte(byte value) throws SQLException {
    pstmt.setByte(++pos, value);
-    lastObject = null;
  }

  @Override
  public void setChar(char value) throws SQLException {
    pstmt.setString(++pos, String.valueOf(value));
-    lastObject = null;
  }

  @Override
@@ -234,31 +211,21 @@ public class DataBind implements DataBinder {
    }
    inputStreams.add(inputStream);
    pstmt.setBinaryStream(++pos, inputStream, length);
-    lastObject = new InputStreamInfo(inputStream, length);
  }

  @Override
  public void setBlob(byte[] bytes) throws SQLException {
    pstmt.setBinaryStream(++pos, new ByteArrayInputStream(bytes), bytes.length);
-    lastObject = bytes;
  }

  @Override
  public void setClob(String content) throws SQLException {
    pstmt.setCharacterStream(++pos, new StringReader(content), content.length());
-    lastObject = content;
  }

  @Override
  public void setArray(String arrayType, Object[] elements) throws SQLException {
    pstmt.setArray(++pos, connection.createArrayOf(arrayType, elements));
-    lastObject = null;
  }

-  @Override
-  public Object popLastObject() {
-    Object ret = lastObject;
-    lastObject = null;
-    return ret;
-  }
 }
@@ -1200,47 +1200,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    return queryFuture;
  }

-  @Override
-  public <T> FutureIds<T> findFutureIds(SpiQuery<T> query) {
-    SpiQuery<T> copy = query.copy();
-    copy.usingFuture();
-    boolean createdTransaction = false;
-    SpiTransaction transaction = query.transaction();
-    if (transaction == null) {
-      transaction = currentServerTransaction();
-      if (transaction == null) {
-        transaction = (SpiTransaction) createTransaction();
-        createdTransaction = true;
-      }
-      copy.usingTransaction(transaction);
-    }
-    QueryFutureIds<T> queryFuture = new QueryFutureIds<>(new CallableQueryIds<>(this, copy, createdTransaction));
-    backgroundExecutor.execute(queryFuture.futureTask());
-    return queryFuture;
-  }
-
-  @Override
-  public <T> FutureList<T> findFutureList(SpiQuery<T> query) {
-    SpiQuery<T> spiQuery = query.copy();
-    spiQuery.usingFuture();
-    // FutureList query always run in it's own persistence content
-    spiQuery.setPersistenceContext(new DefaultPersistenceContext());
-    // Create a new transaction solely to execute the findList() at some future time
-    boolean createdTransaction = false;
-    SpiTransaction transaction = query.transaction();
-    if (transaction == null) {
-      transaction = currentServerTransaction();
-      if (transaction == null) {
-        transaction = (SpiTransaction) createTransaction();
-        createdTransaction = true;
-      }
-      spiQuery.usingTransaction(transaction);
-    }
-    QueryFutureList<T> queryFuture = new QueryFutureList<>(new CallableQueryList<>(this, spiQuery, createdTransaction));
-    backgroundExecutor.execute(queryFuture.futureTask());
-    return queryFuture;
-  }
-
  @Override
  public <T> PagedList<T> findPagedList(SpiQuery<T> query) {
    int maxRows = query.getMaxRows();
@@ -96,7 +96,6 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
  private final String asOfViewSuffix;
  private final boolean jacksonCorePresent;
  private final int queryPlanTTLSeconds;
-  private final BindMaxLength bindMaxLength;
  private int entityBeanCount;
  private List<BeanDescriptor<?>> immutableDescriptorList;
  /**
@@ -145,19 +144,6 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    this.changeLogListener = config.changeLogListener(bootupClasses.getChangeLogListener());
    this.changeLogRegister = config.changeLogRegister(bootupClasses.getChangeLogRegister());
    this.jacksonCorePresent = config.isJacksonCorePresent();
-    this.bindMaxLength = initMaxLength();
-  }
-
-  BindMaxLength initMaxLength() {
-    LengthCheck lengthCheck = this.config.getLengthCheck();
-    switch (lengthCheck) {
-      case OFF:
-        return null;
-      case UTF8:
-        return BindMaxLength.ofUtf8();
-      default:
-        return BindMaxLength.ofStandard();
-    }
  }

  @Override
@@ -1360,10 +1346,6 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    return list;
  }

-  public BindMaxLength bindMaxLength() {
-    return bindMaxLength;
-  }
-
  /**
   * Comparator to sort the BeanDescriptors by name.
   */
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.deploy;

 import com.fasterxml.jackson.core.JsonToken;
-import io.ebean.DataIntegrityException;
 import io.ebean.ValuePair;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
@@ -162,7 +161,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   */
  private final String dbComment;
  private final DbEncryptFunction dbEncryptFunction;
-  private final BindMaxLength bindMaxLength;
  private int deployOrder;
  final boolean jsonSerialize;
  final boolean jsonDeserialize;
@@ -246,7 +244,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    }
    this.jsonSerialize = deploy.isJsonSerialize();
    this.jsonDeserialize = deploy.isJsonDeserialize();
-    this.bindMaxLength = deploy.bindMaxLength();
  }

  private String tableAliasIntern(BeanDescriptor<?> descriptor, String s, boolean dbEncrypted, String dbColumn) {
@@ -329,7 +326,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    this.elPlaceHolderEncrypted = override.replace(source.elPlaceHolderEncrypted, source.dbColumn);
    this.jsonSerialize = source.jsonSerialize;
    this.jsonDeserialize = source.jsonDeserialize;
-    this.bindMaxLength = source.bindMaxLength;
  }

  /**
@@ -540,18 +536,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
  @SuppressWarnings("unchecked")
  public void bind(DataBind b, Object value) throws SQLException {
    scalarType.bind(b, value);
-    if (bindMaxLength != null) {
-      Object obj = b.popLastObject();
-      long length = bindMaxLength.length(dbLength, obj);
-      if (length > dbLength) {
-        b.closeInputStreams();
-        String s = String.valueOf(value); // take original bind value here.
-        if (s.length() > 50) {
-          s = s.substring(0, 47) + "...";
-        }
-        throw new DataIntegrityException("Cannot bind value '" + s + "' (effective length=" + length + ") to column '" + dbColumn + "' (length=" + dbLength + ")");
-      }
-    }
  }

  @SuppressWarnings(value = "unchecked")
@@ -360,9 +360,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
    for (ExportedProperty exportedProperty : exportedProperties) {
      row.addColumn(exportedProperty.getForeignDbColumn());
    }
-    if (importedId == null) {
-      throw new PersistenceException("Missing @Id property on bean related to ManyToMany " + fullName());
-    }
    importedId.buildImport(row);
    return row.build();
  }
@@ -1,90 +0,0 @@
-package io.ebeaninternal.server.deploy;
-
-import io.ebean.core.type.InputStreamInfo;
-
-import java.nio.charset.StandardCharsets;
-
-/**
- * The max length check on bind values.
- */
-public interface BindMaxLength {
-
-  /**
-   * Return a UTF8 based implementation.
-   */
-  static BindMaxLength ofUtf8() {
-    return new UTF8();
-  }
-
-  /**
-   * Return a standard implementation.
-   */
-  static BindMaxLength ofStandard() {
-    return new Standard();
-  }
-
-  /**
-   * Return the length of the object.
-   */
-  long length(int dbLength, Object obj);
-
-  /**
-   * Length check based on UTF8 bytes.
-   */
-  final class UTF8 implements BindMaxLength {
-
-    @Override
-    public long length(int dbLength, Object obj) {
-      if (obj == null) {
-        return -1;
-      } else if (obj instanceof String) {
-        String s = (String) obj;
-        return utf8String(dbLength, s);
-      } else if (obj instanceof byte[]) {
-        return ((byte[]) obj).length;
-      } else if (obj instanceof InputStreamInfo) {
-        return ((InputStreamInfo) obj).length();
-      } else if ("org.postgresql.util.PGobject".equals(obj.getClass().getCanonicalName())) {
-        String value = ((org.postgresql.util.PGobject) obj).getValue();
-        return value == null ? -1 : utf8String(dbLength, value);
-      } else {
-        return -1;
-      }
-    }
-
-    private static int utf8String(int dbLength, String s) {
-      int stringLength = s.length();
-      if (stringLength > dbLength) {
-        return stringLength;
-      } else if (stringLength * 4 <= dbLength) {
-        return -1;
-      } else {
-        return s.getBytes(StandardCharsets.UTF_8).length;
-      }
-    }
-  }
-
-  /**
-   * Standard string length implementation.
-   */
-  final class Standard implements BindMaxLength {
-
-    @Override
-    public long length(int dbLength, Object obj) {
-      if (obj == null) {
-        return -1;
-      } else if (obj instanceof String) {
-        return ((String) obj).length();
-      } else if (obj instanceof byte[]) {
-        return ((byte[]) obj).length;
-      } else if (obj instanceof InputStreamInfo) {
-        return ((InputStreamInfo) obj).length();
-      } else if ("org.postgresql.util.PGobject".equals(obj.getClass().getCanonicalName())) {
-        String value = ((org.postgresql.util.PGobject) obj).getValue();
-        return value == null ? -1 : value.length();
-      } else {
-        return -1;
-      }
-    }
-  }
-}
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.deploy.meta;

-import io.ebean.DatabaseBuilder;
 import io.ebean.annotation.Cache;
 import io.ebean.annotation.Identity;
+import io.ebean.DatabaseBuilder;
 import io.ebean.config.TableName;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
@@ -18,6 +18,9 @@ import io.ebeaninternal.server.idgen.UuidV1IdGenerator;
 import io.ebeaninternal.server.idgen.UuidV1RndIdGenerator;
 import io.ebeaninternal.server.idgen.UuidV4IdGenerator;

+import jakarta.persistence.Entity;
+import jakarta.persistence.MappedSuperclass;
+
 import java.lang.reflect.Field;
 import java.util.*;

@@ -107,10 +110,6 @@ public class DeployBeanDescriptor<T> {
    this.beanType = beanType;
  }

-  public BindMaxLength bindMaxLength() {
-    return manager.bindMaxLength();
-  }
-
  private String[] readPropertyNames() {
    try {
      Field field = beanType.getField("_ebean_props");
@@ -1,17 +1,14 @@
 package io.ebeaninternal.server.deploy.meta;

-import io.avaje.lang.Nullable;
 import io.ebean.annotation.*;
 import io.ebean.config.ScalarTypeConverter;
 import io.ebean.config.dbplatform.DbDefaultValue;
 import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbEncryptFunction;
-import io.ebean.config.dbplatform.ExtraDbTypes;
 import io.ebean.core.type.ScalarType;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.server.core.InternString;
 import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.deploy.BindMaxLength;
 import io.ebeaninternal.server.deploy.DbMigrationInfo;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
 import io.ebeaninternal.server.el.ElPropertyValue;
@@ -1078,20 +1075,4 @@ public class DeployBeanProperty {
  boolean isJsonType() {
    return mutationDetection != null;
  }
-
-  @Nullable
-  public BindMaxLength bindMaxLength() {
-      if (dbLength == 0) {
-        return null;
-      }
-      switch (dbType) {
-        case Types.VARCHAR:
-        case Types.BLOB:
-        case ExtraDbTypes.JSON:
-          return desc.bindMaxLength();
-        default:
-          return null;
-      }
-
-  }
 }
@@ -218,21 +218,6 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
    return query.update(transaction);
  }

-  @Override
-  public FutureIds<T> findFutureIds() {
-    return query.findFutureIds();
-  }
-
-  @Override
-  public FutureRowCount<T> findFutureCount() {
-    return query.findFutureCount();
-  }
-
-  @Override
-  public FutureList<T> findFutureList() {
-    return query.findFutureList();
-  }
-
  @Override
  public PagedList<T> findPagedList() {
    return query.findPagedList();
@@ -49,21 +49,6 @@ public final class FilterExpressionList<T> extends DefaultExpressionList<T> {
    return rootQuery.filterMany(prop);
  }

-  @Override
-  public FutureIds<T> findFutureIds() {
-    return rootQuery.findFutureIds();
-  }
-
-  @Override
-  public FutureList<T> findFutureList() {
-    return rootQuery.findFutureList();
-  }
-
-  @Override
-  public FutureRowCount<T> findFutureCount() {
-    return rootQuery.findFutureCount();
-  }
-
  @Override
  public List<T> findList() {
    return rootQuery.findList();
@@ -328,21 +328,6 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
    return exprList.exists();
  }

-  @Override
-  public FutureIds<T> findFutureIds() {
-    return exprList.findFutureIds();
-  }
-
-  @Override
-  public FutureList<T> findFutureList() {
-    return exprList.findFutureList();
-  }
-
-  @Override
-  public FutureRowCount<T> findFutureCount() {
-    return exprList.findFutureCount();
-  }
-
  @Override
  public <A> List<A> findIds() {
    return exprList.findIds();
@@ -402,13 +402,7 @@ public final class DJsonContext implements SpiJsonContext {
  private WriteJson createWriteJson(JsonGenerator gen, JsonWriteOptions options) {
    FetchPath pathProps = (options == null) ? null : options.getPathProperties();
    Map<String, JsonWriteBeanVisitor<?>> visitors = (options == null) ? null : options.getVisitorMap();
-    return new WriteJson(server,
-      gen,
-      pathProps,
-      visitors,
-      determineObjectMapper(options),
-      determineInclude(options),
-      options == null || options.isIncludeLoadedImplicit());
+    return new WriteJson(server, gen, pathProps, visitors, determineObjectMapper(options), determineInclude(options));
  }

  private <T> void toJsonFromCollection(Collection<T> collection, String key, JsonGenerator gen, JsonWriteOptions options) throws IOException {
@@ -496,5 +490,4 @@ public final class DJsonContext implements SpiJsonContext {
    JsonConfig.Include include = options.getInclude();
    return (include != null) ? include : defaultInclude;
  }
-
 }
@@ -31,15 +31,12 @@ public final class WriteJson implements SpiJsonWriter {
  private final ArrayStack<Object> parentBeans;
  private final Object objectMapper;
  private final JsonConfig.Include include;
-  private final boolean includeLoadedImplicit;
-

  /**
   * Construct for full bean use (normal).
   */
  public WriteJson(SpiEbeanServer server, JsonGenerator generator, FetchPath fetchPath,
-                   Map<String, JsonWriteBeanVisitor<?>> visitors, Object objectMapper, JsonConfig.Include include,
-                   boolean includeLoadedImplicit) {
+                   Map<String, JsonWriteBeanVisitor<?>> visitors, Object objectMapper, JsonConfig.Include include) {

    this.server = server;
    this.generator = generator;
@@ -47,7 +44,6 @@ public final class WriteJson implements SpiJsonWriter {
    this.visitors = visitors;
    this.objectMapper = objectMapper;
    this.include = include;
-    this.includeLoadedImplicit = includeLoadedImplicit;
    this.parentBeans = new ArrayStack<>();
    this.pathStack = new PathStack();
  }
@@ -58,7 +54,6 @@ public final class WriteJson implements SpiJsonWriter {
  public WriteJson(JsonGenerator generator, JsonConfig.Include include) {
    this.generator = generator;
    this.include = include;
-    this.includeLoadedImplicit = true;
    this.visitors = null;
    this.server = null;
    this.fetchPath = null;
@@ -448,7 +443,7 @@ public final class WriteJson implements SpiJsonWriter {
        currentIncludeProps = null;
      }
    }
-    return new WriteBean(desc, explicitAllProps, includeLoadedImplicit, currentIncludeProps, bean, visitor);
+    return new WriteBean(desc, explicitAllProps, currentIncludeProps, bean, visitor);
  }

  @Override
@@ -482,7 +477,6 @@ public final class WriteJson implements SpiJsonWriter {
  public static class WriteBean {

    final boolean explicitAllProps;
-    final boolean includeLoadedImplicit;
    final Set<String> currentIncludeProps;
    final BeanDescriptor<?> desc;
    final EntityBean currentBean;
@@ -491,15 +485,14 @@ public final class WriteJson implements SpiJsonWriter {
    final JsonWriteBeanVisitor visitor;

    WriteBean(BeanDescriptor<?> desc, EntityBean currentBean, JsonWriteBeanVisitor<?> visitor) {
-      this(desc, false, true, null, currentBean, visitor);
+      this(desc, false, null, currentBean, visitor);
    }

-    WriteBean(BeanDescriptor<?> desc, boolean explicitAllProps, boolean includeLoadedImplicit, Set<String> currentIncludeProps, EntityBean currentBean, JsonWriteBeanVisitor<?> visitor) {
+    WriteBean(BeanDescriptor<?> desc, boolean explicitAllProps, Set<String> currentIncludeProps, EntityBean currentBean, JsonWriteBeanVisitor<?> visitor) {
      super();
      this.desc = desc;
      this.currentBean = currentBean;
      this.explicitAllProps = explicitAllProps;
-      this.includeLoadedImplicit = includeLoadedImplicit;
      this.currentIncludeProps = currentIncludeProps;
      this.visitor = visitor;
    }
@@ -514,11 +507,9 @@ public final class WriteJson implements SpiJsonWriter {
      if (currentIncludeProps != null) {
        // explicitly controlled by pathProperties
        return currentIncludeProps.contains(prop.name());
-      } else if (includeLoadedImplicit){
+      } else {
        // include only loaded properties
        return currentBean._ebean_getIntercept().isLoadedProperty(prop.propertyIndex());
-      } else {
-        return prop.isId();
      }
    }

@@ -12,9 +12,6 @@ import io.ebean.ExpressionList;
 import io.ebean.FetchConfig;
 import io.ebean.FetchGroup;
 import io.ebean.FetchPath;
-import io.ebean.FutureIds;
-import io.ebean.FutureList;
-import io.ebean.FutureRowCount;
 import io.ebean.OrderBy;
 import io.ebean.PagedList;
 import io.ebean.PersistenceContextScope;
@@ -351,21 +348,6 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Override
-  public FutureRowCount<T> findFutureCount() {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
-  @Override
-  public FutureIds<T> findFutureIds() {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
-  @Override
-  public FutureList<T> findFutureList() {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
  @Override
  public PagedList<T> findPagedList() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
@@ -1,41 +0,0 @@
-package io.ebeaninternal.server.query;
-
-import io.ebean.FutureIds;
-import io.ebean.Query;
-import io.ebean.Transaction;
-
-import java.util.List;
-import java.util.concurrent.FutureTask;
-
-/**
- * Default implementation of FutureIds.
- */
-public final class QueryFutureIds<T> extends BaseFuture<List<Object>> implements FutureIds<T> {
-
-  private final CallableQueryIds<T> call;
-
-  public QueryFutureIds(CallableQueryIds<T> call) {
-    super(new FutureTask<>(call));
-    this.call = call;
-  }
-
-  public FutureTask<List<Object>> futureTask() {
-    return futureTask;
-  }
-
-  public Transaction transaction() {
-    return call.transaction;
-  }
-
-  @Override
-  public Query<T> getQuery() {
-    return call.query;
-  }
-
-  @Override
-  public boolean cancel(boolean mayInterruptIfRunning) {
-    call.query.cancel();
-    return super.cancel(mayInterruptIfRunning);
-  }
-
-}
@@ -1,75 +0,0 @@
-package io.ebeaninternal.server.query;
-
-import io.ebean.FutureList;
-import io.ebean.Query;
-import io.ebean.Transaction;
-
-import jakarta.persistence.PersistenceException;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * Default implementation for FutureList.
- */
-public final class QueryFutureList<T> extends BaseFuture<List<T>> implements FutureList<T> {
-
-  private final CallableQueryList<T> call;
-
-  public QueryFutureList(CallableQueryList<T> call) {
-    super(new FutureTask<>(call));
-    this.call = call;
-  }
-
-  public FutureTask<List<T>> futureTask() {
-    return futureTask;
-  }
-
-  public Transaction transaction() {
-    return call.transaction;
-  }
-
-  @Override
-  public Query<T> getQuery() {
-    return call.query;
-  }
-
-  @Override
-  public boolean cancel(boolean mayInterruptIfRunning) {
-    call.query.cancel();
-    return super.cancel(mayInterruptIfRunning);
-  }
-
-  @Override
-  public List<T> getUnchecked() {
-    try {
-      return get();
-
-    } catch (InterruptedException e) {
-      // restore the interrupted status (so client can check for that)
-      Thread.currentThread().interrupt();
-      throw new PersistenceException(e);
-
-    } catch (ExecutionException e) {
-      throw new PersistenceException(e);
-    }
-  }
-
-  @Override
-  public List<T> getUnchecked(long timeout, TimeUnit unit) throws TimeoutException {
-    try {
-      return get(timeout, unit);
-
-    } catch (InterruptedException e) {
-      // restore the interrupted status (so client can check for that)
-      Thread.currentThread().interrupt();
-      throw new PersistenceException(e);
-
-    } catch (ExecutionException e) {
-      throw new PersistenceException(e);
-    }
-  }
-
-}
@@ -1489,21 +1489,6 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    return server.findOneOrEmpty(this);
  }

-  @Override
-  public final FutureIds<T> findFutureIds() {
-    return server.findFutureIds(this);
-  }
-
-  @Override
-  public final FutureList<T> findFutureList() {
-    return server.findFutureList(this);
-  }
-
-  @Override
-  public final FutureRowCount<T> findFutureCount() {
-    return server.findFutureCount(this);
-  }
-
  @Override
  public final PagedList<T> findPagedList() {
    return server.findPagedList(this);
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.0</version>
  </parent>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

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

@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>

@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.0</version>
  </parent>

  <name>ebean postgis types</name>
@@ -19,14 +19,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

    <!-- provided scope -->
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -47,7 +47,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.7.2</version>
+      <version>42.6.0</version>
      <scope>provided</scope>
    </dependency>

@@ -62,7 +62,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.0</version>
  </parent>

  <name>ebean querybean</name>
@@ -17,7 +17,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -63,14 +63,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -84,7 +84,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -108,18 +108,6 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    return fetchWithProperties(FETCH_DEFAULT, properties);
  }

-
-  /**
-   * Fetch this association with config for the type of fetch and the specified properties.
-   *
-   * @param config Fetch configuration to define the type of fetch to use
-   * @param properties The properties to fetch
-   */
-  @SafeVarargs @SuppressWarnings("varargs")
-  public final R fetch(FetchConfig config, TQProperty<QB,?>... properties) {
-    return fetchWithProperties(config, properties);
-  }
-
  /**
   * Eagerly fetch this association using a 'query join' loading the specified properties.
   */
@@ -1782,47 +1782,6 @@ public abstract class TQRootBean<T, R> {
    return query.findCount();
  }

-  /**
-   * Execute find row count query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   * </p>
-   *
-   * @return a Future object for the row count query
-   */
-  public FutureRowCount<T> findFutureCount() {
-    return query.findFutureCount();
-  }
-
-  /**
-   * Execute find Id's query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   * </p>
-   *
-   * @return a Future object for the list of Id's
-   */
-  public FutureIds<T> findFutureIds() {
-    return query.findFutureIds();
-  }
-
-  /**
-   * Execute find list query in a background thread.
-   * <p>
-   * This query will execute in it's own PersistenceContext and using its own transaction.
-   * What that means is that it will not share any bean instances with other queries.
-   * </p>
-   *
-   * @return a Future object for the list result of the query
-   */
-  public FutureList<T> findFutureList() {
-    return query.findFutureList();
-  }
-
  /**
   * Return a PagedList for this query using firstRow and maxRows.
   * <p>
@@ -1,14 +0,0 @@
-package org.example.domain;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Version;
-
-@Entity
-public class Alias {
-
-  @Id
-  long id;
-  @Version
-  long version;
-}
@@ -1,7 +1,6 @@
 package org.querytest;

 import io.ebean.DB;
-import io.ebean.FetchConfig;
 import io.ebean.FetchGroup;
 import io.ebean.Query;
 import io.ebean.test.LoggedSql;
@@ -9,7 +8,6 @@ import org.example.domain.Customer;
 import org.example.domain.Order;
 import org.example.domain.OrderDetail;
 import org.example.domain.otherpackage.PhoneNumber;
-import org.example.domain.query.QContact;
 import org.example.domain.query.QCustomer;
 import org.example.domain.query.QOrder;
 import org.example.domain.query.QOrderDetail;
@@ -28,17 +26,10 @@ public class QOrderTest {

  private static final QOrder or = QOrder.alias();

-  private static final QContact co = QContact.alias();
-
  private static final FetchGroup<Customer> fgC = QCustomer.forFetchGroup()
    .select(cu.name, cu.phoneNumber)
    .buildFetchGroup();

-  private static final FetchGroup<Customer> fgCustomerWithContacts = QCustomer.forFetchGroup()
-    .select(cu.name, cu.phoneNumber)
-    .contacts.fetch(FetchConfig.ofQuery(1000), co.firstName, co.lastName, co.email)
-    .buildFetchGroup();
-
  private static final FetchGroup<Order> fgNested1 = QOrder.forFetchGroup()
    .select(or.status, or.shipDate)
    .customer.fetch(fgC)
@@ -79,20 +70,6 @@ public class QOrderTest {
    DB.delete(customer);
  }

-  @Test
-  void fetchQueryWithBatch() {
-    LoggedSql.start();
-
-    new QCustomer()
-      .select(fgCustomerWithContacts)
-      .findList();
-
-    final List<String> sql = LoggedSql.stop();
-    assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("select t0.id, t0.name, t0.phone_number from be_customer t0");
-    assertThat(sql.get(1)).contains("select t0.customer_id, t0.id, t0.first_name, t0.last_name, t0.email from be_contact t0 where");
-  }
-
  @Test
  public void fetchCache() {

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.0</version>
  </parent>

  <artifactId>ebean-redis</artifactId>
@@ -22,28 +22,28 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -57,7 +57,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.0</version>
  </parent>

  <artifactId>ebean-spring-txn</artifactId>
@@ -28,7 +28,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -77,7 +77,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.0</version>
  </parent>

  <name>ebean test</name>
@@ -33,20 +33,20 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
@@ -135,28 +135,28 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-joda-time</artifactId>
-      <version>14.0.0</version>
+      <version>13.24.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>14.0.0</version>
+      <version>13.24.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -213,7 +213,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.7.2</version>
+      <version>42.6.0</version>
      <exclusions>
        <exclusion>
          <groupId>org.checkerframework</groupId>
@@ -574,16 +574,6 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer {
    return null;
  }

-  @Override
-  public <T> FutureIds<T> findFutureIds(SpiQuery<T> query) {
-    return null;
-  }
-
-  @Override
-  public <T> FutureList<T> findFutureList(SpiQuery<T> query) {
-    return null;
-  }
-
  @Override
  public <T> PagedList<T> findPagedList(SpiQuery<T> query) {
    return null;
@@ -1,100 +0,0 @@
-package io.ebean.xtest.internal.server.query;
-
-import io.ebean.*;
-import io.ebean.xtest.BaseTestCase;
-import io.ebeaninternal.server.query.QueryFutureIds;
-import io.ebeaninternal.server.query.QueryFutureList;
-import io.ebeaninternal.server.query.QueryFutureRowCount;
-import org.junit.jupiter.api.Test;
-import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
-
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.fail;
-
-public class TestFutureRowCountErrorHandling extends BaseTestCase {
-
-  @Test
-  public void testFutureRowCount() throws InterruptedException {
-
-    ResetBasicData.reset();
-
-    Database server = DB.getDefault();
-
-    Query<Customer> query = server.createQuery(Customer.class)
-      .where().eq("doesNotExist", "this will fail")
-      .query();
-
-    FutureRowCount<Customer> futureRowCount = query.findFutureCount();
-
-    QueryFutureRowCount<Customer> internalRowCount = (QueryFutureRowCount<Customer>) futureRowCount;
-    Transaction t = internalRowCount.transaction();
-
-    try {
-      futureRowCount.get();
-      fail("never get here as the SQL is invalid");
-
-    } catch (ExecutionException e) {
-      // Confirm the Transaction has been rolled back
-      assertFalse(t.isActive());
-    }
-
-  }
-
-  @Test
-  public void testFutureIds() throws InterruptedException {
-
-    ResetBasicData.reset();
-
-    Database server = DB.getDefault();
-
-    Query<Customer> query = server.createQuery(Customer.class)
-      .where().eq("doesNotExist", "this will fail")
-      .query();
-
-    FutureIds<Customer> futureIds = query.findFutureIds();
-
-    QueryFutureIds<Customer> internalFuture = (QueryFutureIds<Customer>) futureIds;
-    Transaction t = internalFuture.transaction();
-
-    try {
-      internalFuture.get();
-      fail("never get here as the SQL is invalid");
-
-    } catch (ExecutionException e) {
-      // Confirm the Transaction has been rolled back
-      assertFalse(t.isActive());
-    }
-
-  }
-
-
-  @Test
-  public void testFutureList() throws InterruptedException {
-
-    ResetBasicData.reset();
-
-    Database server = DB.getDefault();
-
-    Query<Customer> query = server.createQuery(Customer.class)
-      .where().eq("doesNotExist", "this will fail")
-      .query();
-
-    FutureList<Customer> futureList = query.findFutureList();
-
-    QueryFutureList<Customer> internalFuture = (QueryFutureList<Customer>) futureList;
-    Transaction t = internalFuture.transaction();
-
-    try {
-      internalFuture.get();
-      fail("never get here as the SQL is invalid");
-
-    } catch (ExecutionException e) {
-      // Confirm the Transaction has been rolled back
-      assertFalse(t.isActive());
-    }
-
-  }
-}
@@ -43,7 +43,7 @@ public class WriteJsonDirtyTest {
    JsonFactory jsonFactory = new JsonFactory();
    JsonGenerator generator = jsonFactory.createGenerator(writer);

-    WriteJson writeJson = new WriteJson(server, generator, null, null, null, null, true);
+    WriteJson writeJson = new WriteJson(server, generator, null, null, null, null);
    descriptor.jsonWriteDirty(writeJson, entityBean, dirtyProperties);

    generator.flush();
@@ -2,7 +2,6 @@ package org.tests.basic;

 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.FutureIds;
 import io.ebean.Query;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;
@@ -30,12 +29,6 @@ public class TestFetchId extends BaseTestCase {

    List<Object> ids = query.findIds();
    assertThat(ids).isNotEmpty();
-
-    FutureIds<Order> futureIds = query.findFutureIds();
-
-    // wait for all the id's to be fetched
-    List<Object> idList = futureIds.get();
-    assertThat(idList).isNotEmpty();
  }

  @Test
@@ -53,11 +46,6 @@ public class TestFetchId extends BaseTestCase {
    List<Object> ids = query.findIds();
    // TODO: assert(query.getGeneratedSql())
    assertThat(ids).isNotEmpty();
-    FutureIds<Order> futureIds = query.findFutureIds();
-
-    // wait for all the id's to be fetched
-    List<Object> idList = futureIds.get();
-    assertThat(idList).isNotEmpty();
  }

  @Test
@@ -1,101 +0,0 @@
-package org.tests.basic;
-
-import io.ebean.DB;
-import io.ebean.DataIntegrityException;
-import io.ebean.xtest.BaseTestCase;
-import org.junit.jupiter.api.Test;
-import org.tests.model.json.EBasicJsonList;
-import org.tests.model.json.EBasicJsonMap;
-import org.tests.model.types.SomeFileBean;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-/**
- * @author Roland Praml, FOCONIS AG
- */
-public class TestLength extends BaseTestCase {
-
-  @Test
-  void testFileSize() throws IOException {
-    File f1 = File.createTempFile("testfile", "tmp");
-    byte[] buf = new byte[1024];
-    try (FileOutputStream fos = new FileOutputStream(f1)) {
-      for (int i = 0; i < 100; i++) {
-        fos.write(buf);
-      }
-    }
-
-    SomeFileBean sfb1 = new SomeFileBean();
-    sfb1.setContent(f1);
-    DB.save(sfb1);
-
-    try (FileOutputStream fos = new FileOutputStream(f1)) {
-      for (int i = 0; i < 101; i++) {
-        fos.write(buf);
-      }
-    }
-
-    SomeFileBean sfb2 = new SomeFileBean();
-    sfb2.setContent(f1);
-    assertThatThrownBy(() -> DB.save(sfb2)).isInstanceOf(DataIntegrityException.class);
-  }
-
-
-  /**
-   * The property 'EBasicJsonMap.content' is annotated with @DbJson(length=5000). So we assume, that we cannot save Json-objects
-   * where the serialized form exceed that limit and we would expect an error on save.
-   * The length check works for platforms like h2, as H2 uses a 'varchar(5000)'. So it is impossible to save such long jsons,
-   * but it won't work for SqlServer, as here 'nvarchar(max)' is used. No validation happens at DB level and you might get very
-   * large Json objects in your database. This mostly happens unintentionally (programming error, misconfiguration)
-   * So they are in the database and they cannot be accessed by ebean any more, because there are new limits in Jackson:
-   * - Max 5 Meg per string in 2.15.0
-   * - Max 20 Meg per string in 2.15.1
-   * see https://github.com/FasterXML/jackson-core/issues/1014
-   */
-  @Test
-  void testLongString() {
-    // s is so big, that it could not be deserialized by jackson
-    String s = new String(new char[20_000_001]).replace('\0', 'x');
-
-    EBasicJsonMap bean = new EBasicJsonMap();
-    bean.setName("b1");
-    bean.setContent(Map.of("string", s));
-
-    assertThatThrownBy(() -> {
-      // we expect, that we can NOT save the bean, this is ensured by the bind validator.
-      DB.save(bean);
-    }).isInstanceOf(DataIntegrityException.class);
-
-  }
-
-
-  /**
-   * Tests the UTF8 validation.
-   */
-  @Test
-  void testUtf8() {
-
-    String s = new String(new char[40]).replace('\0', '€');
-
-    EBasicJsonList bean = new EBasicJsonList();
-    bean.setName("b1");
-    bean.setTags(List.of(s));
-
-    if (isDb2() || isOracle()) {
-      // by default, DB2 && oracle uses bytes in varchar, so an '€' symbol needs 3 bytes
-      assertThatThrownBy(() -> {
-        // we expect, that we can NOT save the bean, this is ensured by the bind validator.
-        DB.save(bean);
-      }).isInstanceOf(DataIntegrityException.class);
-    } else {
-      DB.save(bean);
-    }
-  }
-
-}
@@ -1,52 +0,0 @@
-package org.tests.json;
-
-import io.ebean.DB;
-import io.ebean.DataIntegrityException;
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.Test;
-import org.tests.model.json.EBasicJsonMap;
-
-import java.util.Map;
-
-class TestDbJsonLength {
-
-
-  /**
-   * The property 'EBasicJsonMap.content' is annotated with @DbJson(length=5000). So we assume, that we cannot save Json-objects
-   * where the serialized form exceed that limit and we would expect an error on save.
-   * The length check works for platforms like h2, as H2 uses a 'varchar(5000)'. So it is impossible to save such long jsons,
-   * but it won't work for SqlServer, as here 'nvarchar(max)' is used. No validation happens at DB level and you might get very
-   * large Json objects in your database. This mostly happens unintentionally (programming error, misconfiguration)
-   * So they are in the database and they cannot be accessed by ebean any more, because there are new limits in Jackson:
-   * - Max 5 Meg per string in 2.15.0
-   * - Max 20 Meg per string in 2.15.1
-   * see https://github.com/FasterXML/jackson-core/issues/1014
-   */
-  @Test
-  void testLongString() {
-    // s is so big, that it could not be deserialized by jackson
-    String s = new String(new char[20_000_001]).replace('\0', 'x');
-
-    EBasicJsonMap bean = new EBasicJsonMap();
-    bean.setName("b1");
-    bean.setContent(Map.of("string", s));
-
-    SoftAssertions softly = new SoftAssertions();
-
-    softly.assertThatThrownBy(() -> {
-      DB.save(bean);
-    }).isInstanceOf(DataIntegrityException.class);
-
-
-    if (bean.getId() != null) {
-      // we expect, that we could NOT save the bean, but this is not true for sqlServer.
-      // we will get a javax.persistence.PersistenceException: Error loading on org.tests.model.json.EBasicJsonMap.content
-      // when we try to load the bean back from DB
-      DB.find(EBasicJsonMap.class, bean.getId());
-    }
-
-    softly.assertAll();
-
-  }
-
-}
@@ -1,36 +0,0 @@
-package org.tests.json.include;
-
-import io.ebean.DB;
-import io.ebean.FetchPath;
-import io.ebean.config.JsonConfig;
-import io.ebean.text.PathProperties;
-import io.ebean.text.json.JsonWriteOptions;
-import org.junit.jupiter.api.Test;
-import org.tests.model.basic.Contact;
-import org.tests.model.basic.ResetBasicData;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class TestJsonImplicitLoaded {
-
-  @Test
-  void testToBeanToJson() {
-    ResetBasicData.reset();
-
-    FetchPath path = PathProperties.parse("*");
-    Contact bean = DB.find(Contact.class).setId(1).apply(path).findOne();
-
-    JsonWriteOptions options = new JsonWriteOptions();
-    options.setInclude(JsonConfig.Include.NON_NULL);
-    options.setPathProperties(path);
-    options.setIncludeLoadedImplicit(false);
-
-    String asJson = DB.json().toJson(bean, options);
-    assertThat(asJson).contains("customer\":{\"id\":1}"); // hold only ID
-
-    bean.getCustomer().getName(); // lazy-load bean;
-    asJson = DB.json().toJson(bean, options);
-    assertThat(asJson).contains("customer\":{\"id\":1}"); // expect the same result
-  }
-
-}
@@ -18,7 +18,7 @@ public class EBasicJsonMap {

  String name;

-  @DbJson(length = 5000)
+  @DbJson
  Map<String, Object> content;

  @OneToMany(mappedBy = "owner", cascade = CascadeType.ALL)
@@ -1,7 +1,9 @@
 package org.tests.model.types;

-import jakarta.persistence.*;
-
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.Version;
 import java.io.File;

@Entity
@@ -16,7 +18,6 @@ public class SomeFileBean {
  String name;

  @Lob
-  @Column(length = 100 * 1024) // limit to 100kb
  File content;

  public Long getId() {
@@ -4,14 +4,13 @@ import io.ebean.*;
 import io.ebean.xtest.BaseTestCase;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasic;
-import java.util.List;

 import static org.assertj.core.api.Assertions.assertThat;

 class TestFindFutureRowCount extends BaseTestCase {

  @Test
-  void count_when_inTransaction() throws Exception {
+  void count_when_inTransaction() {
    try (Transaction transaction = DB.beginTransaction()) {
      EBasic basic = new EBasic("count_when_inTransaction");
      DB.save(basic);
@@ -30,118 +29,7 @@ class TestFindFutureRowCount extends BaseTestCase {
      pagedList.loadCount();
      assertThat(pagedList.getList()).hasSize(1);
      assertThat(pagedList.getTotalCount()).isEqualTo(1);
-
-      FutureRowCount<EBasic> futureCount = DB.find(EBasic.class)
-        .where().eq("name", "count_when_inTransaction")
-        .findFutureCount();
-
-      assertThat(futureCount.get()).isEqualTo(1);
-
-      FutureRowCount<EBasic> futureCountUsingTxn = DB.find(EBasic.class)
-        .usingTransaction(transaction)
-        .where().eq("name", "count_when_inTransaction")
-        .findFutureCount();
-
-      assertThat(futureCountUsingTxn.get()).isEqualTo(1);
    }
  }

-  @Test
-  void findFutureIds_when_inTransaction() throws Exception {
-    try (Transaction transaction = DB.beginTransaction()) {
-      EBasic basic = new EBasic("findFutureIds_when_inTransaction");
-      DB.save(basic);
-
-      List<Object> ids = DB.find(EBasic.class)
-        .where().eq("name", "findFutureIds_when_inTransaction")
-        .findIds();
-
-      Object expectedIdValue = ids.get(0);
-
-      FutureIds<EBasic> futureIds = DB.find(EBasic.class)
-        .where().eq("name", "findFutureIds_when_inTransaction")
-        .findFutureIds();
-
-      List<Object> fids = futureIds.get();
-      assertThat(fids).hasSize(1);
-      assertThat(fids.get(0)).isEqualTo(expectedIdValue);
-
-      FutureIds<EBasic> futureIdsUsingTxn = DB.find(EBasic.class)
-        .usingTransaction(transaction)
-        .where().eq("name", "findFutureIds_when_inTransaction")
-        .findFutureIds();
-
-      List<Object> fids2 = futureIdsUsingTxn.get();
-      assertThat(fids2).hasSize(1);
-      assertThat(fids2.get(0)).isEqualTo(expectedIdValue);
-    }
-  }
-
-  @Test
-  void findFutureList_when_inTransaction() throws Exception {
-    try (Transaction transaction = DB.beginTransaction()) {
-      EBasic basic = new EBasic("findFutureList_when_inTransaction");
-      DB.save(basic);
-
-      List<EBasic> list = DB.find(EBasic.class)
-        .where().eq("name", "findFutureList_when_inTransaction")
-        .findList();
-
-      Object expectedIdValue = list.get(0).getId();
-
-      FutureList<EBasic> futureIds = DB.find(EBasic.class)
-        .where().eq("name", "findFutureList_when_inTransaction")
-        .findFutureList();
-
-      List<EBasic> fids = futureIds.get();
-      assertThat(fids).hasSize(1);
-      assertThat(fids.get(0).getId()).isEqualTo(expectedIdValue);
-
-      FutureList<EBasic> futureUsingTxn = DB.find(EBasic.class)
-        .usingTransaction(transaction)
-        .where().eq("name", "findFutureList_when_inTransaction")
-        .findFutureList();
-
-      List<EBasic> fids2 = futureUsingTxn.get();
-      assertThat(fids2).hasSize(1);
-      assertThat(fids2.get(0).getId()).isEqualTo(expectedIdValue);
-    }
-  }
-
-  @Test
-  void findFutures_when_newTransaction() throws Exception {
-    EBasic basic = new EBasic("findFutures_when_newTransaction");
-    DB.save(basic);
-
-    List<EBasic> list = DB.find(EBasic.class)
-      .where().eq("name", "findFutures_when_newTransaction")
-      .findList();
-
-    Object expectedIdValue = list.get(0).getId();
-
-    FutureList<EBasic> futureList = DB.find(EBasic.class)
-      .where().eq("name", "findFutures_when_newTransaction")
-      .findFutureList();
-
-    List<EBasic> flist = futureList.get();
-    assertThat(flist).hasSize(1);
-    assertThat(flist.get(0).getId()).isEqualTo(expectedIdValue);
-
-    FutureIds<EBasic> futureIds = DB.find(EBasic.class)
-      .where().eq("name", "findFutures_when_newTransaction")
-      .findFutureIds();
-
-    List<Object> fids = futureIds.get();
-    assertThat(fids).hasSize(1);
-    assertThat(fids.get(0)).isEqualTo(expectedIdValue);
-
-    FutureRowCount<EBasic> futureCount = DB.find(EBasic.class)
-      .where().eq("name", "findFutures_when_newTransaction")
-      .findFutureCount();
-
-    assertThat(futureCount.get()).isEqualTo(1);
-
-    DB.delete(basic);
-  }
-
 }
@@ -1,70 +0,0 @@
-package org.tests.query;
-
-import io.ebean.xtest.BaseTestCase;
-import io.ebean.DB;
-import io.ebean.FutureList;
-import io.ebean.Transaction;
-import org.junit.jupiter.api.Test;
-import org.tests.model.basic.Order;
-import org.tests.model.basic.ResetBasicData;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class TestQueryFindFutureList extends BaseTestCase {
-
-  @Test
-  public void test_cancel() throws InterruptedException {
-
-    ResetBasicData.reset();
-
-    // warm the connection pool
-    Transaction t0 = DB.createTransaction();
-    Transaction t1 = DB.createTransaction();
-    Transaction t2 = DB.createTransaction();
-    t0.end();
-    t1.end();
-    t2.end();
-
-    FutureList<Order> futureList = DB.find(Order.class).findFutureList();
-
-    Thread.sleep(10);
-    futureList.cancel(true);
-    // calling again is ignored
-    futureList.cancel(true);
-
-    // don't shutdown immediately
-    Thread.sleep(50);
-  }
-
-  @Test
-  public void test_findFutureList() throws InterruptedException {
-
-    ResetBasicData.reset();
-
-    FutureList<Order> futureList = DB.find(Order.class).findFutureList();
-
-    // wait for it to complete
-    List<Order> orders = futureList.getUnchecked();
-
-    assertEquals(DB.find(Order.class).findCount(), orders.size());
-  }
-
-  @Test
-  public void test_findFutureListWithTimeout() throws InterruptedException, TimeoutException {
-
-    ResetBasicData.reset();
-
-    FutureList<Order> futureList = DB.find(Order.class).findFutureList();
-
-    // wait for it to complete
-    List<Order> orders = futureList.getUnchecked(1, TimeUnit.SECONDS);
-
-    assertEquals(DB.find(Order.class).findCount(), orders.size());
-  }
-
-}
-
@@ -99,10 +99,7 @@ class SqlQueryCancelTest extends BaseTestCase {
  @Test
  public void cancelOrmQueryAtBegin() throws SQLException {
    doCancelOrmAtBegin(Query::findCount);
-    doCancelOrmAtBegin(Query::findFutureCount);
    // We cannot test 'findCount' due H2 restrictions
-    doCancelOrmAtBegin(Query::findFutureIds);
-    doCancelOrmAtBegin(Query::findFutureList);
    doCancelOrmAtBegin(Query::findIds);
    doCancelOrmAtBegin(Query::findIterate);
    doCancelOrmAtBegin(Query::findList);
@@ -126,8 +123,6 @@ class SqlQueryCancelTest extends BaseTestCase {
    // doCancelOrmDuringRun(Query::findCount);
    // testDuringRunFuture(Query::findFutureCount);
    // We cannot test 'findCount' due H2 restrictions
-    doCancelOrmFutureDuringRun(Query::findFutureIds);
-    doCancelOrmFutureDuringRun(Query::findFutureList);
    doCancelOrmDuringRun(Query::findIds);
    doCancelOrmDuringRun(Query::findIterate);
    doCancelOrmDuringRun(Query::findList);
@@ -138,10 +138,7 @@ class TestRawSqlOrmQuery extends BaseTestCase {
    List<Customer> list = query.findList();

    int rowCount = query.findCount();
-    FutureRowCount<Customer> futureRowCount = query.findFutureCount();
-
    assertEquals(initialRowCount, rowCount);
-    assertEquals(initialRowCount, futureRowCount.get().intValue());

    // check that lazy loading still executes
    for (Customer customer : list) {
@@ -157,7 +157,6 @@ datasource.oracle.url=jdbc:oracle:thin:@localhost:1521:XE
 ## set this to use timestamp rather than timestamptz
 #ebean.postgres.timestamp=timestamp

-ebean.pg.lengthCheck=on
 datasource.pg.username=unit
 datasource.pg.password=test
 datasource.pg.url=jdbc:postgresql://127.0.0.1:6432/unit
@@ -2,4 +2,4 @@ ebean.test.platform=cockroach
 ebean.test.dbName=unit
 datasource.default=cockroach
 #ebean.test.cockroach.version=v21.2.6
-ebean.lengthCheck=on
+
@@ -5,4 +5,3 @@ ebean.test.username=admin
 ebean.test.password=admin
 datasource.default=db2-11
 ebean.db2-11.databasePlatformName=db2luw
-ebean.lengthCheck=utf8
@@ -6,4 +6,3 @@ ebean.test.mariadb.version=10.3
 ebean.test.mariadb.containerName=ut_mariadb-10-3
 ebean.test.mariadb.port=14308
 datasource.default=mariadb-103
-ebean.lengthCheck=on
@@ -4,4 +4,3 @@ ebean.test.mariadb.version=10.6
 ebean.test.mariadb.containerName=ut_mariadb-10-6
 ebean.test.mariadb.port=14307
 datasource.default=mariadb-106
-ebean.lengthCheck=on
@@ -4,4 +4,3 @@ ebean.test.dbName=test_ebean
 # note: do not conflict with mariadb port
 #ebean.test.mysql.port=4306
 datasource.default=mysql-docker
-ebean.lengthCheck=on
@@ -1,4 +1,3 @@
 ebean.test.platform=oracle
 ebean.test.dbName=test_eb
 datasource.default=oracle
-ebean.lengthCheck=utf8
@@ -2,4 +2,4 @@ ebean.test.platform=postgres
 datasource.default=postgres
 ebean.test.dbName=unit
 ebean.test.postgres.version=15
-ebean.lengthCheck=on
+
@@ -8,4 +8,3 @@ ebean.test.sqlserver.url=jdbc:sqlserver://localhost:9435;databaseName=test_ebean

 datasource.default=sqlserver2017
 ebean.sqlserver2017.databasePlatformName=sqlserver17
-ebean.lengthCheck=on
@@ -7,7 +7,6 @@ ebean.test.sqlserver.port=9434
 ebean.test.sqlserver.url=jdbc:sqlserver://localhost:9434;databaseName=test_ebean;sendTimeAsDateTime=false;integratedSecurity=false;trustServerCertificate=true
 datasource.default=sqlserver2019
 ebean.sqlserver2019.databasePlatformName=sqlserver17
-ebean.lengthCheck=on

 ## A case sensitive collation example:
 #ebean.test.sqlserver.collation=LATIN1_GENERAL_100_CI_AS_SC_UTF8
@@ -2,4 +2,4 @@ ebean.test.platform=yugabyte
 datasource.default=yugabyte
 ebean.test.dbName=unit
 ebean.test.yugabyte.version=2.18.0.0-b65
-ebean.lengthCheck=on
+
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.0</version>
  </parent>

  <name>kotlin querybean generator</name>
@@ -21,7 +21,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -35,7 +35,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -56,14 +56,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -2,8 +2,9 @@ package io.ebean.querybean.generator;

 interface Constants {

-  String AT_GENERATED = "@io.ebean.typequery.Generated(\"io.ebean.querybean.kotlin-generator\")";
-  String AT_TYPEQUERYBEAN = "@io.ebean.typequery.TypeQueryBean(\"v1\")";
+  String AT_GENERATED = "@Generated(\"io.ebean.querybean.kotlin-generator\")";
+  String AT_TYPEQUERYBEAN = "@TypeQueryBean(\"v1\")";
+  String GENERATED = "io.ebean.typequery.Generated";

  String MAPPED_SUPERCLASS = "jakarta.persistence.MappedSuperclass";
  String DISCRIMINATOR_VALUE = "jakarta.persistence.DiscriminatorValue";
@@ -18,9 +19,16 @@ interface Constants {
  String DBJSONB = "io.ebean.annotation.DbJsonB";
  String DBNAME = "io.ebean.annotation.DbName";

+  String TQROOTBEAN = "io.ebean.typequery.TQRootBean";
  String TQASSOC = "io.ebean.typequery.TQAssoc";
  String TQASSOCBEAN = "io.ebean.typequery.TQAssocBean";
  String TQPROPERTY = "io.ebean.typequery.TQProperty";
+  String TYPEQUERYBEAN = "io.ebean.typequery.TypeQueryBean";
+  String DATABASE = "io.ebean.Database";
+  String DB = "io.ebean.DB";
+  String FETCHGROUP = "io.ebean.FetchGroup";
+  String QUERY = "io.ebean.Query";
+  String TRANSACTION = "io.ebean.Transaction";

  String MODULEINFO = "io.ebean.config.ModuleInfo";
  String METAINF_MANIFEST = "META-INF/ebean-generated-info.mf";
@@ -3,7 +3,17 @@ package io.ebean.querybean.generator;
 class KotlinLangAdapter implements LangAdapter {

  @Override
-  public void alias(Append writer, String shortName, String fullName) {
+  public void beginClass(Append writer, String shortName) {
+    writer.append("class Q%s : TQRootBean<%1$s, Q%1$s> {", shortName).eol();
+  }
+
+  @Override
+  public void beginAssocClass(Append writer, String shortName, String origShortName) {
+//    writer.append("class Q%s<R> : TQAssocBean<%s,R> {", shortName, origShortName).eol();
+  }
+
+  @Override
+  public void alias(Append writer, String shortName) {
    writer.append("  companion object {").eol();
    writer.append("    /**").eol();
    writer.append("     * shared 'Alias' instance used to provide").eol();
@@ -15,7 +25,7 @@ class KotlinLangAdapter implements LangAdapter {
    writer.append("     * Return a query bean used to build a FetchGroup.").eol();
    writer.append("     */").eol();
    writer.append("    fun forFetchGroup(): Q%s {", shortName).eol();
-    writer.append("      return Q%s(io.ebean.FetchGroup.queryFor(%s::class.java));", shortName, fullName).eol();
+    writer.append("      return Q%s(FetchGroup.queryFor(%s::class.java));", shortName, shortName).eol();
    writer.append("    }").eol();
    writer.append("  }").eol().eol();
  }
@@ -49,31 +59,31 @@ class KotlinLangAdapter implements LangAdapter {
  }

  @Override
-  public void rootBeanConstructor(Append writer, String shortName, String dbName, String fullName) {
+  public void rootBeanConstructor(Append writer, String shortName, String dbName) {
    String name = (dbName == null) ? "default" : dbName;
    writer.append("  /**").eol();
    writer.append("   * Construct using the %s Database.", name).eol();
    writer.append("   */").eol();
    if (dbName == null) {
-      writer.append("  constructor() : super(%s::class.java)", fullName).eol().eol();
+      writer.append("  constructor() : super(%s::class.java)", shortName).eol().eol();
    } else {
-      writer.append("  constructor() : super(%s::class.java, io.ebean.DB.byName(\"%s\"))", fullName, dbName).eol().eol();
+      writer.append("  constructor() : super(%s::class.java, DB.byName(\"%s\"))", shortName, dbName).eol().eol();
    }

    writer.append("  /**").eol();
    writer.append("   * Construct with a given Transaction.", name).eol();
    writer.append("   */").eol();
    if (dbName == null) {
-      writer.append("  constructor(transaction: io.ebean.Transaction) : super(%s::class.java, transaction)", fullName).eol().eol();
+      writer.append("  constructor(transaction: Transaction) : super(%s::class.java, transaction)", shortName).eol().eol();
    } else {
-      writer.append("  constructor(transaction: io.ebean.Transaction) : super(%s::class.java, io.ebean.DB.byName(\"%s\"), transaction)", fullName, dbName).eol().eol();
+      writer.append("  constructor(transaction: Transaction) : super(%s::class.java, DB.byName(\"%s\"), transaction)", shortName, dbName).eol().eol();
    }

    writer.eol();
    writer.append("  /**").eol();
    writer.append("   * Construct with a given Database.").eol();
    writer.append("   */").eol();
-    writer.append("  constructor(database: io.ebean.Database) : super(%s::class.java, database)", fullName).eol().eol();
+    writer.append("  constructor(database: Database) : super(%s::class.java, database)", shortName).eol().eol();

    writer.append("  /**").eol();
    writer.append("   * Construct for Alias.").eol();
@@ -83,7 +93,7 @@ class KotlinLangAdapter implements LangAdapter {
    writer.append("  /**").eol();
    writer.append("   * Private constructor for FetchGroup building.").eol();
    writer.append("   */").eol();
-    writer.append("  private constructor(fetchGroupQuery: io.ebean.Query<%s>) : super(fetchGroupQuery)", fullName).eol();
+    writer.append("  private constructor(fetchGroupQuery: Query<%s>) : super(fetchGroupQuery)", shortName).eol();

    writer.eol();
    writer.append("  /** Return a copy of the query. */").eol();
@@ -2,10 +2,13 @@ package io.ebean.querybean.generator;

 public interface LangAdapter {

+  void beginClass(Append writer, String shortName);

-  void alias(Append writer, String shortName, String beanFullName);
+  void beginAssocClass(Append writer, String shortName, String origShortName);

-  void rootBeanConstructor(Append writer, String shortName, String dbName, String beanFullName);
+  void alias(Append writer, String shortName);
+
+  void rootBeanConstructor(Append writer, String shortName, String dbName);

  void assocBeanConstructor(Append writer, String shortName);

@@ -91,6 +91,7 @@ class SimpleModuleInfoWriter {
    writer.append("import java.util.ArrayList;").eol();
    writer.append("import java.util.Collections;").eol();
    writer.append("import java.util.List;").eol();
+    writer.append("import %s;", Constants.GENERATED).eol();
    writer.eol();
    writer.append("import io.ebean.config.ModuleInfo;").eol();
    writer.append("import io.ebean.config.EntityClassRegister;").eol();
@@ -123,11 +123,22 @@ class SimpleQueryBeanWriter {
  }

  private void gatherPropertyDetails() {
+    importTypes.add(Constants.GENERATED);
+    importTypes.add(beanFullName);
+    importTypes.add(Constants.TQROOTBEAN);
+    importTypes.add(Constants.TYPEQUERYBEAN);
+    importTypes.add(Constants.DATABASE);
+    importTypes.add(Constants.FETCHGROUP);
+    importTypes.add(Constants.QUERY);
+    importTypes.add(Constants.TRANSACTION);
    if (implementsInterface != null) {
      implementsInterfaceFullName = implementsInterface.getQualifiedName().toString();
      boolean nested = implementsInterface.getNestingKind().isNested();
      implementsInterfaceShortName = Util.shortName(nested, implementsInterfaceFullName);
    }
+    if (dbName != null) {
+      importTypes.add(Constants.DB);
+    }
    addClassProperties();
  }

@@ -219,6 +230,12 @@ class SimpleQueryBeanWriter {
   * Prepare the imports for writing assoc bean.
   */
  private void prepareAssocBeanImports() {
+
+    importTypes.remove(Constants.DB);
+    importTypes.remove(Constants.TQROOTBEAN);
+    importTypes.remove(Constants.DATABASE);
+    importTypes.remove(Constants.FETCHGROUP);
+    importTypes.remove(Constants.QUERY);
    if (embeddable) {
      importTypes.add(Constants.TQASSOC);
    } else {
@@ -249,6 +266,7 @@ class SimpleQueryBeanWriter {
   * Write constructors.
   */
  private void writeConstructors() {
+
    if (writingAssocBean) {
      writeAssocBeanFetch();
      writeAssocBeanConstructor();
@@ -261,7 +279,7 @@ class SimpleQueryBeanWriter {
   * Write the constructors for 'root' type query bean.
   */
  private void writeRootBeanConstructor() {
-    lang().rootBeanConstructor(writer, shortName, dbName, beanFullName);
+    lang().rootBeanConstructor(writer, shortName, dbName);
  }

  private void writeAssocBeanFetch() {
@@ -297,6 +315,7 @@ class SimpleQueryBeanWriter {
   * Write constructor for 'assoc' type query bean.
   */
  private void writeAssocBeanConstructor() {
+
    lang().assocBeanConstructor(writer, shortName);
  }

@@ -325,10 +344,11 @@ class SimpleQueryBeanWriter {
      writer.append(Constants.AT_GENERATED).eol();
      writer.append(Constants.AT_TYPEQUERYBEAN).eol();
      if (embeddable) {
-        writer.append("class Q%s<R> : TQAssoc<%s,R> {", shortName, beanFullName).eol();
+        writer.append("class Q%s<R> : TQAssoc<%s,R> {", shortName, shortInnerName).eol();
      } else {
-        writer.append("class Q%s<R> : TQAssocBean<%s,R,Q%s> {", shortName, beanFullName, origShortName).eol();
+        writer.append("class Q%s<R> : TQAssocBean<%s,R,Q%s> {", shortName, shortInnerName, origShortName).eol();
      }
+
    } else {
      writer.append("/**").eol();
      writer.append(" * Query bean for %s.", shortName).eol();
@@ -337,7 +357,7 @@ class SimpleQueryBeanWriter {
      writer.append(" */").eol();
      writer.append(Constants.AT_GENERATED).eol();
      writer.append(Constants.AT_TYPEQUERYBEAN).eol();
-      writer.append("class Q%s : io.ebean.typequery.TQRootBean<%s, Q%s> {", shortName, beanFullName, shortName).eol();
+      lang().beginClass(writer, shortName);
    }

    writer.eol();
@@ -345,7 +365,7 @@ class SimpleQueryBeanWriter {

  private void writeAlias() {
    if (!writingAssocBean) {
-      lang().alias(writer, shortName, beanFullName);
+      lang().alias(writer, shortName);
    }
  }

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,67 +15,67 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

    <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.1</version>
+    <version>14.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

@@ -15,13 +15,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

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

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.0.1</version>
+      <version>14.0.0</version>
    </dependency>

  </dependencies>
--- a/Show More
+++ b/Show More