Update 15x branch

[15x] Remove Inheritance support
[15x] Remove "Future queries" findFutureList, findFutureIds, findFutureCount
2024-04-21 10:51:47 +00:00 · 2023-10-10 23:45:08 +13:00 · 2023-10-10 23:45:08 +13:00 · 2023-10-10 23:45:08 +13:00 · 2023-10-10 23:45:08 +13:00 · 2023-10-10 23:45:08 +13:00
758 changed files with 7208 additions and 37291 deletions
@@ -1,10 +1,7 @@

 name: Build

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

 jobs:
  build:
@@ -34,8 +34,6 @@ jobs:
        path:
          ~/.m2
        key: build-${{ env.cache-name }}
-    - name: Maven version
-      run: mvn --version
    - name: Build with Maven
      run: mvn package

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</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.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -47,19 +47,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-postgis-types</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,31 +17,31 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -60,13 +60,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
  </parent>

  <artifactId>composites</artifactId>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</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.8</version>
    </dependency>

    <dependency>
@@ -107,6 +107,13 @@
    </dependency>
    <!-- JAKARTA-DEPENDENCY-END -->

+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
  </dependencies>

  <build>
@@ -155,10 +155,4 @@ public abstract class BeanFinder<I,T> {
    return db().findNative(type, nativeSql);
  }

-  /**
-   * Creates a query using the ORM query language.
-   */
-  protected Query<T> query(String ormQuery) {
-    return db().createQuery(type, ormQuery);
-  }
 }
@@ -266,6 +266,55 @@ public final class DB {
    getDefault().register(transactionCallback);
  }

+  /**
+   * Deprecated for removal migrate using try-with-resources and commit on the transaction itself.
+   * <p>
+   * Commit the current transaction.
+   */
+  @Deprecated(forRemoval = true)
+  public static void commitTransaction() {
+    getDefault().commitTransaction();
+  }
+
+  /**
+   * Deprecated for removal migrate to using try-with-resources and rollback on the transaction itself.
+   * <p>
+   * Rollback the current transaction.
+   */
+  @Deprecated(forRemoval = true)
+  public static void rollbackTransaction() {
+    getDefault().rollbackTransaction();
+  }
+
+  /**
+   * If the current transaction has already been committed do nothing otherwise
+   * rollback the transaction.
+   * <p>
+   * It is preferable to use <em>try with resources</em> rather than this.
+   * <p>
+   * Useful to put in a finally block to ensure the transaction is ended, rather
+   * than a rollbackTransaction() in each catch block.
+   * <p>
+   * Code example:
+   *
+   * <pre>{@code
+   *   DB.beginTransaction();
+   *   try {
+   *     // do some fetching and or persisting
+   *
+   *     // commit at the end
+   *     DB.commitTransaction();
+   *
+   *   } finally {
+   *     // if commit didn't occur then rollback the transaction
+   *     DB.endTransaction();
+   *   }
+   * }</pre>
+   */
+  public static void endTransaction() {
+    getDefault().endTransaction();
+  }
+
  /**
   * Mark the current transaction as rollback only.
   */
@@ -741,21 +790,6 @@ public final class DB {
    return getDefault().createUpdate(beanType, ormUpdate);
  }

-
-  /**
-   * Create a named query.
-   * <p>
-   * For RawSql the named query is expected to be in ebean.xml.
-   *
-   * @param beanType   The type of entity bean
-   * @param namedQuery The name of the query
-   * @param <T>        The type of entity bean
-   * @return The query
-   */
-  public static <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery) {
-    return getDefault().createNamedQuery(beanType, namedQuery);
-  }
-
  /**
   * Create a query for a type of entity bean.
   * <p>
@@ -775,43 +809,6 @@ public final class DB {
    return getDefault().createQuery(beanType);
  }

-  /**
-   * Parse the Ebean query language statement returning the query which can then
-   * be modified (add expressions, change order by clause, change maxRows, change
-   * fetch and select paths etc).
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *   // Find order additionally fetching the customer, details and details.product name.
-   *
-   *   String eql = "fetch customer fetch details fetch details.product (name) where id = :orderId ";
-   *
-   *   Query<Order> query = DB.createQuery(Order.class, eql);
-   *   query.setParameter("orderId", 2);
-   *
-   *   Order order = query.findOne();
-   *
-   *   // This is the same as:
-   *
-   *   Order order = DB.find(Order.class)
-   *     .fetch("customer")
-   *     .fetch("details")
-   *     .fetch("detail.product", "name")
-   *     .setId(2)
-   *     .findOne();
-   *
-   * }</pre>
-   *
-   * @param beanType The type of bean to fetch
-   * @param eql      The Ebean query
-   * @param <T>      The type of the entity bean
-   * @return The query with expressions defined as per the parsed query statement
-   */
-  public static <T> Query<T> createQuery(Class<T> beanType, String eql) {
-    return getDefault().createQuery(beanType, eql);
-  }
-
  /**
   * Create a query for a type of entity bean.
   * <p>
@@ -1,104 +0,0 @@
-package io.ebean;
-
-final class DInsertOptionsBuilder implements InsertOptions.Builder {
-
-  private Boolean getGeneratedKeys;
-  private boolean onConflictUpdate;
-  private boolean onConflictNothing;
-  private String constraint;
-  private String uniqueColumns;
-  private String updateSet;
-
-  @Override
-  public InsertOptions.Builder onConflictNothing() {
-    this.onConflictNothing = true;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder onConflictUpdate() {
-    this.onConflictUpdate = true;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder constraint(String constraint) {
-    this.constraint = constraint;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder uniqueColumns(String uniqueColumns) {
-    this.uniqueColumns = uniqueColumns;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder updateSet(String updateSet) {
-    this.updateSet = updateSet;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder getGeneratedKeys(boolean getGeneratedKeys) {
-    this.getGeneratedKeys = getGeneratedKeys;
-    return this;
-  }
-
-  @Override
-  public InsertOptions build() {
-    return new Options(constraint, uniqueColumns, updateSet, onConflictUpdate, onConflictNothing, getGeneratedKeys);
-  }
-
-  static final class Options implements InsertOptions {
-
-    private static final String UPDATE = "U";
-    private static final String NOTHING = "N";
-    private static final String NORMAL = "_";
-    private final String key;
-    private final Boolean getGeneratedKeys;
-    private final String constraint;
-    private final String uniqueColumns;
-    private final String updateSet;
-
-    Options(String constraint, String uniqueColumns, String updateSet, boolean onConflictUpdate, boolean onConflictNothing, Boolean getGeneratedKeys) {
-      this.constraint = constraint;
-      this.uniqueColumns = uniqueColumns;
-      this.updateSet = updateSet;
-      this.getGeneratedKeys = getGeneratedKeys;
-      this.key = (onConflictUpdate ? UPDATE : onConflictNothing ? NOTHING : NORMAL)
-        + '+' + plus(constraint)
-        + '+' + plus(uniqueColumns)
-        + '+' + plus(updateSet);
-    }
-
-    private String plus(String val) {
-      return val == null ? "" : val;
-    }
-
-    @Override
-    public String key() {
-      return key;
-    }
-
-    @Override
-    public String constraint() {
-      return constraint;
-    }
-
-    @Override
-    public String uniqueColumns() {
-      return uniqueColumns;
-    }
-
-    @Override
-    public String updateSet() {
-      return updateSet;
-    }
-
-    @Override
-    public Boolean getGetGeneratedKeys() {
-      return getGeneratedKeys;
-    }
-  }
-}
@@ -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);
-  }
 }
@@ -42,7 +42,7 @@ import java.util.concurrent.Callable;
 * <h5>Constructing a Database</h5>
 * <p>
 * Databases are constructed by the DatabaseFactory. They can be created
- * programmatically via {@link DatabaseFactory#create(DatabaseBuilder)} or they
+ * programmatically via {@link DatabaseFactory#create(DatabaseConfig)} or they
 * can be automatically constructed on demand using configuration information in
 * the application.properties file.
 *
@@ -86,23 +86,6 @@ import java.util.concurrent.Callable;
@NonNullApi
 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>
-   */
-  static DatabaseBuilder builder() {
-    return new DatabaseConfig();
-  }
-
  /**
   * Shutdown the Database instance.
   */
@@ -242,18 +225,6 @@ public interface Database {
   */
  <T> UpdateQuery<T> update(Class<T> beanType);

-  /**
-   * Create a named query.
-   * <p>
-   * For RawSql the named query is expected to be in ebean.xml.
-   *
-   * @param beanType   The type of entity bean
-   * @param namedQuery The name of the query
-   * @param <T>        The type of entity bean
-   * @return The query
-   */
-  <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery);
-
  /**
   * Create a query for an entity bean and synonym for {@link #find(Class)}.
   *
@@ -261,41 +232,6 @@ public interface Database {
   */
  <T> Query<T> createQuery(Class<T> beanType);

-  /**
-   * Parse the Ebean query language statement returning the query which can then
-   * be modified (add expressions, change order by clause, change maxRows, change
-   * fetch and select paths etc).
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *   // Find order additionally fetching the customer, details and details.product name.
-   *
-   *   String ormQuery = "fetch customer fetch details fetch details.product (name) where id = :orderId ";
-   *
-   *   Query<Order> query = DB.createQuery(Order.class, ormQuery);
-   *   query.setParameter("orderId", 2);
-   *
-   *   Order order = query.findOne();
-   *
-   *   // This is the same as:
-   *
-   *   Order order = DB.find(Order.class)
-   *     .fetch("customer")
-   *     .fetch("details")
-   *     .fetch("detail.product", "name")
-   *     .setId(2)
-   *     .findOne();
-   *
-   * }</pre>
-   *
-   * @param beanType The type of bean to fetch
-   * @param ormQuery The Ebean ORM query
-   * @param <T>      The type of the entity bean
-   * @return The query with expressions defined as per the parsed query statement
-   */
-  <T> Query<T> createQuery(Class<T> beanType, String ormQuery);
-
  /**
   * Create a query for a type of entity bean.
   * <p>
@@ -459,18 +395,6 @@ public interface Database {
   */
  <T> DtoQuery<T> findDto(Class<T> dtoType, String sql);

-  /**
-   * Create a named Query for DTO beans.
-   * <p>
-   * DTO beans are just normal bean like classes with public constructor(s) and setters.
-   * They do not need to be registered with DB before use.
-   *
-   * @param dtoType    The type of the DTO bean the rows will be mapped into.
-   * @param namedQuery The name of the query
-   * @param <T>        The type of the DTO bean.
-   */
-  <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery);
-
  /**
   * Look to execute a native sql query that does not return beans but instead
   * returns SqlRow or direct access to ResultSet.
@@ -666,6 +590,49 @@ public interface Database {
   */
  void flush();

+  /**
+   * Deprecated for removal migrate using try-with-resources and commit on the transaction itself.
+   * <p>
+   * Commit the current transaction.
+   */
+  @Deprecated(forRemoval = true)
+  void commitTransaction();
+
+  /**
+   * Deprecated for removal migrate to using try-with-resources and rollback on the transaction itself.
+   * <p>
+   * Rollback the current transaction.
+   */
+  @Deprecated(forRemoval = true)
+  void rollbackTransaction();
+
+  /**
+   * If the current transaction has already been committed do nothing otherwise
+   * rollback the transaction.
+   * <p>
+   * Useful to put in a finally block to ensure the transaction is ended, rather
+   * than a rollbackTransaction() in each catch block.
+   * <p>
+   * Code example:
+   * <p>
+   * <pre>{@code
+   *
+   *   database.beginTransaction();
+   *   try {
+   *     // do some fetching and or persisting ...
+   *
+   *     // commit at the end
+   *     database.commitTransaction();
+   *
+   *   } finally {
+   *     // if commit didn't occur then rollback the transaction
+   *     database.endTransaction();
+   *   }
+   *
+   * }</pre>
+   */
+  void endTransaction();
+
  /**
   * Refresh the values of a bean.
   * <p>
@@ -1184,53 +1151,22 @@ public interface Database {
   */
  void insert(Object bean);

-  /**
-   * Insert the bean with options (ON CONFLICT DO UPDATE | DO NOTHING).
-   * <p>
-   * Currently, this is limited to use with Postgres only,
-   * <p>
-   * When using this ebean will look to determine the unique columns by looking at
-   * the mapping like {@code @Column(unique=true} and {@code @Index(unique=true}.
-   */
-  void insert(Object bean, InsertOptions insertOptions);
-
  /**
   * Insert the bean with a transaction.
   */
  void insert(Object bean, Transaction transaction);

-  /**
-   * Insert the beans with options (ON CONFLICT DO UPDATE | DO NOTHING) and transaction.
-   * <p>
-   * Currently, this is limited to use with Postgres only,
-   */
-  void insert(Object bean, InsertOptions insertOptions, Transaction transaction);
-
  /**
   * Insert a collection of beans. If there is no current transaction one is created and used to
   * insert all the beans in the collection.
   */
  void insertAll(Collection<?> beans);

-  /**
-   * Insert the beans with options - typically ON CONFLICT DO UPDATE | DO NOTHING.
-   * <p>
-   * Currently, this is limited to use with Postgres only,
-   */
-  void insertAll(Collection<?> beans, InsertOptions options);
-
  /**
   * Insert a collection of beans with an explicit transaction.
   */
  void insertAll(Collection<?> beans, Transaction transaction);

-  /**
-   * Insert the beans with options (ON CONFLICT DO UPDATE | DO NOTHING) and transaction.
-   * <p>
-   * Currently, this is limited to use with Postgres only,
-   */
-  void insertAll(Collection<?> beans, InsertOptions options, Transaction transaction);
-
  /**
   * Execute explicitly passing a transaction.
   */
@@ -1385,109 +1321,6 @@ public interface Database {
   */
  ScriptRunner script();

-  /**
-   * Return the Document store.
-   */
-  DocumentStore docStore();
-
-  /**
-   * Publish a single bean given its type and id returning the resulting live bean.
-   * <p>
-   * The values are published from the draft to the live bean.
-   *
-   * @param <T>         the type of the entity bean
-   * @param beanType    the type of the entity bean
-   * @param id          the id of the entity bean
-   * @param transaction the transaction the publish process should use (can be null)
-   */
-  @Nullable
-  <T> T publish(Class<T> beanType, Object id, Transaction transaction);
-
-  /**
-   * Publish a single bean given its type and id returning the resulting live bean.
-   * This will use the current transaction or create one if required.
-   * <p>
-   * The values are published from the draft to the live bean.
-   *
-   * @param <T>      the type of the entity bean
-   * @param beanType the type of the entity bean
-   * @param id       the id of the entity bean
-   */
-  @Nullable
-  <T> T publish(Class<T> beanType, Object id);
-
-  /**
-   * Publish the beans that match the query returning the resulting published beans.
-   * <p>
-   * The values are published from the draft beans to the live beans.
-   *
-   * @param <T>         the type of the entity bean
-   * @param query       the query used to select the draft beans to publish
-   * @param transaction the transaction the publish process should use (can be null)
-   */
-  <T> List<T> publish(Query<T> query, Transaction transaction);
-
-  /**
-   * Publish the beans that match the query returning the resulting published beans.
-   * This will use the current transaction or create one if required.
-   * <p>
-   * The values are published from the draft beans to the live beans.
-   *
-   * @param <T>   the type of the entity bean
-   * @param query the query used to select the draft beans to publish
-   */
-  <T> List<T> publish(Query<T> query);
-
-  /**
-   * Restore the draft bean back to the live state.
-   * <p>
-   * The values from the live beans are set back to the draft bean and the
-   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
-   *
-   * @param <T>         the type of the entity bean
-   * @param beanType    the type of the entity bean
-   * @param id          the id of the entity bean to restore
-   * @param transaction the transaction the restore process should use (can be null)
-   */
-  @Nullable
-  <T> T draftRestore(Class<T> beanType, Object id, Transaction transaction);
-
-  /**
-   * Restore the draft bean back to the live state.
-   * <p>
-   * The values from the live beans are set back to the draft bean and the
-   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
-   *
-   * @param <T>      the type of the entity bean
-   * @param beanType the type of the entity bean
-   * @param id       the id of the entity bean to restore
-   */
-  @Nullable
-  <T> T draftRestore(Class<T> beanType, Object id);
-
-  /**
-   * Restore the draft beans matching the query back to the live state.
-   * <p>
-   * The values from the live beans are set back to the draft bean and the
-   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
-   *
-   * @param <T>         the type of the entity bean
-   * @param query       the query used to select the draft beans to restore
-   * @param transaction the transaction the restore process should use (can be null)
-   */
-  <T> List<T> draftRestore(Query<T> query, Transaction transaction);
-
-  /**
-   * Restore the draft beans matching the query back to the live state.
-   * <p>
-   * The values from the live beans are set back to the draft bean and the
-   * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
-   *
-   * @param <T>   the type of the entity bean
-   * @param query the query used to select the draft beans to restore
-   */
-  <T> List<T> draftRestore(Query<T> query);
-
  /**
   * Returns the set of properties/paths that are unknown (do not map to known properties or paths).
   * <p>
@@ -1,11 +1,13 @@
 package io.ebean;

 import io.ebean.config.ContainerConfig;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.service.SpiContainer;
 import io.ebean.service.SpiContainerFactory;
-import jakarta.persistence.PersistenceException;

+import jakarta.persistence.PersistenceException;
 import java.util.Iterator;
+import java.util.Properties;
 import java.util.ServiceLoader;
 import java.util.concurrent.locks.ReentrantLock;

@@ -74,10 +76,9 @@ public final class DatabaseFactory {
   *
   * }</pre>
   */
-  public static Database create(DatabaseBuilder builder) {
+  public static Database create(DatabaseConfig config) {
    lock.lock();
    try {
-      var config = builder.settings();
      if (config.getName() == null) {
        throw new PersistenceException("The name is null (it is required)");
      }
@@ -101,7 +102,7 @@ public final class DatabaseFactory {
  /**
   * Create using the DatabaseConfig additionally specifying a classLoader to use as the context class loader.
   */
-  public static Database createWithContextClassLoader(DatabaseBuilder config, ClassLoader classLoader) {
+  public static Database createWithContextClassLoader(DatabaseConfig config, ClassLoader classLoader) {
    lock.lock();
    try {
      ClassLoader currentContextLoader = Thread.currentThread().getContextClassLoader();
@@ -131,7 +132,7 @@ public final class DatabaseFactory {
    }
  }

-  private static Database createInternal(DatabaseBuilder.Settings config) {
+  private static Database createInternal(DatabaseConfig config) {
    return container(config.getContainerConfig()).createServer(config);
  }

@@ -145,9 +146,12 @@ public final class DatabaseFactory {
    if (container != null) {
      return container;
    }
+
    if (containerConfig == null) {
      // effectively load configuration from ebean.properties
+      Properties properties = DbPrimary.getProperties();
      containerConfig = new ContainerConfig();
+      containerConfig.loadFromProperties(properties);
    }
    container = createContainer(containerConfig);
    return container;
@@ -156,7 +160,7 @@ public final class DatabaseFactory {
  /**
   * Create the container instance using the configuration.
   */
-  private static SpiContainer createContainer(ContainerConfig containerConfig) {
+  protected static SpiContainer createContainer(ContainerConfig containerConfig) {
    Iterator<SpiContainerFactory> factories = ServiceLoader.load(SpiContainerFactory.class).iterator();
    if (factories.hasNext()) {
      return factories.next().create(containerConfig);
@@ -44,12 +44,25 @@ final class DbPrimary {
   * Return the default database name.
   */
  static String getDefaultServerName() {
+    lock.lock();
+    try {
+      getProperties();
+      return defaultServerName;
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  /**
+   * Return the default configuration Properties.
+   */
+  static Properties getProperties() {
    lock.lock();
    try {
      if (defaultServerName == null) {
        defaultServerName = determineDefaultServerName();
      }
-      return defaultServerName;
+      return Config.asProperties();
    } finally {
      lock.unlock();
    }
@@ -1,94 +0,0 @@
-package io.ebean;
-
-/**
- * Bean holding the details to update the document store.
- */
-public final class DocStoreQueueEntry {
-
-  /**
-   * Action to either update or delete a document from the index.
-   */
-  public enum Action {
-
-    /**
-     * Action is to update a document in the doc store.
-     */
-    INDEX(1),
-
-    /**
-     * Action is to delete a document from the doc store..
-     */
-    DELETE(2),
-
-    /**
-     * An update is required based on a change to a nested/embedded object at a given path.
-     */
-    NESTED(3);
-
-    int value;
-
-    Action(int value) {
-      this.value = value;
-    }
-
-    /**
-     * Return the value associated with this action type.
-     */
-    public int getValue() {
-      return value;
-    }
-  }
-
-  private final Action type;
-
-  private final String queueId;
-
-  private final String path;
-
-  private final Object beanId;
-
-  /**
-   * Construct for an INDEX or DELETE action.
-   */
-  public DocStoreQueueEntry(Action type, String queueId, Object beanId) {
-    this(type, queueId, null, beanId);
-  }
-
-  /**
-   * Construct for an NESTED/embedded path invalidation action.
-   */
-  public DocStoreQueueEntry(Action type, String queueId, String path, Object beanId) {
-    this.type = type;
-    this.queueId = queueId;
-    this.path = path;
-    this.beanId = beanId;
-  }
-
-  /**
-   * Return the event type.
-   */
-  public Action getType() {
-    return type;
-  }
-
-  /**
-   * Return the associate queueId.
-   */
-  public String getQueueId() {
-    return queueId;
-  }
-
-  /**
-   * Return the path if this is a nested update.
-   */
-  public String getPath() {
-    return path;
-  }
-
-  /**
-   * Return the bean id (which matches the document id).
-   */
-  public Object getBeanId() {
-    return beanId;
-  }
-}
@@ -1,312 +0,0 @@
-package io.ebean;
-
-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
-import io.ebean.docstore.DocQueryContext;
-import io.ebean.docstore.RawDoc;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-/**
- * Document storage operations.
- */
-@NonNullApi
-public interface DocumentStore {
-
-  /**
-   * Update the associated document store using the result of the query.
-   * <p>
-   * This will execute the query against the database creating a document for each
-   * bean graph and sending this to the document store.
-   * </p>
-   * <p>
-   * Note that the select and fetch paths of the query is set for you to match the
-   * document structure needed based on <code>@DocStore</code> and <code>@DocStoreEmbedded</code>
-   * so what this query requires is the predicates only.
-   * </p>
-   * <p>
-   * This query will be executed using findEach so it is safe to use a query
-   * that will fetch a lot of beans. The default bulkBatchSize is used.
-   * </p>
-   *
-   * @param query The query that selects object to send to the document store.
-   */
-  <T> void indexByQuery(Query<T> query);
-
-  /**
-   * Update the associated document store index using the result of the query additionally specifying a
-   * bulkBatchSize to use for sending the messages to ElasticSearch.
-   *
-   * @param query         The query that selects object to send to the document store.
-   * @param bulkBatchSize The batch size to use when bulk sending to the document store.
-   */
-  <T> void indexByQuery(Query<T> query, int bulkBatchSize);
-
-  /**
-   * Update the document store for all beans of this type.
-   * <p>
-   * This is the same as indexByQuery where the query has no predicates and so fetches all rows.
-   * </p>
-   */
-  void indexAll(Class<?> beanType);
-
-  /**
-   * Return the bean by fetching it's content from the document store.
-   * If the document is not found null is returned.
-   * <p>
-   * Typically this is called indirectly by findOne() on the query.
-   * </p>
-   * <pre>{@code
-   *
-   * Customer customer =
-   *   database.find(Customer.class)
-   *     .setUseDocStore(true)
-   *     .setId(42)
-   *     .findOne();
-   *
-   * }</pre>
-   */
-  @Nullable
-  <T> T find(DocQueryContext<T> request);
-
-  /**
-   * Execute the find list query. This request is prepared to execute secondary queries.
-   * <p>
-   * Typically this is called indirectly by findList() on the query that has setUseDocStore(true).
-   * </p>
-   * <pre>{@code
-   *
-   * List<Customer> newCustomers =
-   *  database.find(Customer.class)
-   *    .setUseDocStore(true)
-   *    .where().eq("status, Customer.Status.NEW)
-   *    .findList();
-   *
-   * }</pre>
-   */
-  <T> List<T> findList(DocQueryContext<T> request);
-
-  /**
-   * Execute the query against the document store returning the paged list.
-   * <p>
-   * The query should have <code>firstRow</code> or <code>maxRows</code> set prior to calling this method.
-   * </p>
-   * <p>
-   * Typically this is called indirectly by findPagedList() on the query that has setUseDocStore(true).
-   * </p>
-   * <pre>{@code
-   *
-   * PagedList<Customer> newCustomers =
-   *  database.find(Customer.class)
-   *    .setUseDocStore(true)
-   *    .where().eq("status, Customer.Status.NEW)
-   *    .setMaxRows(50)
-   *    .findPagedList();
-   *
-   * }</pre>
-   */
-  <T> PagedList<T> findPagedList(DocQueryContext<T> request);
-
-  /**
-   * Execute the query against the document store with the expectation of a large set of results
-   * that are processed in a scrolling resultSet fashion.
-   * <p>
-   * For example, with the ElasticSearch doc store this uses SCROLL.
-   * </p>
-   * <p>
-   * Typically this is called indirectly by findEach() on the query that has setUseDocStore(true).
-   * </p>
-   * <pre>{@code
-   *
-   *  database.find(Order.class)
-   *    .setUseDocStore(true)
-   *    .where()... // perhaps add predicates
-   *    .findEach((Order order) -> {
-   *      // process the bean ...
-   *    });
-   *
-   * }</pre>
-   */
-  <T> void findEach(DocQueryContext<T> query, Consumer<T> consumer);
-
-  /**
-   * Execute the query against the document store with the expectation of a large set of results
-   * that are processed in a scrolling resultSet fashion.
-   * <p>
-   * Unlike findEach() this provides the opportunity to stop iterating through the large query.
-   * </p>
-   * <p>
-   * For example, with the ElasticSearch doc store this uses SCROLL.
-   * </p>
-   * <p>
-   * Typically this is called indirectly by findEachWhile() on the query that has setUseDocStore(true).
-   * </p>
-   * <pre>{@code
-   *
-   *  database.find(Order.class)
-   *    .setUseDocStore(true)
-   *    .where()... // perhaps add predicates
-   *    .findEachWhile(new Predicate<Order>() {
-   *      @Override
-   *      public void accept(Order bean) {
-   *        // process the bean
-   *
-   *        // return true to continue, false to stop
-   *        // boolean shouldContinue = ...
-   *        return shouldContinue;
-   *      }
-   *    });
-   *
-   * }</pre>
-   */
-  <T> void findEachWhile(DocQueryContext<T> query, Predicate<T> consumer);
-
-  /**
-   * Find each processing raw documents.
-   *
-   * @param indexNameType The full index name and type
-   * @param rawQuery      The query to execute
-   * @param consumer      Consumer to process each document
-   */
-  void findEach(String indexNameType, String rawQuery, Consumer<RawDoc> consumer);
-
-  /**
-   * Find each processing raw documents stopping when the predicate returns false.
-   *
-   * @param indexNameType The full index name and type
-   * @param rawQuery      The query to execute
-   * @param consumer      Consumer to process each document until false is returned
-   */
-  void findEachWhile(String indexNameType, String rawQuery, Predicate<RawDoc> consumer);
-
-  /**
-   * Process the queue entries sending updates to the document store or queuing them for later processing.
-   */
-  long process(List<DocStoreQueueEntry> queueEntries) throws IOException;
-
-  /**
-   * Drop the index from the document store (similar to DDL drop table).
-   * <pre>{@code
-   *
-   *   DocumentStore documentStore = database.docStore();
-   *
-   *   documentStore.dropIndex("product_copy");
-   *
-   * }</pre>
-   */
-  void dropIndex(String indexName);
-
-  /**
-   * Create an index given a mapping file as a resource in the classPath (similar to DDL create table).
-   * <pre>{@code
-   *
-   *   DocumentStore documentStore = database.docStore();
-   *
-   *   // uses product_copy.mapping.json resource
-   *   // ... to define mappings for the index
-   *
-   *   documentStore.createIndex("product_copy", null);
-   *
-   * }</pre>
-   *
-   * @param indexName the name of the new index
-   * @param alias     the alias of the index
-   */
-  void createIndex(String indexName, String alias);
-
-  /**
-   * Modify the settings on an index.
-   * <p>
-   * For example, this can be used be used to set elasticSearch refresh_interval
-   * on an index before a bulk update.
-   * </p>
-   * <pre>{@code
-   *
-   *   // refresh_interval -1 ... disable refresh while bulk loading
-   *
-   *   Map<String,Object> settings = new LinkedHashMap<>();
-   *   settings.put("refresh_interval", "-1");
-   *
-   *   documentStore.indexSettings("product", settings);
-   *
-   * }</pre>
-   * <pre>{@code
-   *
-   *   // refresh_interval 1s ... restore after bulk loading
-   *
-   *   Map<String,Object> settings = new LinkedHashMap<>();
-   *   settings.put("refresh_interval", "1s");
-   *
-   *   documentStore.indexSettings("product", settings);
-   *
-   * }</pre>
-   *
-   * @param indexName the name of the index to update settings on
-   * @param settings  the settings to set on the index
-   */
-  void indexSettings(String indexName, Map<String, Object> settings);
-
-  /**
-   * Copy the index to a new index.
-   * <p>
-   * This copy process does not use the database but instead will copy from the source index to a destination index.
-   * </p>
-   * <pre>{@code
-   *
-   *  long copyCount = documentStore.copyIndex(Product.class, "product_copy");
-   *
-   * }</pre>
-   *
-   * @param beanType The bean type of the source index
-   * @param newIndex The name of the index to copy to
-   * @return the number of documents copied to the new index
-   */
-  long copyIndex(Class<?> beanType, String newIndex);
-
-  /**
-   * Copy entries from an index to a new index but limiting to documents that have been
-   * modified since the sinceEpochMillis time.
-   * <p>
-   * To support this the document needs to have a <code>@WhenModified</code> property.
-   * </p>
-   * <pre>{@code
-   *
-   *  long copyCount = documentStore.copyIndex(Product.class, "product_copy", sinceMillis);
-   *
-   * }</pre>
-   *
-   * @param beanType The bean type of the source index
-   * @param newIndex The name of the index to copy to
-   * @return the number of documents copied to the new index
-   */
-  long copyIndex(Class<?> beanType, String newIndex, long sinceEpochMillis);
-
-  /**
-   * Copy from a source index to a new index taking only the documents
-   * matching the given query.
-   * <pre>{@code
-   *
-   *  // predicates to select the source documents to copy
-   *  Query<Product> query = database.find(Product.class)
-   *    .where()
-   *      .ge("whenModified", new Timestamp(since))
-   *      .ge("name", "A")
-   *      .lt("name", "D")
-   *      .query();
-   *
-   *  // copy from the source index to "product_copy" index
-   *  long copyCount = documentStore.copyIndex(query, "product_copy", 1000);
-   *
-   * }</pre>
-   *
-   * @param query         The query to select the source documents to copy
-   * @param newIndex      The target index to copy the documents to
-   * @param bulkBatchSize The ElasticSearch bulk batch size, if 0 uses the default.
-   * @return The number of documents copied to the new index.
-   */
-  long copyIndex(Query<?> query, String newIndex, int bulkBatchSize);
-}
@@ -3,8 +3,6 @@ package io.ebean;
 import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;

-import javax.sql.DataSource;
-import java.sql.Connection;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
@@ -208,19 +206,14 @@ public interface DtoQuery<T> extends CancelableQuery {
   */
  DtoQuery<T> usingTransaction(Transaction transaction);

-  /**
-   * Execute the query using the given connection.
-   */
-  DtoQuery<T> usingConnection(Connection connection);
-
  /**
   * Ensure that the master DataSource is used if there is a read only data source
   * being used (that is using a read replica database potentially with replication lag).
   * <p>
   * When the database is configured with a read-only DataSource via
-   * say {@link io.ebean.DatabaseBuilder#readOnlyDataSource(DataSource)} then
+   * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
   * by default when a query is run without an active transaction, it uses the read-only data
-   * source. We use {@code usingMaster()} to instead ensure that the query is executed
+   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
   * against the master data source.
   */
  DtoQuery<T> usingMaster();
@@ -1,7 +1,5 @@
 package io.ebean;

-import io.ebean.search.*;
-
 import java.util.Collection;
 import java.util.Map;

@@ -625,31 +623,6 @@ public interface ExpressionFactory {
   */
  Expression raw(String raw);

-  /**
-   * Create a Text Match expression (currently doc store/Elastic only).
-   */
-  Expression textMatch(String propertyName, String search, Match options);
-
-  /**
-   * Create a Text Multi match expression (currently doc store/Elastic only).
-   */
-  Expression textMultiMatch(String query, MultiMatch options);
-
-  /**
-   * Create a text simple query expression (currently doc store/Elastic only).
-   */
-  Expression textSimple(String search, TextSimple options);
-
-  /**
-   * Create a text query string expression (currently doc store/Elastic only).
-   */
-  Expression textQueryString(String search, TextQueryString options);
-
-  /**
-   * Create a text common terms expression (currently doc store/Elastic only).
-   */
-  Expression textCommonTerms(String search, TextCommonTerms options);
-
  /**
   * And - join two expressions with a logical and.
   */
@@ -693,12 +666,4 @@ public interface ExpressionFactory {
   */
  <T> Junction<T> junction(Junction.Type type, Query<T> query, ExpressionList<T> parent);

-  /**
-   * Add the expressions to the given expression list.
-   *
-   * @param where       The expression list to add the expressions to
-   * @param expressions The expressions that are parsed
-   * @param params      Bind parameters to match ? or ?1 bind positions.
-   */
-  <T> void where(ExpressionList<T> where, String expressions, Object[] params);
 }
@@ -2,7 +2,6 @@ package io.ebean;

 import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;
-import io.ebean.search.*;

 import jakarta.persistence.NonUniqueResultException;
 import java.sql.Connection;
@@ -54,7 +53,7 @@ public interface ExpressionList<T> {
  Query<T> orderById(boolean orderById);

  /**
-   * @deprecated migrate to {@link #orderBy(String)}
+   * Deprecated migrate to {@link #orderBy(String)}
   */
  @Deprecated(since = "13.19", forRemoval = true)
  default ExpressionList<T> order(String orderByClause) {
@@ -72,7 +71,7 @@ public interface ExpressionList<T> {
  ExpressionList<T> orderBy(String orderBy);

  /**
-   * @deprecated migrate to {@link #orderBy()}.
+   * Deprecated migrate to orderBy().
   */
  @Deprecated(forRemoval = true)
  default OrderBy<T> order() {
@@ -106,11 +105,6 @@ public interface ExpressionList<T> {
   */
  Query<T> asOf(Timestamp asOf);

-  /**
-   * Execute the query against the draft set of tables.
-   */
-  Query<T> asDraft();
-
  /**
   * Convert the query to a DTO bean query.
   * <p>
@@ -222,8 +216,6 @@ public interface ExpressionList<T> {
  int delete();

  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then delete().
-   * <p>
   * Execute as a delete query deleting the 'root level' beans that match the predicates
   * in the query.
   * <p>
@@ -233,7 +225,6 @@ public interface ExpressionList<T> {
   *
   * @return the number of rows that were deleted.
   */
-  @Deprecated(forRemoval = true, since = "13.1.0")
  int delete(Transaction transaction);

  /**
@@ -245,14 +236,11 @@ public interface ExpressionList<T> {
  int update();

  /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then update().
-   * <p>
   * Execute as a update query with the given transaction.
   *
   * @return the number of rows that were updated.
   * @see UpdateQuery
   */
-  @Deprecated(forRemoval = true, since = "13.1.0")
  int update(Transaction transaction);

  /**
@@ -424,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>
@@ -513,28 +465,6 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> filterMany(String manyProperty);

-  /**
-   * @deprecated for removal - migrate to {@link #filterManyRaw(String, String, Object...)}.
-   * <p>
-   * Add filter expressions to the many property.
-   *
-   * <pre>{@code
-   *
-   *   DB.find(Customer.class)
-   *   .where()
-   *   .eq("name", "Rob")
-   *   .filterMany("orders", "status = ?", Status.NEW)
-   *   .findList();
-   *
-   * }</pre>
-   *
-   * @param manyProperty The many property
-   * @param expressions  Filter expressions with and, or and ? or ?1 type bind parameters
-   * @param params       Bind parameters used in the expressions
-   */
-  @Deprecated(forRemoval = true)
-  ExpressionList<T> filterMany(String manyProperty, String expressions, Object... params);
-
  /**
   * Add filter expressions for the many path. The expressions can include SQL functions if
   * desired and the property names are translated to column names.
@@ -586,19 +516,6 @@ public interface ExpressionList<T> {
   */
  Query<T> setDistinct(boolean distinct);

-  /**
-   * Set the index(es) to search for a document store which uses partitions.
-   * <p>
-   * For example, when executing a query against ElasticSearch with daily indexes we can
-   * explicitly specify the indexes to search against.
-   * </p>
-   *
-   * @param indexName The index or indexes to search against
-   * @return This query
-   * @see Query#setDocIndexName(String)
-   */
-  Query<T> setDocIndexName(String indexName);
-
  /**
   * Set the first row to fetch.
   *
@@ -682,14 +599,6 @@ public interface ExpressionList<T> {
    return setUseQueryCache(enabled ? CacheMode.ON : CacheMode.OFF);
  }

-  /**
-   * Set to true if this query should execute against the doc store.
-   * <p>
-   * When setting this you may also consider disabling lazy loading.
-   * </p>
-   */
-  Query<T> setUseDocStore(boolean useDocsStore);
-
  /**
   * Set true if you want to disable lazy loading.
   * <p>
@@ -698,16 +607,6 @@ public interface ExpressionList<T> {
   */
  Query<T> setDisableLazyLoading(boolean disableLazyLoading);

-  /**
-   * Disable read auditing for this query.
-   * <p>
-   * This is intended to be used when the query is not a user initiated query and instead
-   * part of the internal processing in an application to load a cache or document store etc.
-   * In these cases we don't want the query to be part of read auditing.
-   * </p>
-   */
-  Query<T> setDisableReadAuditing();
-
  /**
   * Set a label on the query (to help identify query execution statistics).
   */
@@ -727,14 +626,6 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> where();

-  /**
-   * Add the expressions to this expression list.
-   *
-   * @param expressions The expressions that are parsed and added to this expression list
-   * @param params      Bind parameters to match ? or ?1 bind positions.
-   */
-  ExpressionList<T> where(String expressions, Object... params);
-
  /**
   * Path exists - for the given path in a JSON document.
   * <pre>{@code
@@ -1629,47 +1520,6 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> rawOrEmpty(String raw, Collection<?> values);

-  /**
-   * Add a match expression.
-   *
-   * @param propertyName The property name for the match
-   * @param search       The search value
-   */
-  ExpressionList<T> match(String propertyName, String search);
-
-  /**
-   * Add a match expression with options.
-   *
-   * @param propertyName The property name for the match
-   * @param search       The search value
-   */
-  ExpressionList<T> match(String propertyName, String search, Match options);
-
-  /**
-   * Add a multi-match expression.
-   */
-  ExpressionList<T> multiMatch(String search, String... properties);
-
-  /**
-   * Add a multi-match expression using options.
-   */
-  ExpressionList<T> multiMatch(String search, MultiMatch options);
-
-  /**
-   * Add a simple query string expression.
-   */
-  ExpressionList<T> textSimple(String search, TextSimple options);
-
-  /**
-   * Add a query string expression.
-   */
-  ExpressionList<T> textQueryString(String search, TextQueryString options);
-
-  /**
-   * Add common terms expression.
-   */
-  ExpressionList<T> textCommonTerms(String search, TextCommonTerms options);
-
  /**
   * And - join two expressions with a logical and.
   */
@@ -1812,42 +1662,6 @@ public interface ExpressionList<T> {
   */
  Junction<T> disjunction();

-  /**
-   * Start a list of expressions that will be joined by MUST.
-   * <p>
-   * This automatically makes the query a useDocStore(true) query that
-   * will execute against the document store (ElasticSearch etc).
-   * </p>
-   * <p>
-   * This is logically similar to and().
-   * </p>
-   */
-  Junction<T> must();
-
-  /**
-   * Start a list of expressions that will be joined by SHOULD.
-   * <p>
-   * This automatically makes the query a useDocStore(true) query that
-   * will execute against the document store (ElasticSearch etc).
-   * </p>
-   * <p>
-   * This is logically similar to or().
-   * </p>
-   */
-  Junction<T> should();
-
-  /**
-   * Start a list of expressions that will be joined by MUST NOT.
-   * <p>
-   * This automatically makes the query a useDocStore(true) query that
-   * will execute against the document store (ElasticSearch etc).
-   * </p>
-   * <p>
-   * This is logically similar to not().
-   * </p>
-   */
-  Junction<T> mustNot();
-
  /**
   * End a junction returning the parent expression list.
   * <p>
@@ -213,11 +213,4 @@ public class Finder<I, T> {
    return db().findNative(type, nativeSql);
  }

-  /**
-   * Creates a query using the ORM query language.
-   */
-  public Query<T> query(String ormQuery) {
-    return db().createQuery(type, ormQuery);
-  }
-
 }
@@ -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();
-
-}
@@ -1,119 +0,0 @@
-package io.ebean;
-
-import io.avaje.lang.Nullable;
-
-/**
- * Options to be used with insert such as ON CONFLICT DO UPDATE | NOTHING.
- */
-public interface InsertOptions {
-
-  /**
-   * Use ON CONFLICT UPDATE with automatic determination of the unique columns to conflict on.
-   * <p>
-   * Uses mapping to determine the unique columns - {@code @Column(unique=true)} and {@code @Index(unique=true)} .
-   */
-  InsertOptions ON_CONFLICT_UPDATE = InsertOptions.builder()
-    .onConflictUpdate()
-    .build();
-
-  /**
-   * Use ON CONFLICT DO NOTHING with automatic determination of the unique columns to conflict on.
-   * <p>
-   * Uses mapping to determine the unique columns - {@code @Column(unique=true)} and {@code @Index(unique=true)} .
-   */
-  InsertOptions ON_CONFLICT_NOTHING = InsertOptions.builder()
-    .onConflictNothing()
-    .build();
-
-  /**
-   * Return a builder for InsertOptions.
-   */
-  static Builder builder() {
-    return new DInsertOptionsBuilder();
-  }
-
-  /**
-   * Return the constraint name that is used for ON CONFLICT.
-   */
-  @Nullable
-  String constraint();
-
-  /**
-   * Return the unique columns that is used for ON CONFLICT.
-   * <p>
-   * When not explicitly set will use mapping like {@code @Column(unique=true)} to determine the
-   * non-unique columns.
-   */
-  @Nullable
-  String uniqueColumns();
-
-  /**
-   * Return the ON CONFLICT UPDATE SET clause.
-   * <p>
-   * When not set will use the non-unique columns.
-   */
-  @Nullable
-  String updateSet();
-
-  /**
-   * Return if GetGeneratedKeys should be used to fetch the generated keys after insert.
-   */
-  @Nullable
-  Boolean getGetGeneratedKeys();
-
-  /**
-   * Return the key for these build options.
-   */
-  String key();
-
-  /**
-   * The builder for InsertOptions.
-   */
-  interface Builder {
-
-    /**
-     * Use a ON CONFLICT UPDATE automatically determining the unique columns.
-     */
-    Builder onConflictUpdate();
-
-    /**
-     * Use a ON CONFLICT DO NOTHING automatically determining the unique columns.
-     */
-    Builder onConflictNothing();
-
-    /**
-     * Specify an explicit conflict constraint name.
-     * <p>
-     * When this is used then unique columns will not be used.
-     */
-    Builder constraint(String constraint);
-
-    /**
-     * Specify the unique columns for the conflict target.
-     * <p>
-     * When not specified and constraint is also not specified then
-     * it will automatically determine the unique columns
-     * based on mapping like {@code @Column(unique=true)} and
-     * {@code @Index(unique=true)} .
-     */
-    Builder uniqueColumns(String uniqueColumns);
-
-    /**
-     * Specify the ON CONFLICT DO UPDATE SET clause.
-     * <p>
-     * When not specified ebean will include all the non-unique columns.
-     */
-    Builder updateSet(String updateSet);
-
-    /**
-     * Specify if GetGeneratedKeys should be used to return generated keys.
-     */
-    Builder getGeneratedKeys(boolean getGeneratedKeys);
-
-    /**
-     * Build and return the insert options.
-     */
-    InsertOptions build();
-
-  }
-}
@@ -1,975 +0,0 @@
-package io.ebean;
-
-import io.avaje.lang.Nullable;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.Timestamp;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.BooleanSupplier;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-/**
- * Build and execute an ORM query.
- *
- * @param <SELF> The type of the builder
- * @param <T>    The entity bean type
- */
-public interface QueryBuilder<SELF, T> extends QueryBuilderProjection<SELF, T> {
-
-  /**
-   * Set root table alias.
-   */
-  SELF alias(String alias);
-
-  /**
-   * Apply changes to the query conditional on the supplied predicate.
-   * <p>
-   * Typically, the changes are extra predicates etc.
-   *
-   * @param predicate The predicate which when true the changes are applied
-   * @param apply     The changes to apply to the query
-   */
-  SELF alsoIf(BooleanSupplier predicate, Consumer<SELF> apply);
-
-  /**
-   * Perform an 'As of' query using history tables to return the object graph
-   * as of a time in the past.
-   * <p>
-   * To perform this query the DB must have underlying history tables.
-   *
-   * @param asOf the date time in the past at which you want to view the data
-   */
-  SELF asOf(Timestamp asOf);
-
-  /**
-   * Execute the query against the draft set of tables.
-   */
-  SELF asDraft();
-
-  /**
-   * Convert the query to a DTO bean query.
-   * <p>
-   * We effectively use the underlying ORM query to build the SQL and then execute
-   * and map it into DTO beans.
-   */
-  <D> DtoQuery<D> asDto(Class<D> dtoClass);
-
-  /**
-   * Convert the query to a UpdateQuery.
-   * <p>
-   * Typically this is used with query beans to covert a query bean
-   * query into an UpdateQuery like the examples below.
-   * </p>
-   *
-   * <pre>{@code
-   *
-   *  int rowsUpdated = new QCustomer()
-   *       .name.startsWith("Rob")
-   *       .asUpdate()
-   *       .set("active", false)
-   *       .update();;
-   *
-   * }</pre>
-   *
-   * <pre>{@code
-   *
-   *   int rowsUpdated = new QContact()
-   *       .notes.note.startsWith("Make Inactive")
-   *       .email.endsWith("@foo.com")
-   *       .customer.id.equalTo(42)
-   *       .asUpdate()
-   *       .set("inactive", true)
-   *       .setRaw("email = lower(email)")
-   *       .update();
-   *
-   * }</pre>
-   */
-  UpdateQuery<T> asUpdate();
-
-  /**
-   * Return a copy of the query.
-   * <p>
-   * This is so that you can use a Query as a "prototype" for creating other
-   * query instances. You could create a Query with various where expressions
-   * and use that as a "prototype" - using this copy() method to create a new
-   * instance that you can then add other expressions then execute.
-   * </p>
-   */
-  SELF copy();
-
-  /**
-   * Execute the query using the given transaction.
-   */
-  SELF usingTransaction(Transaction transaction);
-
-  /**
-   * Execute the query using the given connection.
-   */
-  SELF usingConnection(Connection connection);
-
-  /**
-   * Execute the query using the given database.
-   */
-  SELF usingDatabase(Database database);
-
-  /**
-   * Ensure that the master DataSource is used if there is a read only data source
-   * being used (that is using a read replica database potentially with replication lag).
-   * <p>
-   * When the database is configured with a read-only DataSource via
-   * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
-   * by default when a query is run without an active transaction, it uses the read-only data
-   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
-   * against the master data source.
-   */
-  SELF usingMaster();
-
-  /**
-   * Set the base table to use for this query.
-   * <p>
-   * Typically this is used when a table has partitioning and we wish to specify a specific
-   * partition/table to query against.
-   * </p>
-   * <pre>{@code
-   *
-   *   QOrder()
-   *   .setBaseTable("order_2019_05")
-   *   .status.equalTo(Status.NEW)
-   *   .findList();
-   *
-   * }</pre>
-   */
-  SELF setBaseTable(String baseTable);
-
-  /**
-   * Specify the PersistenceContextScope to use for this query.
-   * <p>
-   * When this is not set the 'default' configured on {@link io.ebean.config.DatabaseConfig#setPersistenceContextScope(PersistenceContextScope)}
-   * is used - this value defaults to {@link PersistenceContextScope#TRANSACTION}.
-   * <p>
-   * Note that the same persistence Context is used for subsequent lazy loading and query join queries.
-   * <p>
-   * Note that #findEach uses a 'per object graph' PersistenceContext so this scope is ignored for
-   * queries executed as #findIterate, #findEach, #findEachWhile.
-   *
-   * @param scope The scope to use for this query and subsequent lazy loading.
-   */
-  SELF setPersistenceContextScope(PersistenceContextScope scope);
-
-  /**
-   * Explicitly specify whether to use AutoTune for this query.
-   * <p>
-   * If you do not call this method on a query the "Implicit AutoTune mode" is
-   * used to determine if AutoTune should be used for a given query.
-   * <p>
-   * AutoTune can add additional fetch paths to the query and specify which
-   * properties are included for each path. If you have explicitly defined some
-   * fetch paths AutoTune will not remove them.
-   */
-  SELF setAutoTune(boolean autoTune);
-
-  /**
-   * Execute the query allowing properties with invalid JSON to be collected and not fail the query.
-   * <pre>{@code
-   *
-   *   // fetch a bean with JSON content
-   *   EBasicJsonList bean= DB.find(EBasicJsonList.class)
-   *       .setId(42)
-   *       .setAllowLoadErrors()  // collect errors into bean state if we have invalid JSON
-   *       .findOne();
-   *
-   *
-   *   // get the invalid JSON errors from the bean state
-   *   Map<String, Exception> errors = server().getBeanState(bean).getLoadErrors();
-   *
-   *   // If this map is not empty tell we have invalid JSON
-   *   // and should try and fix the JSON content or inform the user
-   *
-   * }</pre>
-   */
-  SELF setAllowLoadErrors();
-
-  /**
-   * Set the default lazy loading batch size to use.
-   * <p>
-   * When lazy loading is invoked on beans loaded by this query then this sets the
-   * batch size used to load those beans.
-   *
-   * @param lazyLoadBatchSize the number of beans to lazy load in a single batch
-   */
-  SELF setLazyLoadBatchSize(int lazyLoadBatchSize);
-
-  /**
-   * Set a label on the query.
-   * <p>
-   * This label can be used to help identify query performance metrics but we can also use
-   * profile location enhancement on Finders so for some that would be a better option.
-   */
-  SELF setLabel(String label);
-
-  /**
-   * Set a SQL query hint.
-   * <p>
-   * This results in an inline comment that immediately follows
-   * after the select keyword in the form: {@code /*+ hint *\/ }
-   */
-  SELF setHint(String hint);
-
-  /**
-   * Set the index(es) to search for a document store which uses partitions.
-   * <p>
-   * For example, when executing a query against ElasticSearch with daily indexes we can
-   * explicitly specify the indexes to search against.
-   * </p>
-   * <pre>{@code
-   *
-   *   // explicitly specify the indexes to search
-   *   query.setDocIndexName("logstash-2016.11.5,logstash-2016.11.6")
-   *
-   *   // search today's index
-   *   query.setDocIndexName("$today")
-   *
-   *   // search the last 3 days
-   *   query.setDocIndexName("$last-3")
-   *
-   * }</pre>
-   * <p>
-   * If the indexName is specified with ${daily} e.g. "logstash-${daily}" ... then we can use
-   * $today and $last-x as the search docIndexName like the examples below.
-   * </p>
-   * <pre>{@code
-   *
-   *   // search today's index
-   *   query.setDocIndexName("$today")
-   *
-   *   // search the last 3 days
-   *   query.setDocIndexName("$last-3")
-   *
-   * }</pre>
-   *
-   * @param indexName The index or indexes to search against
-   * @return This query
-   */
-  SELF setDocIndexName(String indexName);
-
-  /**
-   * Execute the query including soft deleted rows.
-   * <p>
-   * This means that Ebean will not add any predicates to the query for filtering out
-   * soft deleted rows. You can still add your own predicates for the deleted properties
-   * and effectively you have full control over the query to include or exclude soft deleted
-   * rows as needed for a given use case.
-   */
-  SELF setIncludeSoftDeletes();
-
-  /**
-   * Disable read auditing for this query.
-   * <p>
-   * This is intended to be used when the query is not a user initiated query and instead
-   * part of the internal processing in an application to load a cache or document store etc.
-   * In these cases we don't want the query to be part of read auditing.
-   */
-  SELF setDisableReadAuditing();
-
-  /**
-   * Set true if you want to disable lazy loading.
-   * <p>
-   * That is, once the object graph is returned further lazy loading is disabled.
-   */
-  SELF setDisableLazyLoading(boolean disableLazyLoading);
-
-  /**
-   * Set whether this query uses DISTINCT.
-   */
-  SELF setDistinct(boolean distinct);
-
-  /**
-   * Restrict the query to only return subtypes of the given inherit type.
-   * <pre>{@code
-   *
-   *   List<Animal> animals =
-   *     new QAnimal()
-   *       .name.startsWith("Fluffy")
-   *       .setInheritType(Cat.class)
-   *       .findList();
-   *
-   * }</pre>
-   */
-  SELF setInheritType(Class<? extends T> type);
-
-  /**
-   * Set the first row to return for this query.
-   *
-   * @param firstRow the first row to include in the query result.
-   */
-  SELF setFirstRow(int firstRow);
-
-  /**
-   * Set the maximum number of rows to return in the query.
-   *
-   * @param maxRows the maximum number of rows to return in the query.
-   */
-  SELF setMaxRows(int maxRows);
-
-  /**
-   * Set RawSql to use for this query.
-   */
-  SELF setRawSql(RawSql rawSql);
-
-  /**
-   * Extended version for setDistinct in conjunction with "findSingleAttributeList";
-   *
-   * <pre>{@code
-   *
-   *  List<CountedValue<Order.Status>> orderStatusCount =
-   *
-   *     DB.find(Order.class)
-   *      .select("status")
-   *      .where()
-   *      .gt("orderDate", LocalDate.now().minusMonths(3))
-   *
-   *      // fetch as single attribute with a COUNT
-   *      .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
-   *      .findSingleAttributeList();
-   *
-   *     for (CountedValue<Order.Status> entry : orderStatusCount) {
-   *       System.out.println(" count:" + entry.getCount()+" orderStatus:" + entry.getValue() );
-   *     }
-   *
-   *   // produces
-   *
-   *   count:3 orderStatus:NEW
-   *   count:1 orderStatus:SHIPPED
-   *   count:1 orderStatus:COMPLETE
-   *
-   * }</pre>
-   */
-  SELF setCountDistinct(CountDistinctOrder orderBy);
-
-  /**
-   * Set the property to use as keys for a map.
-   * <p>
-   * If no property is set then the id property is used.
-   * </p>
-   * <pre>{@code
-   *
-   * // Assuming sku is unique for products...
-   *
-   * Map<String,Product> productMap = DB.find(Product.class)
-   *     .setMapKey("sku")  // sku map keys...
-   *     .findMap();
-   *
-   * }</pre>
-   *
-   * @param mapKey the property to use as keys for a map.
-   */
-  SELF setMapKey(String mapKey);
-
-  /**
-   * Set to true if this query should execute against the doc store.
-   * <p>
-   * When setting this you may also consider disabling lazy loading.
-   */
-  SELF setUseDocStore(boolean useDocStore);
-
-  /**
-   * When set to true when you want the returned beans to be read only.
-   */
-  SELF setReadOnly(boolean readOnly);
-
-  /**
-   * Set a timeout on this query.
-   * <p>
-   * This will typically result in a call to setQueryTimeout() on a
-   * preparedStatement. If the timeout occurs an exception will be thrown - this
-   * will be a SQLException wrapped up in a PersistenceException.
-   * </p>
-   *
-   * @param secs the query timeout limit in seconds. Zero means there is no limit.
-   */
-  SELF setTimeout(int secs);
-
-  /**
-   * A hint which for JDBC translates to the Statement.fetchSize().
-   * <p>
-   * Gives the JDBC driver a hint as to the number of rows that should be
-   * fetched from the database when more rows are needed for ResultSet.
-   * </p>
-   * <p>
-   * Note that internally findEach and findEachWhile will set the fetch size
-   * if it has not already as these queries expect to process a lot of rows.
-   * If we didn't then Postgres and MySql for example would eagerly pull back
-   * all the row data and potentially consume a lot of memory in the process.
-   * </p>
-   * <p>
-   * As findEach and findEachWhile automatically set the fetch size we don't have
-   * to do so generally but we might still wish to for tuning a specific use case.
-   * </p>
-   */
-  SELF setBufferFetchSizeHint(int fetchSize);
-
-  /**
-   * Set the mode to use the bean cache when executing this query.
-   * <p>
-   * By default, "find by id" and "find by natural key" will use the bean cache
-   * when bean caching is enabled. Setting this to false means that the query
-   * will not use the bean cache and instead hit the database.
-   * <p>
-   * By default, findList() with natural keys will not use the bean cache. In that
-   * case we need to explicitly use the bean cache.
-   */
-  SELF setBeanCacheMode(CacheMode beanCacheMode);
-
-  /**
-   * Set the {@link CacheMode} to use the query for executing this query.
-   */
-  SELF setUseQueryCache(CacheMode cacheMode);
-
-  /**
-   * Set this to false to not use the bean cache.
-   * <p>
-   * This method is now superseded by {@link #setBeanCacheMode(CacheMode)}
-   * which provides more explicit options controlled bean cache use.
-   * <p>
-   * This method is likely to be deprecated in the future with migration
-   * over to setUseBeanCache().
-   */
-  default SELF setUseCache(boolean useCache) {
-    return setBeanCacheMode(useCache ? CacheMode.ON : CacheMode.OFF);
-  }
-
-  /**
-   * Calls {@link #setUseQueryCache(CacheMode)} with <code>ON</code> or <code>OFF</code>.
-   */
-  default SELF setUseQueryCache(boolean enabled) {
-    return setUseQueryCache(enabled ? CacheMode.ON : CacheMode.OFF);
-  }
-
-  /**
-   * Set the order by clause replacing the existing order by clause if there is
-   * one.
-   * <p>
-   * This follows SQL syntax using commas between each property with the
-   * optional asc and desc keywords representing ascending and descending order
-   * respectively.
-   */
-  SELF orderBy(String orderByClause);
-
-  /**
-   * Set an OrderBy object to replace any existing OrderBy clause.
-   */
-  SELF setOrderBy(OrderBy<T> orderBy);
-
-  /**
-   * Controls, if paginated queries should always append an 'order by id' statement at the end to
-   * guarantee a deterministic sort result. This may affect performance.
-   * If this is not enabled, and an orderBy is set on the query, it's up to the programmer that
-   * this query provides a deterministic result.
-   */
-  SELF orderById(boolean orderById);
-
-  /**
-   * Execute the query with the given lock type and WAIT.
-   * <p>
-   * Note that <code>forUpdate()</code> is the same as
-   * <code>withLock(LockType.UPDATE)</code>.
-   * <p>
-   * Provides us with the ability to explicitly use Postgres
-   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
-   */
-  SELF withLock(Query.LockType lockType);
-
-  /**
-   * Execute the query with the given lock type and lock wait.
-   * <p>
-   * Note that <code>forUpdateNoWait()</code> is the same as
-   * <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
-   * <p>
-   * Provides us with the ability to explicitly use Postgres
-   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
-   */
-  SELF withLock(Query.LockType lockType, Query.LockWait lockWait);
-
-  /**
-   * Execute using "for update" clause which results in the DB locking the record.
-   * <p>
-   * The same as <code>withLock(LockType.UPDATE, LockWait.WAIT)</code>.
-   */
-  SELF forUpdate();
-
-  /**
-   * Execute using "for update" clause with "no wait" option.
-   * <p>
-   * This is typically a Postgres and Oracle only option at this stage.
-   * <p>
-   * The same as <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
-   */
-  SELF forUpdateNoWait();
-
-  /**
-   * Execute using "for update" clause with "skip locked" option.
-   * <p>
-   * This is typically a Postgres and Oracle only option at this stage.
-   * <p>
-   * The same as <code>withLock(LockType.UPDATE, LockWait.SKIPLOCKED)</code>.
-   */
-  SELF forUpdateSkipLocked();
-
-  /**
-   * Returns the set of properties or paths that are unknown (do not map to known properties or paths).
-   * <p>
-   * Validate the query checking the where and orderBy expression paths to confirm if
-   * they represent valid properties or paths for the given bean type.
-   */
-  Set<String> validate();
-
-  /**
-   * Return the sql that was generated for executing this query.
-   * <p>
-   * This is only available after the query has been executed and provided only
-   * for informational purposes.
-   */
-  String getGeneratedSql();
-
-  /**
-   * Return the type of beans being queried.
-   */
-  Class<T> getBeanType();
-
-  /**
-   * Execute as a delete query deleting the 'root level' beans that match the predicates
-   * in the query.
-   * <p>
-   * Note that if the query includes joins then the generated delete statement may not be
-   * optimal depending on the database platform.
-   *
-   * @return the number of beans/rows that were deleted.
-   */
-  int delete();
-
-  /**
-   * Execute the query returning true if a row is found.
-   * <p>
-   * The query is executed using max rows of 1 and will only select the id property.
-   * This method is really just a convenient way to optimise a query to perform a
-   * 'does a row exist in the db' check.
-   *
-   * <h2>Example using a query bean:</h2>
-   * <pre>{@code
-   *
-   *   boolean userExists =
-   *     new QContact()
-   *       .email.equalTo("rob@foo.com")
-   *       .exists();
-   *
-   * }</pre>
-   *
-   * <h2>Example:</h2>
-   * <pre>{@code
-   *
-   *   boolean userExists = query()
-   *     .where().eq("email", "rob@foo.com")
-   *     .exists();
-   *
-   * }</pre>
-   *
-   * @return True if the query finds a matching row in the database
-   */
-  boolean exists();
-
-  /**
-   * Execute the query returning either a single bean or null (if no matching
-   * bean is found).
-   * <p>
-   * If more than 1 row is found for this query then a PersistenceException is
-   * thrown.
-   * <p>
-   * This is useful when your predicates dictate that your query should only
-   * return 0 or 1 results.
-   * <p>
-   * <pre>{@code
-   *
-   * // assuming the sku of products is unique...
-   * Product product =
-   *     new QProduct()
-   *         .sku.equalTo("aa113")
-   *         .findOne();
-   * ...
-   * }</pre>
-   * <p>
-   * It is also useful with finding objects by their id when you want to specify
-   * further join information to optimise the query.
-   * <p>
-   * <pre>{@code
-   *
-   * // Fetch order 42 and additionally fetch join its order details...
-   * Order order =
-   *     new QOrder()
-   *         .fetch("details") // eagerly load the order details
-   *         .id.equalTo(42)
-   *         .findOne();
-   *
-   * // the order details were eagerly loaded
-   * List<OrderDetail> details = order.getDetails();
-   * ...
-   * }</pre>
-   */
-  @Nullable
-  T findOne();
-
-  /**
-   * Execute the query returning an optional bean.
-   */
-  Optional<T> findOneOrEmpty();
-
-  /**
-   * Execute the query returning the list of objects.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * <p>
-   * <pre>{@code
-   *
-   * List<Customer> customers =
-   *     new QCustomer()
-   *       .name.ilike("rob%")
-   *       .findList();
-   *
-   * }</pre>
-   *
-   * @see Query#findList()
-   */
-  List<T> findList();
-
-  /**
-   * Execute the query returning the result as a Stream.
-   * <p>
-   * Note that this can support very large queries iterating
-   * any number of results. To do so internally it can use
-   * multiple persistence contexts.
-   * </p>
-   * <pre>{@code
-   *
-   *  // use try with resources to ensure Stream is closed
-   *
-   *  try (Stream<Customer> stream = query.findStream()) {
-   *    stream
-   *    .map(...)
-   *    .collect(...);
-   *  }
-   *
-   * }</pre>
-   */
-  Stream<T> findStream();
-
-  /**
-   * Execute the query returning the set of objects.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * <p>
-   * <pre>{@code
-   *
-   * Set<Customer> customers =
-   *     new QCustomer()
-   *       .name.ilike("rob%")
-   *       .findSet();
-   *
-   * }</pre>
-   *
-   * @see Query#findSet()
-   */
-  Set<T> findSet();
-
-  /**
-   * Execute the query returning the list of Id's.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   *
-   * @see Query#findIds()
-   */
-  <A> List<A> findIds();
-
-  /**
-   * Execute the query returning a map of the objects.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * <p>
-   * You can use setMapKey() or asMapKey() to specify the property to be used as keys
-   * on the map. If one is not specified then the id property is used.
-   * <p>
-   * <pre>{@code
-   *
-   * Map<String, Product> map =
-   *   new QProduct()
-   *     .sku.asMapKey()
-   *     .findMap();
-   *
-   * }</pre>
-   *
-   * @see Query#findMap()
-   */
-  <K> Map<K, T> findMap();
-
-  /**
-   * Execute the query iterating over the results.
-   * <p>
-   * Note that findIterate (and findEach and findEachWhile) uses a "per graph"
-   * persistence context scope and adjusts jdbc fetch buffer size for large
-   * queries. As such it is better to use findList for small queries.
-   * <p>
-   * Remember that with {@link QueryIterator} you must call {@link QueryIterator#close()}
-   * when you have finished iterating the results (typically in a finally block).
-   * <p>
-   * findEach() and findEachWhile() are preferred to findIterate() as they ensure
-   * the jdbc statement and resultSet are closed at the end of the iteration.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * </p>
-   * <pre>{@code
-   *
-   *  Query<Customer> query =
-   *    new QCustomer()
-   *     .status.equalTo(Customer.Status.NEW)
-   *     .orderBy()
-   *       id.asc()
-   *     .query();
-   *
-   *  try (QueryIterator<Customer> it = query.findIterate()) {
-   *    while (it.hasNext()) {
-   *      Customer customer = it.next();
-   *      // do something with customer ...
-   *    }
-   *  }
-   *
-   * }</pre>
-   */
-  QueryIterator<T> findIterate();
-
-  /**
-   * Execute the query returning a list of values for a single property.
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *  List<String> names =
-   *    new QCustomer()
-   *      .setDistinct(true)
-   *      .select(name)
-   *      .findSingleAttributeList();
-   *
-   * }</pre>
-   *
-   * @return the list of values for the selected property
-   */
-  <A> List<A> findSingleAttributeList();
-
-  /**
-   * Execute the query returning a single value or null for a single property.
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *  LocalDate maxDate =
-   *    new QCustomer()
-   *      .select("max(startDate)")
-   *      .findSingleAttribute();
-   *
-   * }</pre>
-   *
-   * @return a single value or null for the selected property
-   */
-  @Nullable
-  <A> A findSingleAttribute();
-
-  /**
-   * Execute the query returning a single optional attribute value.
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *  Optional<String> maybeName =
-   *    new QCustomer()
-   *      .select(name)
-   *      .id.eq(42)
-   *      .status.eq(NEW)
-   *      .findSingleAttributeOrEmpty();
-   *
-   * }</pre>
-   *
-   * @return an optional value for the selected property
-   */
-  <A> Optional<A> findSingleAttributeOrEmpty();
-
-  /**
-   * Execute the query returning a hashset of values for a single property.
-   */
-  <A> Set<A> findSingleAttributeSet();
-
-  /**
-   * Execute the query processing the beans one at a time.
-   * <p>
-   * This method is appropriate to process very large query results as the
-   * beans are consumed one at a time and do not need to be held in memory
-   * (unlike #findList #findSet etc)
-   * <p>
-   * Note that internally Ebean can inform the JDBC driver that it is expecting larger
-   * resultSet and specifically for MySQL this hint is required to stop it's JDBC driver
-   * from buffering the entire resultSet. As such, for smaller resultSets findList() is
-   * generally preferable.
-   * <p>
-   * Compared with #findEachWhile this will always process all the beans where as
-   * #findEachWhile provides a way to stop processing the query result early before
-   * all the beans have been read.
-   * <p>
-   * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the Consumer interface which is better suited to use with closures.
-   *
-   * <pre>{@code
-   *
-   *  new QCustomer()
-   *     .status.equalTo(Status.NEW)
-   *     .orderBy().id.asc()
-   *     .findEach((Customer customer) -> {
-   *
-   *       // do something with customer
-   *       System.out.println("-- visit " + customer);
-   *     });
-   *
-   * }</pre>
-   *
-   * @param consumer the consumer used to process the queried beans.
-   */
-  void findEach(Consumer<T> consumer);
-
-  /**
-   * Execute findEach streaming query batching the results for consuming.
-   * <p>
-   * This query execution will stream the results and is suited to consuming
-   * large numbers of results from the database.
-   * <p>
-   * Typically, we use this batch consumer when we want to do further processing on
-   * the beans and want to do that processing in batch form, for example - 100 at
-   * a time.
-   *
-   * @param batch    The number of beans processed in the batch
-   * @param consumer Process the batch of beans
-   */
-  void findEach(int batch, Consumer<List<T>> consumer);
-
-  /**
-   * Execute the query using callbacks to a visitor to process the resulting
-   * beans one at a time.
-   * <p>
-   * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the Predicate interface which is better suited to use with closures.
-   *
-   * <pre>{@code
-   *
-   *  new QCustomer()
-   *     .status.equalTo(Status.NEW)
-   *     .orderBy().id.asc()
-   *     .findEachWhile((Customer customer) -> {
-   *
-   *       // do something with customer
-   *       System.out.println("-- visit " + customer);
-   *
-   *       // return true to continue processing or false to stop
-   *       return (customer.getId() < 40);
-   *     });
-   *
-   * }</pre>
-   *
-   * @param consumer the consumer used to process the queried beans.
-   */
-  void findEachWhile(Predicate<T> consumer);
-
-  /**
-   * Return versions of a @History entity bean.
-   * <p>
-   * Generally this query is expected to be a find by id or unique predicates query.
-   * It will execute the query against the history returning the versions of the bean.
-   */
-  List<Version<T>> findVersions();
-
-  /**
-   * Return versions of a @History entity bean between a start and end timestamp.
-   * <p>
-   * Generally this query is expected to be a find by id or unique predicates query.
-   * It will execute the query against the history returning the versions of the bean.
-   */
-  List<Version<T>> findVersionsBetween(Timestamp start, Timestamp end);
-
-  /**
-   * Return the count of entities this query should return.
-   * <p>
-   * This is the number of 'top level' or 'root level' entities.
-   */
-  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).
-   *
-   * @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).
-   *
-   * @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.
-   *
-   * @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>
-   * The benefit of using this over findList() is that it provides functionality to get the
-   * total row count etc.
-   * <p>
-   * If maxRows is not set on the query prior to calling findPagedList() then a
-   * PersistenceException is thrown.
-   * <p>
-   * <pre>{@code
-   *
-   *  PagedList<Order> pagedList =
-   *    new QOrder()
-   *       .setFirstRow(50)
-   *       .setMaxRows(20)
-   *       .findPagedList();
-   *
-   *       // fetch the total row count in the background
-   *       pagedList.loadRowCount();
-   *
-   *       List<Order> orders = pagedList.getList();
-   *       int totalRowCount = pagedList.getTotalRowCount();
-   *
-   * }</pre>
-   *
-   * @return The PagedList
-   */
-  PagedList<T> findPagedList();
-
-}
@@ -1,242 +0,0 @@
-package io.ebean;
-
-/**
- * Builder for ORM Query projection (the select and fetch part).
- *
- * @param <SELF> The builder type
- * @param <T>    The entity bean type
- */
-public interface QueryBuilderProjection<SELF, T> {
-
-  /**
-   * Apply the path properties replacing the select and fetch clauses.
-   * <p>
-   * This is typically used when the FetchPath is applied to both the query and the JSON output.
-   */
-  SELF apply(FetchPath fetchPath);
-
-  /**
-   * Specify the properties to fetch on the root level entity bean in comma delimited format.
-   * <p>
-   * The Id property is automatically included in the properties to fetch unless setDistinct(true)
-   * is set on the query.
-   * </p>
-   * <p>
-   * Use {@link #fetch(String, String)} to specify specific properties to fetch
-   * on other non-root level paths of the object graph.
-   * </p>
-   * <pre>{@code
-   *
-   * List<Customer> customers = DB.find(Customer.class)
-   *     // Only fetch the customer id, name and status.
-   *     // This is described as a "Partial Object"
-   *     .select("name, status")
-   *     .where.ilike("name", "rob%")
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param fetchProperties the properties to fetch for this bean (* = all properties).
-   */
-  SELF select(String fetchProperties);
-
-  /**
-   * Apply the fetchGroup which defines what part of the object graph to load.
-   */
-  SELF select(FetchGroup<T> fetchGroup);
-
-  /**
-   * Specify a path to fetch eagerly including specific properties.
-   * <p>
-   * Ebean will endeavour to fetch this path using a SQL join. If Ebean determines that it can
-   * not use a SQL join (due to maxRows or because it would result in a cartesian product) Ebean
-   * will automatically convert this fetch query into a "query join" - i.e. use fetchQuery().
-   * </p>
-   * <pre>{@code
-   *
-   * // query orders...
-   * List<Order> orders = DB.find(Order.class)
-   *       // fetch the customer...
-   *       // ... getting the customers name and phone number
-   *       .fetch("customer", "name, phoneNumber")
-   *
-   *       // ... also fetch the customers billing address (* = all properties)
-   *       .fetch("customer.billingAddress", "*")
-   *       .findList();
-   * }</pre>
-   * <p>
-   * If columns is null or "*" then all columns/properties for that path are fetched.
-   * </p>
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     .select("name, status")
-   *     .fetch("contacts", "firstName,lastName,email")
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param path            the property path we wish to fetch eagerly.
-   * @param fetchProperties properties of the associated bean that you want to include in the
-   *                        fetch (* means all properties, null also means all properties).
-   */
-  SELF fetch(String path, String fetchProperties);
-
-  /**
-   * Fetch the path and properties using a "query join" (separate SQL query).
-   * <p>
-   * This is the same as:
-   * </p>
-   * <pre>{@code
-   *
-   *  fetch(path, fetchProperties, FetchConfig.ofQuery())
-   *
-   * }</pre>
-   * <p>
-   * This would be used instead of a fetch() when we use a separate SQL query to fetch this
-   * part of the object graph rather than a SQL join.
-   * <p>
-   * We might typically get a performance benefit when the path to fetch is a OneToMany
-   * or ManyToMany, the 'width' of the 'root bean' is wide and the cardinality of the many
-   * is high.
-   *
-   * @param path            the property path we wish to fetch eagerly.
-   * @param fetchProperties properties of the associated bean that you want to include in the
-   *                        fetch (* means all properties, null also means all properties).
-   */
-  SELF fetchQuery(String path, String fetchProperties);
-
-  /**
-   * Fetch the path and properties using L2 bean cache.
-   *
-   * @param path            The path of the beans we are fetching from L2 cache.
-   * @param fetchProperties The properties that should be loaded.
-   */
-  SELF fetchCache(String path, String fetchProperties);
-
-  /**
-   * Fetch the path and properties lazily (via batch lazy loading).
-   * <p>
-   * This is the same as:
-   *
-   * <pre>{@code
-   *
-   *  fetch(path, fetchProperties, FetchConfig.ofLazy())
-   *
-   * }</pre>
-   * <p>
-   * The reason for using fetchLazy() is to either:
-   * <ul>
-   * <li>Control/tune what is fetched as part of lazy loading</li>
-   * <li>Make use of the L2 cache, build this part of the graph from L2 cache</li>
-   * </ul>
-   *
-   * @param path            the property path we wish to fetch lazily.
-   * @param fetchProperties properties of the associated bean that you want to include in the
-   *                        fetch (* means all properties, null also means all properties).
-   */
-  SELF fetchLazy(String path, String fetchProperties);
-
-  /**
-   * Additionally specify a FetchConfig to use a separate query or lazy loading
-   * to load this path.
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     .select("name, status")
-   *     .fetch("contacts", "firstName,lastName,email", FetchConfig.ofLazy(10))
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param path the property path we wish to fetch eagerly.
-   */
-  SELF fetch(String path, String fetchProperties, FetchConfig fetchConfig);
-
-  /**
-   * Specify a path to fetch eagerly including all its properties.
-   * <p>
-   * Ebean will endeavour to fetch this path using a SQL join. If Ebean determines that it can
-   * not use a SQL join (due to maxRows or because it would result in a cartesian product) Ebean
-   * will automatically convert this fetch query into a "query join" - i.e. use fetchQuery().
-   * </p>
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     // eager fetch the contacts
-   *     .fetch("contacts")
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param path the property path we wish to fetch eagerly.
-   */
-  SELF fetch(String path);
-
-  /**
-   * Fetch the path eagerly using a "query join" (separate SQL query).
-   * <p>
-   * This is the same as:
-   * <pre>{@code
-   *
-   *  fetch(path, FetchConfig.ofQuery())
-   *
-   * }</pre>
-   * <p>
-   * This would be used instead of a fetch() when we use a separate SQL query to fetch this
-   * part of the object graph rather than a SQL join.
-   * <p>
-   * We might typically get a performance benefit when the path to fetch is a OneToMany
-   * or ManyToMany, the 'width' of the 'root bean' is wide and the cardinality of the many
-   * is high.
-   *
-   * @param path the property path we wish to fetch eagerly
-   */
-  SELF fetchQuery(String path);
-
-  /**
-   * Fetch the path eagerly using L2 cache.
-   */
-  SELF fetchCache(String path);
-
-  /**
-   * Fetch the path lazily (via batch lazy loading).
-   * <p>
-   * This is the same as:
-   * </p>
-   * <pre>{@code
-   *
-   *  fetch(path, FetchConfig.ofLazy())
-   *
-   * }</pre>
-   * <p>
-   * The reason for using fetchLazy() is to either:
-   * </p>
-   * <ul>
-   * <li>Control/tune what is fetched as part of lazy loading</li>
-   * <li>Make use of the L2 cache, build this part of the graph from L2 cache</li>
-   * </ul>
-   *
-   * @param path the property path we wish to fetch lazily.
-   */
-  SELF fetchLazy(String path);
-
-  /**
-   * Additionally specify a JoinConfig to specify a "query join" and or define
-   * the lazy loading query.
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     // lazy fetch contacts with a batch size of 100
-   *     .fetch("contacts", FetchConfig.ofLazy(100))
-   *     .findList();
-   *
-   * }</pre>
-   */
-  SELF fetch(String path, FetchConfig fetchConfig);
-
-}
@@ -3,9 +3,7 @@ package io.ebean;
 import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;

-import javax.sql.DataSource;
 import java.io.Serializable;
-import java.sql.Connection;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -47,19 +45,14 @@ public interface SqlQuery extends Serializable, CancelableQuery {
   */
  SqlQuery usingTransaction(Transaction transaction);

-  /**
-   * Execute the query using the given connection.
-   */
-  SqlQuery usingConnection(Connection connection);
-
  /**
   * Ensure that the master DataSource is used if there is a read only data source
   * being used (that is using a read replica database potentially with replication lag).
   * <p>
   * When the database is configured with a read-only DataSource via
-   * say {@link io.ebean.DatabaseBuilder#readOnlyDataSource(DataSource)}then
+   * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
   * by default when a query is run without an active transaction, it uses the read-only data
-   * source. We use {@code usingMaster()} to instead ensure that the query is executed
+   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
   * against the master data source.
   */
  SqlQuery usingMaster();
@@ -1,9 +1,7 @@
 package io.ebean;

-import io.ebean.annotation.DocStoreMode;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.config.DatabaseConfig;
-import io.ebean.config.DocStoreConfig;

 import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
@@ -211,29 +209,6 @@ public interface Transaction extends AutoCloseable {
   */
  boolean isActive();

-  /**
-   * Set the behavior for document store updates on this transaction.
-   * <p>
-   * For example, set the mode to DocStoreEvent.IGNORE for this transaction and
-   * then any changes via this transaction are not sent to the doc store. This
-   * would be used when doing large bulk inserts into the database and we want
-   * to control how that is sent to the document store.
-   * </p>
-   */
-  void setDocStoreMode(DocStoreMode mode);
-
-  /**
-   * Set the batch size to use for sending messages to the document store.
-   * <p>
-   * You might set this if you know the changes in this transaction result in especially large or
-   * especially small payloads and want to adjust the batch size to match.
-   * </p>
-   * <p>
-   * Setting this overrides the default of {@link DocStoreConfig#getBulkBatchSize()}
-   * </p>
-   */
-  void setDocStoreBatchSize(int batchSize);
-
  /**
   * Explicitly turn off or on the cascading nature of save() and delete(). This
   * gives the developer exact control over what beans are saved and deleted
@@ -1,6 +1,6 @@
 package io.ebean.cache;

-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;

 /**
 * Plugin that provides a ServerCacheNotify implementation.
@@ -12,5 +12,5 @@ public interface ServerCacheNotifyPlugin {
  /**
   * Create a ServerCacheNotify implementation given the server configuration.
   */
-  ServerCacheNotify create(DatabaseBuilder config);
+  ServerCacheNotify create(DatabaseConfig config);
 }
@@ -1,7 +1,7 @@
 package io.ebean.cache;

 import io.ebean.BackgroundExecutor;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;

 /**
 * The plugin interface that creates a ServerCacheFactory.
@@ -11,5 +11,5 @@ public interface ServerCachePlugin {
  /**
   * Create the ServerCacheFactory given the server config and background executor service.
   */
-  ServerCacheFactory create(DatabaseBuilder config, BackgroundExecutor executor);
+  ServerCacheFactory create(DatabaseConfig config, BackgroundExecutor executor);
 }
@@ -1,7 +1,5 @@
 package io.ebean.config;

-import io.ebean.DatabaseBuilder;
-
 /**
 * Used to provide some automatic configuration early in the creation of a Database.
 */
@@ -10,11 +8,11 @@ public interface AutoConfigure {
  /**
   * Perform configuration for the DatabaseConfig prior to properties load.
   */
-  void preConfigure(DatabaseBuilder config);
+  void preConfigure(DatabaseConfig config);

  /**
   * Provide some configuration the DatabaseConfig prior to server creation but after properties have been applied.
   */
-  void postConfigure(DatabaseBuilder config);
+  void postConfigure(DatabaseConfig config);

 }
@@ -15,6 +15,7 @@ public class ContainerConfig {
  private String namespace;
  private String podName;
  private int port;
+
  private Properties properties;

  /**
@@ -122,4 +123,5 @@ public class ContainerConfig {
  protected boolean getProperty(Properties properties, String key, boolean defaultValue) {
    return "true".equalsIgnoreCase(properties.getProperty(key, Boolean.toString(defaultValue)));
  }
+
 }
@@ -1,7 +1,5 @@
 package io.ebean.config;

-import io.ebean.DatabaseBuilder;
-
 /**
 * Provides a ServiceLoader based mechanism to configure a DatabaseConfig.
 * <p>
@@ -37,5 +35,5 @@ public interface DatabaseConfigProvider {
   * Typically we explicitly register entity bean classes and thus avoid classpath scanning.
   * </p>
   */
-  void apply(DatabaseBuilder config);
+  void apply(DatabaseConfig config);
 }
@@ -1,320 +0,0 @@
-package io.ebean.config;
-
-import io.ebean.Transaction;
-import io.ebean.annotation.DocStoreMode;
-
-/**
- * Configuration for the Document store integration (e.g. ElasticSearch).
- */
-public class DocStoreConfig {
-
-  /**
-   * True when the Document store integration is active/on.
-   */
-  protected boolean active;
-
-  /**
-   * Set to true means Ebean will generate mapping files on startup.
-   */
-  protected boolean generateMapping;
-
-  /**
-   * When true the Document store should drop and re-create document indexes.
-   */
-  protected boolean dropCreate;
-
-  /**
-   * When true the Document store should create any document indexes that don't already exist.
-   */
-  protected boolean create;
-
-  /**
-   * The URL of the Document store. For example: http://localhost:9200.
-   */
-  protected String url;
-
-  /**
-   * Credential that be used for authentication to document store.
-   */
-  protected String username;
-
-  /**
-   * Password credential that be used for authentication to document store.
-   */
-  protected String password;
-
-  /**
-   * Set to true such that the client allows connections to invalid/self signed SSL certificates.
-   */
-  protected boolean allowAllCertificates;
-
-  /**
-   * The default mode used by indexes.
-   */
-  protected DocStoreMode persist = DocStoreMode.UPDATE;
-
-  /**
-   * The default batch size to use for the Bulk API calls.
-   */
-  protected int bulkBatchSize = 1000;
-
-  /**
-   * Resource path for the Document store mapping files.
-   */
-  protected String mappingPath;
-
-  /**
-   * Suffix used for mapping files.
-   */
-  protected String mappingSuffix;
-
-  /**
-   * Location of resources that mapping files are generated into.
-   */
-  protected String pathToResources = "src/main/resources";
-
-  /**
-   * Return true if the Document store (ElasticSearch) integration is active.
-   */
-  public boolean isActive() {
-    String systemValue = System.getProperty("ebean.docstore.active");
-    if (systemValue != null) {
-      return Boolean.parseBoolean(systemValue);
-    }
-    return active;
-  }
-
-  /**
-   * Set to true to make the Document store (ElasticSearch) integration active.
-   */
-  public void setActive(boolean active) {
-    this.active = active;
-  }
-
-  /**
-   * Return the URL to the Document store.
-   */
-  public String getUrl() {
-    String systemValue = System.getProperty("ebean.docstore.url");
-    if (systemValue != null) {
-      return systemValue;
-    }
-    return url;
-  }
-
-  /**
-   * Return the user credential for connecting to the document store.
-   */
-  public String getUsername() {
-    return username;
-  }
-
-  /**
-   * Set the user credential for connecting to the document store.
-   */
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
-  /**
-   * Return the password credential for connecting to the document store.
-   */
-  public String getPassword() {
-    return password;
-  }
-
-  /**
-   * Set the password credential for connecting to the document store.
-   */
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-  /**
-   * Set the URL to the Document store.
-   * <p>
-   * For a local ElasticSearch server this would be: http://localhost:9200
-   */
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  /**
-   * Return true if Ebean should generate mapping files on server startup.
-   */
-  public boolean isGenerateMapping() {
-    String systemValue = System.getProperty("ebean.docstore.generateMapping");
-    if (systemValue != null) {
-      return Boolean.parseBoolean(systemValue);
-    }
-    return generateMapping;
-  }
-
-  /**
-   * Set to true if Ebean should generate mapping files on server startup.
-   */
-  public void setGenerateMapping(boolean generateMapping) {
-    this.generateMapping = generateMapping;
-  }
-
-  /**
-   * Return true if the document store should recreate mapped indexes.
-   */
-  public boolean isDropCreate() {
-    String systemValue = System.getProperty("ebean.docstore.dropCreate");
-    if (systemValue != null) {
-      return Boolean.parseBoolean(systemValue);
-    }
-    return dropCreate;
-  }
-
-  /**
-   * Set to true if the document store should recreate mapped indexes.
-   */
-  public void setDropCreate(boolean dropCreate) {
-    this.dropCreate = dropCreate;
-  }
-
-  /**
-   * Create true if the document store should create mapped indexes that don't yet exist.
-   * This is only used if dropCreate is false.
-   */
-  public boolean isCreate() {
-    String systemValue = System.getProperty("ebean.docstore.create");
-    if (systemValue != null) {
-      return Boolean.parseBoolean(systemValue);
-    }
-    return create;
-  }
-
-  /**
-   * Set to true if the document store should create mapped indexes that don't yet exist.
-   * This is only used if dropCreate is false.
-   */
-  public void setCreate(boolean create) {
-    this.create = create;
-  }
-
-  /**
-   * Return true if the client allows connections to invalid/self signed SSL certificates.
-   */
-  public boolean isAllowAllCertificates() {
-    return allowAllCertificates;
-  }
-
-  /**
-   * Set to true such that the client allows connections to invalid/self signed SSL certificates.
-   */
-  public void setAllowAllCertificates(boolean allowAllCertificates) {
-    this.allowAllCertificates = allowAllCertificates;
-  }
-
-  /**
-   * Return the default batch size to use for calls to the Bulk API.
-   */
-  public int getBulkBatchSize() {
-    return bulkBatchSize;
-  }
-
-  /**
-   * Set the default batch size to use for calls to the Bulk API.
-   * <p>
-   * The batch size can be set on a transaction via {@link Transaction#setDocStoreBatchSize(int)}.
-   * </p>
-   */
-  public void setBulkBatchSize(int bulkBatchSize) {
-    this.bulkBatchSize = bulkBatchSize;
-  }
-
-  /**
-   * Return the mapping path.
-   */
-  public String getMappingPath() {
-    return mappingPath;
-  }
-
-  /**
-   * Set the mapping path.
-   */
-  public void setMappingPath(String mappingPath) {
-    this.mappingPath = mappingPath;
-  }
-
-  /**
-   * Return the mapping suffix.
-   */
-  public String getMappingSuffix() {
-    return mappingSuffix;
-  }
-
-  /**
-   * Set the mapping suffix.
-   */
-  public void setMappingSuffix(String mappingSuffix) {
-    this.mappingSuffix = mappingSuffix;
-  }
-
-  /**
-   * Return the relative file system path to resources when generating mapping files.
-   */
-  public String getPathToResources() {
-    return pathToResources;
-  }
-
-  /**
-   * Set the relative file system path to resources when generating mapping files.
-   */
-  public void setPathToResources(String pathToResources) {
-    this.pathToResources = pathToResources;
-  }
-
-  /**
-   * Return the default behavior for when Insert, Update and Delete events occur on beans that have an associated
-   * Document store.
-   */
-  public DocStoreMode getPersist() {
-    return persist;
-  }
-
-  /**
-   * Set the default behavior for when Insert, Update and Delete events occur on beans that have an associated
-   * Document store.
-   * <ul>
-   * <li>DocStoreEvent.UPDATE - build and send message to Bulk API</li>
-   * <li>DocStoreEvent.QUEUE - add an entry with the index type and id only into a queue for later processing</li>
-   * <li>DocStoreEvent.IGNORE - ignore. Most likely used when some scheduled batch job handles updating the index</li>
-   * </ul>
-   * <p>
-   * You might choose to use QUEUE if that particular index data is updating very frequently or the cost of indexing
-   * is expensive.  Setting it to QUEUE can mean many changes can be batched together potentially coalescing multiple
-   * updates for an index entry into a single update.
-   * </p>
-   * <p>
-   * You might choose to use IGNORE when you have your own external process for updating the indexes. In this case
-   * you don't want Ebean to do anything when the data changes.
-   * </p>
-   */
-  public void setPersist(DocStoreMode persist) {
-    this.persist = persist;
-  }
-
-  /**
-   * Load settings specified in properties files.
-   */
-  public void loadSettings(PropertiesWrapper properties) {
-
-    active = properties.getBoolean("docstore.active", active);
-    url = properties.get("docstore.url", url);
-    username = properties.get("docstore.username", url);
-    password = properties.get("docstore.password", url);
-    persist = properties.getEnum(DocStoreMode.class, "docstore.persist", persist);
-    bulkBatchSize = properties.getInt("docstore.bulkBatchSize", bulkBatchSize);
-    generateMapping = properties.getBoolean("docstore.generateMapping", generateMapping);
-    dropCreate = properties.getBoolean("docstore.dropCreate", dropCreate);
-    create = properties.getBoolean("docstore.create", create);
-    allowAllCertificates = properties.getBoolean("docstore.allowAllCertificates", allowAllCertificates);
-    mappingPath = properties.get("docstore.mappingPath", mappingPath);
-    mappingSuffix = properties.get("docstore.mappingSuffix", mappingSuffix);
-    pathToResources = properties.get("docstore.pathToResources", pathToResources);
-  }
-}
@@ -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
-}
@@ -1,29 +1,50 @@
 package io.ebean.config;

-import io.ebean.ProfileLocation;
 import io.ebean.bean.ObjectGraphNode;

-import java.util.List;
-
 /**
- * The data for the slow query.
+ * Slow query event.
 */
-public interface SlowQueryEvent {
+public class SlowQueryEvent {
+
+  private final String sql;
+
+  private final long timeMillis;
+
+  private final int rowCount;
+
+  private final ObjectGraphNode originNode;
+
+  /**
+   * Construct with the SQL and execution time in millis.
+   */
+  public SlowQueryEvent(String sql, long timeMillis, int rowCount, ObjectGraphNode originNode) {
+    this.sql = sql;
+    this.timeMillis = timeMillis;
+    this.rowCount = rowCount;
+    this.originNode = originNode;
+  }

  /**
   * Return the SQL for the slow query.
   */
-  String getSql();
+  public String getSql() {
+    return sql;
+  }

  /**
   * Return the execution time in millis.
   */
-  long getTimeMillis();
+  public long getTimeMillis() {
+    return timeMillis;
+  }

  /**
   * Return the total row count associated with the query.
   */
-  int getRowCount();
+  public int getRowCount() {
+    return rowCount;
+  }

  /**
   * Return the origin point for the root query.
@@ -32,20 +53,7 @@ public interface SlowQueryEvent {
   * shows the code that invoked the query.
   * </p>
   */
-  ObjectGraphNode getOriginNode();
-
-  /**
-   * Return the bind parameters.
-   */
-  List<Object> getBindParams();
-
-  /**
-   * Return the label.
-   */
-  String getLabel();
-
-  /**
-   * Return the profile location.
-   */
-  ProfileLocation getProfileLocation();
+  public ObjectGraphNode getOriginNode() {
+    return originNode;
+  }
 }
@@ -769,15 +769,4 @@ public class DatabasePlatform {
  public boolean supportsNativeJavaTime() {
    return supportsNativeJavaTime;
  }
-
-  public String inlineSqlComment(String label) {
-    if (label == null) {
-      return "";
-    }
-    return "/* " + label + " */ ";
-  }
-
-  public String inlineSqlHint(String hint) {
-    return "/*+ " + hint + " */ ";
-  }
 }
@@ -1,7 +0,0 @@
-package io.ebean.docstore;
-
-/**
- * Document Mapping for a bean marker interface.
- */
-public interface DocMapping {
-}
@@ -1,7 +0,0 @@
-package io.ebean.docstore;
-
-/**
- * Document query request context marker interface.
- */
-public interface DocQueryContext<T> {
-}
@@ -1,7 +0,0 @@
-package io.ebean.docstore;
-
-/**
- * Document update context marker interface.
- */
-public interface DocUpdateContext {
-}
@@ -1,102 +0,0 @@
-package io.ebean.docstore;
-
-import java.util.Map;
-
-/**
- * Raw document.
- */
-public class RawDoc {
-
-  private Map<String, Object> source;
-  private String id;
-  private double score;
-  private String index;
-  private String type;
-
-  /**
-   * Construct the document with all the meta data.
-   */
-  public RawDoc(Map<String, Object> source, String id, double score, String index, String type) {
-    this.source = source;
-    this.id = id;
-    this.score = score;
-    this.index = index;
-    this.type = type;
-  }
-
-  /**
-   * Construct empty (typically for JSON marshalling).
-   */
-  public RawDoc() {
-  }
-
-  /**
-   * Return the source document as a Map.
-   */
-  public Map<String, Object> getSource() {
-    return source;
-  }
-
-  /**
-   * Return the Id value.
-   */
-  public String getId() {
-    return id;
-  }
-
-  /**
-   * Return the score.
-   */
-  public double getScore() {
-    return score;
-  }
-
-  /**
-   * Return the index name.
-   */
-  public String getIndex() {
-    return index;
-  }
-
-  /**
-   * Return the index type.
-   */
-  public String getType() {
-    return type;
-  }
-
-  /**
-   * Set the source document.
-   */
-  public void setSource(Map<String, Object> source) {
-    this.source = source;
-  }
-
-  /**
-   * Set the id value.
-   */
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  /**
-   * Set the score.
-   */
-  public void setScore(double score) {
-    this.score = score;
-  }
-
-  /**
-   * Set the index name.
-   */
-  public void setIndex(String index) {
-    this.index = index;
-  }
-
-  /**
-   * Set the index type.
-   */
-  public void setType(String type) {
-    this.type = type;
-  }
-}
@@ -1,6 +1,6 @@
 package io.ebean.event;

-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;

 /**
 * Used to configure the server on startup.
@@ -13,6 +13,6 @@ public interface ServerConfigStartup {
  /**
   * On starting configure the DatabaseConfig.
   */
-  void onStart(DatabaseBuilder config);
+  void onStart(DatabaseConfig config);

 }
@@ -8,7 +8,6 @@ import java.sql.Driver;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
@@ -24,7 +23,7 @@ public final class ShutdownManager {

  private static final System.Logger log = EbeanVersion.log;
  private static final ReentrantLock lock = new ReentrantLock();
-  private static final List<Database> databases = Collections.synchronizedList(new ArrayList<>());
+  private static final List<Database> databases = new ArrayList<>();
  private static final ShutdownHook shutdownHook = new ShutdownHook();

  private static boolean stopping;
@@ -178,7 +177,12 @@ public final class ShutdownManager {
   * Register an ebeanServer to be shutdown when the JVM is shutdown.
   */
  public static void registerDatabase(Database server) {
-    databases.add(server);
+    lock.lock();
+    try {
+      databases.add(server);
+    } finally {
+      lock.unlock();
+    }
  }

  /**
@@ -188,7 +192,12 @@ public final class ShutdownManager {
   * </p>
   */
  public static void unregisterDatabase(Database server) {
-    databases.remove(server);
+    lock.lock();
+    try {
+      databases.remove(server);
+    } finally {
+      lock.unlock();
+    }
  }

  private static class ShutdownHook extends Thread {
@@ -1,37 +0,0 @@
-package io.ebean.event.readaudit;
-
-/**
- * Log that the query was executed
- */
-public interface ReadAuditLogger {
-
-  /**
-   * Called when a new query plan is created.
-   * <p>
-   * The query plan has the full sql and logging the query plan separately means that each of
-   * the bean and many read events can log the query plan key and not the full sql (reducing the
-   * bulk size of the read audit logs).
-   * </p>
-   */
-  void queryPlan(ReadAuditQueryPlan queryPlan);
-
-  /**
-   * Audit a find bean query that returned a bean.
-   * <p>
-   * Finds that did not return a bean are excluded.
-   * </p>
-   */
-  void auditBean(ReadEvent readBean);
-
-  /**
-   * Audit a find many query that returned some beans.
-   * <p>
-   * Finds that did not return any beans are excluded.
-   * </p>
-   * <p>
-   * For large queries executed via findEach() etc the ids are collected in batches
-   * and logged. Hence the ids list has a maximum size of the batch size.
-   * </p>
-   */
-  void auditMany(ReadEvent readMany);
-}
@@ -1,23 +0,0 @@
-package io.ebean.event.readaudit;
-
-/**
- * Set user context information into the read event prior to it being logged.
- */
-public interface ReadAuditPrepare {
-
-  /**
-   * Prepare the read event by setting any user context information into the read event such as the
-   * application user id and ip address.
-   * <p>
-   * This method is called prior to the read event being sent to the ReadAuditLogger.
-   * </p>
-   * <p>
-   * Note that for findFutureList() queries prepare() is called early in the foreground thread
-   * prior to the query executing and at that point the ReadEvent bean only has the bean type
-   * and no other details (which are populated later when the query is executed in the background
-   * thread).
-   * </p>
-   */
-  void prepare(ReadEvent readEvent);
-
-}
@@ -1,97 +0,0 @@
-package io.ebean.event.readaudit;
-
-/**
- * A SQL query and associated keys.
- * <p>
- * This is logged as a separate event so that the
- * </p>
- */
-public class ReadAuditQueryPlan {
-
-  String beanType;
-
-  String queryKey;
-
-  String sql;
-
-  /**
-   * Construct given the beanType, queryKey and sql.
-   */
-  public ReadAuditQueryPlan(String beanType, String queryKey, String sql) {
-    this.beanType = beanType;
-    this.queryKey = queryKey;
-    this.sql = sql;
-  }
-
-  /**
-   * Construct for JSON tools.
-   */
-  public ReadAuditQueryPlan() {
-  }
-
-  @Override
-  public String toString() {
-    return "beanType:" + beanType + " queryKey:" + queryKey + " sql:" + sql;
-  }
-
-  /**
-   * Return the bean type.
-   */
-  public String getBeanType() {
-    return beanType;
-  }
-
-  /**
-   * Set the bean type.
-   */
-  public void setBeanType(String beanType) {
-    this.beanType = beanType;
-  }
-
-  /**
-   * Return the query key (relative to the bean type).
-   */
-  public String getQueryKey() {
-    return queryKey;
-  }
-
-  /**
-   * Set the query key.
-   */
-  public void setQueryKey(String queryKey) {
-    this.queryKey = queryKey;
-  }
-
-  /**
-   * Return the sql statement.
-   */
-  public String getSql() {
-    return sql;
-  }
-
-  /**
-   * Set the sql statement.
-   */
-  public void setSql(String sql) {
-    this.sql = sql;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    ReadAuditQueryPlan that = (ReadAuditQueryPlan) o;
-    if (!beanType.equals(that.beanType)) return false;
-    if (!queryKey.equals(that.queryKey)) return false;
-    return sql.equals(that.sql);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = beanType.hashCode();
-    result = 92821 * result + queryKey.hashCode();
-    result = 92821 * result + sql.hashCode();
-    return result;
-  }
-}
@@ -1,261 +0,0 @@
-package io.ebean.event.readaudit;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Read event sent to the ReadEventLogger.
- * <p>
- * This is a flattened in that it contains either a read bean or list of beans. It is flattened
- * in this way to simplify logging and processing and simply means that it either contains an
- * id or a list of ids.
- * </p>
- */
-public class ReadEvent {
-
-  /**
-   * User defined 'source' such as the application name.
-   */
-  protected String source;
-
-  /**
-   * Application user id expected to be optionally populated by ChangeLogPrepare.
-   */
-  protected String userId;
-
-  /**
-   * Application user ip address expected to be optionally populated by ChangeLogPrepare.
-   */
-  protected String userIpAddress;
-
-  /**
-   * Arbitrary user context information expected to be optionally populated by ChangeLogPrepare.
-   */
-  protected Map<String, String> userContext;
-
-  /**
-   * The time the bean change was created.
-   */
-  protected long eventTime;
-
-  /**
-   * The type of the bean(s) read.
-   */
-  protected String beanType;
-
-  /**
-   * The query key (relative to the bean type).
-   */
-  protected String queryKey;
-
-  /**
-   * The bind log when the query was executed.
-   */
-  protected String bindLog;
-
-  /**
-   * The id of the bean read.
-   */
-  protected Object id;
-
-  /**
-   * The ids of the beans read.
-   */
-  protected List<Object> ids;
-
-  /**
-   * Common constructor for single bean and multi-bean read events.
-   */
-  protected ReadEvent(String beanType, String queryKey, String bindLog) {
-    this.beanType = beanType;
-    this.queryKey = queryKey;
-    this.bindLog = bindLog;
-    this.eventTime = System.currentTimeMillis();
-  }
-
-  /**
-   * Construct for a single bean read.
-   */
-  public ReadEvent(String beanType, String queryKey, String bindLog, Object id) {
-    this(beanType, queryKey, bindLog);
-    this.id = id;
-  }
-
-  /**
-   * Construct for many beans read.
-   */
-  public ReadEvent(String beanType, String queryKey, String bindLog, List<Object> ids) {
-    this(beanType, queryKey, bindLog);
-    this.ids = ids;
-  }
-
-  /**
-   * Construct for many future list query.
-   */
-  public ReadEvent(String beanType) {
-    this.beanType = beanType;
-    this.eventTime = System.currentTimeMillis();
-  }
-
-  /**
-   * Constructor for JSON tools.
-   */
-  public ReadEvent() {
-  }
-
-  /**
-   * Return a code that identifies the source of the change (like the name of the application).
-   */
-  public String getSource() {
-    return source;
-  }
-
-  /**
-   * Set the source of the change (like the name of the application).
-   */
-  public void setSource(String source) {
-    this.source = source;
-  }
-
-  /**
-   * Return the application user Id.
-   */
-  public String getUserId() {
-    return userId;
-  }
-
-  /**
-   * Set the application user Id.
-   * <p>
-   * This can be set by the ChangeLogListener in the prepare() method which is called
-   * in the foreground thread.
-   * </p>
-   */
-  public void setUserId(String userId) {
-    this.userId = userId;
-  }
-
-  /**
-   * Return the application users ip address.
-   */
-  public String getUserIpAddress() {
-    return userIpAddress;
-  }
-
-  /**
-   * Set the application users ip address.
-   * <p>
-   * This can be set by the ChangeLogListener in the prepare() method which is called
-   * in the foreground thread.
-   * </p>
-   */
-  public void setUserIpAddress(String userIpAddress) {
-    this.userIpAddress = userIpAddress;
-  }
-
-  /**
-   * Return a user context value - anything you set yourself in ChangeLogListener prepare().
-   */
-  public Map<String, String> getUserContext() {
-    if (userContext == null) {
-      userContext = new LinkedHashMap<>();
-    }
-    return userContext;
-  }
-
-  /**
-   * Set a user context value (anything you like).
-   * <p>
-   * This can be set by the ChangeLogListener in the prepare() method which is called
-   * in the foreground thread.
-   * </p>
-   */
-  public void setUserContext(Map<String, String> userContext) {
-    this.userContext = userContext;
-  }
-
-  /**
-   * Return the type of bean read.
-   */
-  public String getBeanType() {
-    return beanType;
-  }
-
-  /**
-   * Set the type of bean read.
-   */
-  public void setBeanType(String beanType) {
-    this.beanType = beanType;
-  }
-
-  /**
-   * Return the query key (relative to the bean type).
-   */
-  public String getQueryKey() {
-    return queryKey;
-  }
-
-  /**
-   * Set the query key (relative to the bean type).
-   */
-  public void setQueryKey(String queryKey) {
-    this.queryKey = queryKey;
-  }
-
-  /**
-   * Return the bind log used when executing the query.
-   */
-  public String getBindLog() {
-    return bindLog;
-  }
-
-  /**
-   * Set the bind log used when executing the query.
-   */
-  public void setBindLog(String bindLog) {
-    this.bindLog = bindLog;
-  }
-
-  /**
-   * Return the event date time.
-   */
-  public long getEventTime() {
-    return eventTime;
-  }
-
-  /**
-   * Set the event date time.
-   */
-  public void setEventTime(long eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  /**
-   * Return the id of the bean read.
-   */
-  public Object getId() {
-    return id;
-  }
-
-  /**
-   * Set the id of the bean read.
-   */
-  public void setId(Object id) {
-    this.id = id;
-  }
-
-  /**
-   * Return the ids of the beans read.
-   */
-  public List<Object> getIds() {
-    return ids;
-  }
-
-  /**
-   * Set the ids of the beans read.
-   */
-  public void setIds(List<Object> ids) {
-    this.ids = ids;
-  }
-}
@@ -1,8 +0,0 @@
-/**
- * Provides Auditing of read events including queries and L2 cache.
- * <p>
- * Provides a built support for supplied an audit of all the 'read events' for beans annotated
- * with <code>@ReadAudit</code>
- * </p>
- */
-package io.ebean.event.readaudit;
@@ -1,72 +0,0 @@
-package io.ebean.plugin;
-
-import io.ebean.FetchPath;
-import io.ebean.Query;
-import io.ebean.docstore.DocUpdateContext;
-
-import java.io.IOException;
-
-/**
- * Doc store functions for a specific entity bean type.
- *
- * @param <T> The type of entity bean
- */
-public interface BeanDocType<T> {
-
-  /**
-   * Return the doc store index type for this bean type.
-   */
-  String indexType();
-
-  /**
-   * Return the doc store index name for this bean type.
-   */
-  String indexName();
-
-  /**
-   * Apply the appropriate fetch path to the query such that the query returns beans matching
-   * the document store structure with the expected embedded properties.
-   */
-  void applyPath(Query<T> spiQuery);
-
-  /**
-   * Return the FetchPath for the embedded document.
-   */
-  FetchPath embedded(String path);
-
-  /**
-   * For embedded 'many' properties we need a FetchPath relative to the root which is used to
-   * build and replace the embedded list.
-   */
-  FetchPath embeddedManyRoot(String path);
-
-  /**
-   * Return a 'raw' property mapped for the given property.
-   * If none exists the given property is returned.
-   */
-  String rawProperty(String property);
-
-  /**
-   * Store the bean in the doc store index.
-   * <p>
-   * This somewhat assumes the bean is fetched with appropriate path properties
-   * to match the expected document structure.
-   */
-  void index(Object idValue, T bean, DocUpdateContext txn) throws IOException;
-
-  /**
-   * Add a delete by Id to the doc store.
-   */
-  void deleteById(Object idValue, DocUpdateContext txn) throws IOException;
-
-  /**
-   * Add a embedded document update to the doc store.
-   *
-   * @param idValue            the Id value of the bean holding the embedded document
-   * @param embeddedProperty   the embedded property
-   * @param embeddedRawContent the content of the embedded document in JSON form
-   * @param txn                the doc store transaction to add the update to
-   */
-  void updateEmbedded(Object idValue, String embeddedProperty, String embeddedRawContent, DocUpdateContext txn) throws IOException;
-
-}
@@ -2,15 +2,12 @@ package io.ebean.plugin;

 import io.ebean.Query;
 import io.ebean.config.dbplatform.IdType;
-import io.ebean.docstore.DocMapping;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
 import io.ebean.event.BeanQueryAdapter;

 import java.util.Collection;
-import java.util.List;
-import java.util.function.Consumer;

 /**
 * Information and methods on BeanDescriptors made available to plugins.
@@ -145,73 +142,4 @@ public interface BeanType<T> {
   */
  IdType idType();

-  /**
-   * Return true if this bean type has doc store backing.
-   */
-  boolean isDocStoreMapped();
-
-  /**
-   * Return the DocumentMapping for this bean type.
-   * <p>
-   * This is the document structure and mapping options for how this bean type is mapped
-   * for the document store.
-   * </p>
-   */
-  DocMapping docMapping();
-
-  /**
-   * Return the doc store queueId for this bean type.
-   */
-  String docStoreQueueId();
-
-  /**
-   * Return the doc store support for this bean type.\
-   */
-  BeanDocType<T> docStore();
-
-  /**
-   * Add the discriminator value to the query if needed.
-   */
-  void addInheritanceWhere(Query<?> query);
-
-  /**
-   * Return the root bean type for an inheritance hierarchy.
-   */
-  BeanType<?> root();
-
-  /**
-   * Return true if this bean type has an inheritance hierarchy.
-   */
-  boolean hasInheritance();
-
-  /**
-   * Return true if this object is the root level object in its entity
-   * inheritance.
-   */
-  boolean isInheritanceRoot();
-
-  /**
-   * Returns all direct children of this beantype
-   */
-  List<BeanType<?>> inheritanceChildren();
-
-  /**
-   * Returns the parent in inheritance hierarchy
-   */
-  BeanType<?> inheritanceParent();
-
-  /**
-   * Visit all children recursively
-   */
-  void visitAllInheritanceChildren(Consumer<BeanType<?>> visitor);
-
-  /**
-   * Return the discriminator column.
-   */
-  String discColumn();
-
-  /**
-   * Create a bean given the discriminator value.
-   */
-  T createBeanUsingDisc(Object discValue);
 }
@@ -3,7 +3,7 @@ package io.ebean.plugin;
 import io.ebean.Database;
 import io.ebean.bean.BeanLoader;
 import io.ebean.bean.EntityBeanIntercept;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;

 import java.util.List;
@@ -16,7 +16,7 @@ public interface SpiServer extends Database {
  /**
   * Return the DatabaseConfig.
   */
-  DatabaseBuilder.Settings config();
+  DatabaseConfig config();

  /**
   * Return the DatabasePlatform for this database.
@@ -38,11 +38,6 @@ public interface SpiServer extends Database {
   */
  List<? extends BeanType<?>> beanTypes(String baseTableName);

-  /**
-   * Return the bean type for a given doc store queueId.
-   */
-  BeanType<?> beanTypeForQueueId(String queueId);
-
  /**
   * Return a BeanLoader.
   */
@@ -1,98 +0,0 @@
-package io.ebean.search;
-
-/**
- * Options for the text match and multi match expressions.
- */
-public abstract class AbstractMatch {
-
-  protected boolean operatorAnd;
-
-  protected String analyzer;
-
-  protected double boost;
-
-  protected String minShouldMatch;
-
-  protected int maxExpansions;
-
-  protected String zeroTerms;
-
-  protected double cutoffFrequency;
-
-  protected String fuzziness;
-
-  protected int prefixLength;
-
-  protected String rewrite;
-
-  /**
-   * Return true if using the AND operator otherwise using the OR operator.
-   */
-  public boolean isOperatorAnd() {
-    return operatorAnd;
-  }
-
-  /**
-   * Return the boost.
-   */
-  public double getBoost() {
-    return boost;
-  }
-
-  /**
-   * Return the minimum should match.
-   */
-  public String getMinShouldMatch() {
-    return minShouldMatch;
-  }
-
-  /**
-   * Return the zero terms option.
-   */
-  public String getZeroTerms() {
-    return zeroTerms;
-  }
-
-  /**
-   * Return the cutoff frequency.
-   */
-  public double getCutoffFrequency() {
-    return cutoffFrequency;
-  }
-
-  /**
-   * Return the max expansions.
-   */
-  public int getMaxExpansions() {
-    return maxExpansions;
-  }
-
-  /**
-   * Return the analyzer.
-   */
-  public String getAnalyzer() {
-    return analyzer;
-  }
-
-  /**
-   * Return the fuzziness.
-   */
-  public String getFuzziness() {
-    return fuzziness;
-  }
-
-  /**
-   * Return the prefix length.
-   */
-  public int getPrefixLength() {
-    return prefixLength;
-  }
-
-  /**
-   * Return the rewrite option.
-   */
-  public String getRewrite() {
-    return rewrite;
-  }
-
-}
@@ -1,117 +0,0 @@
-package io.ebean.search;
-
-/**
- * Options for the text match expression.
- */
-public class Match extends AbstractMatch {
-
-  protected boolean phrase;
-
-  protected boolean phrasePrefix;
-
-  public Match() {
-  }
-
-  /**
-   * Set this to be a "Phrase" type expression.
-   */
-  public Match phrase() {
-    phrase = true;
-    return this;
-  }
-
-  /**
-   * Set this to be a "Phrase Prefix" type expression.
-   */
-  public Match phrasePrefix() {
-    phrasePrefix = true;
-    return this;
-  }
-
-  /**
-   * Use the AND operator (rather than OR).
-   */
-  public Match opAnd() {
-    operatorAnd = true;
-    return this;
-  }
-
-  /**
-   * Use the OR operator (rather than AND).
-   */
-  public Match opOr() {
-    operatorAnd = false;
-    return this;
-  }
-
-  /**
-   * Set the zero terms.
-   */
-  public Match zeroTerms(String zeroTerms) {
-    this.zeroTerms = zeroTerms;
-    return this;
-  }
-
-  /**
-   * Set the cutoff frequency.
-   */
-  public Match cutoffFrequency(double cutoffFrequency) {
-    this.cutoffFrequency = cutoffFrequency;
-    return this;
-  }
-
-  /**
-   * Set the max expansions (for phrase prefix only).
-   */
-  public Match maxExpansions(int maxExpansions) {
-    this.maxExpansions = maxExpansions;
-    return this;
-  }
-
-  /**
-   * Set the Analyzer to use for this expression.
-   */
-  public Match analyzer(String analyzer) {
-    this.analyzer = analyzer;
-    return this;
-  }
-
-  /**
-   * Set the boost.
-   */
-  public Match boost(double boost) {
-    this.boost = boost;
-    return this;
-  }
-
-  /**
-   * Set the rewrite to use.
-   */
-  public Match minShouldMatch(String minShouldMatch) {
-    this.minShouldMatch = minShouldMatch;
-    return this;
-  }
-
-  /**
-   * Set the rewrite to use.
-   */
-  public Match rewrite(String rewrite) {
-    this.rewrite = rewrite;
-    return this;
-  }
-
-  /**
-   * Return true if this is a phrase query.
-   */
-  public boolean isPhrase() {
-    return phrase;
-  }
-
-  /**
-   * Return true if this is a phrase prefix query.
-   */
-  public boolean isPhrasePrefix() {
-    return phrasePrefix;
-  }
-
-}
@@ -1,148 +0,0 @@
-package io.ebean.search;
-
-/**
- * Options for the text match expression.
- */
-public class MultiMatch extends AbstractMatch {
-
-  /**
-   * The MultiMatch type.
-   */
-  public enum Type {
-    BEST_FIELDS,
-    MOST_FIELDS,
-    CROSS_FIELDS,
-    PHRASE,
-    PHRASE_PREFIX
-  }
-
-  protected final String[] fields;
-
-  protected Type type = Type.BEST_FIELDS;
-
-  protected double tieBreaker;
-
-  /**
-   * Create with the given fields.
-   */
-  public static MultiMatch fields(String... fields) {
-    return new MultiMatch(fields);
-  }
-
-  /**
-   * Construct with a set of fields.
-   */
-  public MultiMatch(String... fields) {
-    this.fields = fields;
-  }
-
-  /**
-   * Set the type of query.
-   */
-  public MultiMatch type(Type type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * Set the tieBreaker to use.
-   */
-  public MultiMatch tieBreaker(double tieBreaker) {
-    this.tieBreaker = tieBreaker;
-    return this;
-  }
-
-  /**
-   * Use the AND operator (rather than OR).
-   */
-  public MultiMatch opAnd() {
-    operatorAnd = true;
-    return this;
-  }
-
-  /**
-   * Use the OR operator (rather than AND).
-   */
-  public MultiMatch opOr() {
-    operatorAnd = false;
-    return this;
-  }
-
-  /**
-   * Set the minimum should match value.
-   */
-  public MultiMatch minShouldMatch(String minShouldMatch) {
-    this.minShouldMatch = minShouldMatch;
-    return this;
-  }
-
-  /**
-   * Set the boost.
-   */
-  public MultiMatch boost(double boost) {
-    this.boost = boost;
-    return this;
-  }
-
-  /**
-   * Set the zero terms.
-   */
-  public MultiMatch zeroTerms(String zeroTerms) {
-    this.zeroTerms = zeroTerms;
-    return this;
-  }
-
-  /**
-   * Set the cutoff frequency.
-   */
-  public MultiMatch cutoffFrequency(double cutoffFrequency) {
-    this.cutoffFrequency = cutoffFrequency;
-    return this;
-  }
-
-  /**
-   * Set the max expansions (for phrase prefix only).
-   */
-  public MultiMatch maxExpansions(int maxExpansions) {
-    this.maxExpansions = maxExpansions;
-    return this;
-  }
-
-  /**
-   * Set the Analyzer to use for this expression.
-   */
-  public MultiMatch analyzer(String analyzer) {
-    this.analyzer = analyzer;
-    return this;
-  }
-
-  /**
-   * Set the rewrite to use.
-   */
-  public MultiMatch rewrite(String rewrite) {
-    this.rewrite = rewrite;
-    return this;
-  }
-
-  /**
-   * Return the type.
-   */
-  public Type getType() {
-    return type;
-  }
-
-  /**
-   * Return the fields to search.
-   */
-  public String[] getFields() {
-    return fields;
-  }
-
-  /**
-   * Return the tie breaker.
-   */
-  public double getTieBreaker() {
-    return tieBreaker;
-  }
-
-}
@@ -1,139 +0,0 @@
-package io.ebean.search;
-
-/**
- * Text common terms query.
- * <p>
- * This maps to an ElasticSearch "common terms query".
- * </p>
- * <pre>{@code
- *
- *  TextCommonTerms options = new TextCommonTerms()
- *    .cutoffFrequency(0.001)
- *    .minShouldMatch("50%")
- *    .lowFreqOperatorAnd(true)
- *    .highFreqOperatorAnd(true);
- *
- *  List<Customer> customers = database.find(Customer.class)
- *    .text()
- *    .textCommonTerms("the brown", options)
- *    .findList();
- *
- * }</pre>
- * <pre>{@code
- *
- *   // ElasticSearch expression
- *
- *   "common": {
- *     "body": {
- *       "query": "the brown",
- *       "cutoff_frequency": 0.001,
- *       "low_freq_operator": "and",
- *       "high_freq_operator": "and",
- *       "minimum_should_match": "50%"
- *     }
- *   }
- *
- * }</pre>
- */
-public class TextCommonTerms {
-
-  protected double cutoffFrequency;
-
-  protected boolean lowFreqOperatorAnd;
-  protected boolean highFreqOperatorAnd;
-
-  protected String minShouldMatch;
-  protected String minShouldMatchLowFreq;
-  protected String minShouldMatchHighFreq;
-
-  /**
-   * Set the cutoff frequency.
-   */
-  public TextCommonTerms cutoffFrequency(double cutoffFrequency) {
-    this.cutoffFrequency = cutoffFrequency;
-    return this;
-  }
-
-  /**
-   * Set to true if low frequency terms should use AND operator.
-   */
-  public TextCommonTerms lowFreqOperatorAnd(boolean opAnd) {
-    this.lowFreqOperatorAnd = opAnd;
-    return this;
-  }
-
-  /**
-   * Set to true if high frequency terms should use AND operator.
-   */
-  public TextCommonTerms highFreqOperatorAnd(boolean opAnd) {
-    this.highFreqOperatorAnd = opAnd;
-    return this;
-  }
-
-  /**
-   * Set the minimum should match.
-   */
-  public TextCommonTerms minShouldMatch(String minShouldMatch) {
-    this.minShouldMatch = minShouldMatch;
-    return this;
-  }
-
-  /**
-   * Set the minimum should match for low frequency terms.
-   */
-  public TextCommonTerms minShouldMatchLowFreq(String minShouldMatchLowFreq) {
-    this.minShouldMatchLowFreq = minShouldMatchLowFreq;
-    return this;
-  }
-
-  /**
-   * Set the minimum should match for high frequency terms.
-   */
-  public TextCommonTerms minShouldMatchHighFreq(String minShouldMatchHighFreq) {
-    this.minShouldMatchHighFreq = minShouldMatchHighFreq;
-    return this;
-  }
-
-  /**
-   * Return true if low freq should use the AND operator.
-   */
-  public boolean isLowFreqOperatorAnd() {
-    return lowFreqOperatorAnd;
-  }
-
-  /**
-   * Return true if high freq should use the AND operator.
-   */
-  public boolean isHighFreqOperatorAnd() {
-    return highFreqOperatorAnd;
-  }
-
-  /**
-   * Return the cutoff frequency.
-   */
-  public double getCutoffFrequency() {
-    return cutoffFrequency;
-  }
-
-  /**
-   * Return the minimum to match.
-   */
-  public String getMinShouldMatch() {
-    return minShouldMatch;
-  }
-
-  /**
-   * Return the minimum to match for high frequency.
-   */
-  public String getMinShouldMatchHighFreq() {
-    return minShouldMatchHighFreq;
-  }
-
-  /**
-   * Return the minimum to match for low frequency.
-   */
-  public String getMinShouldMatchLowFreq() {
-    return minShouldMatchLowFreq;
-  }
-
-}
@@ -1,398 +0,0 @@
-package io.ebean.search;
-
-/**
- * Text query string options.
- * <p>
- * This maps to an ElasticSearch "query string query".
- * </p>
- * <pre>{@code
- *
- *  TextQueryString options = new TextQueryString()
- *       .analyzeWildcard(true)
- *       .fields("name")
- *       .lenient(true)
- *       .opAnd();
- *
- *   List<Customer> customers = database.find(Customer.class)
- *       .text()
- *       .textSimple("quick brown", options)
- *       .findList();
- *
- * }</pre>
- * <pre>{@code
- *
- *  // just use default options
- *  TextQueryString options = new TextQueryString();
- *
- *   List<Customer> customers = database.find(Customer.class)
- *       .text()
- *       .textSimple("quick brown", options)
- *       .findList();
- *
- * }</pre>
- */
-public class TextQueryString {
-
-  public static final int DEFAULT_FUZZY_MAX_EXPANSIONS = 50;
-
-  protected final String[] fields;
-
-  /**
-   * Only used when multiple fields set.
-   */
-  protected boolean useDisMax = true;
-
-  /**
-   * Only used when multiple fields set.
-   */
-  protected double tieBreaker;
-
-  protected String defaultField;
-
-  protected boolean operatorAnd;
-
-  protected String analyzer;
-
-  protected boolean allowLeadingWildcard = true;
-
-  protected boolean lowercaseExpandedTerms = true;
-
-  protected int fuzzyMaxExpansions = DEFAULT_FUZZY_MAX_EXPANSIONS;
-
-  protected String fuzziness;
-
-  protected int fuzzyPrefixLength;
-
-  protected double phraseSlop;
-
-  protected double boost;
-
-  protected boolean analyzeWildcard;
-
-  protected boolean autoGeneratePhraseQueries;
-
-  protected String minShouldMatch;
-
-  protected boolean lenient;
-
-  protected String locale;
-
-  protected String timeZone;
-
-  protected String rewrite;
-
-  /**
-   * Create with given fields.
-   */
-  public static TextQueryString fields(String... fields) {
-    return new TextQueryString(fields);
-  }
-
-  /**
-   * Construct with the fields to use.
-   */
-  public TextQueryString(String... fields) {
-    this.fields = fields;
-  }
-
-  /**
-   * Use the AND operator (rather than OR).
-   */
-  public TextQueryString opAnd() {
-    this.operatorAnd = true;
-    return this;
-  }
-
-  /**
-   * Use the OR operator (rather than AND).
-   */
-  public TextQueryString opOr() {
-    this.operatorAnd = false;
-    return this;
-  }
-
-  /**
-   * Set the locale.
-   */
-  public TextQueryString locale(String locale) {
-    this.locale = locale;
-    return this;
-  }
-
-  /**
-   * Set lenient mode.
-   */
-  public TextQueryString lenient(boolean lenient) {
-    this.lenient = lenient;
-    return this;
-  }
-
-  /**
-   * Set the minimum should match.
-   */
-  public TextQueryString minShouldMatch(String minShouldMatch) {
-    this.minShouldMatch = minShouldMatch;
-    return this;
-  }
-
-  /**
-   * Set the analyzer.
-   */
-  public TextQueryString analyzer(String analyzer) {
-    this.analyzer = analyzer;
-    return this;
-  }
-
-  /**
-   * Set useDisMax option (when multiple fields only).
-   */
-  public TextQueryString useDisMax(boolean useDisMax) {
-    this.useDisMax = useDisMax;
-    return this;
-  }
-
-  /**
-   * Set tieBreaker option (when multiple fields only).
-   */
-  public TextQueryString tieBreaker(double tieBreaker) {
-    this.tieBreaker = tieBreaker;
-    return this;
-  }
-
-  /**
-   * Set the default field.
-   */
-  public TextQueryString defaultField(String defaultField) {
-    this.defaultField = defaultField;
-    return this;
-  }
-
-  /**
-   * Set allow leading wildcard mode.
-   */
-  public TextQueryString allowLeadingWildcard(boolean allowLeadingWildcard) {
-    this.allowLeadingWildcard = allowLeadingWildcard;
-    return this;
-  }
-
-  /**
-   * Set lowercase expanded terms mode.
-   */
-  public TextQueryString lowercaseExpandedTerms(boolean lowercaseExpandedTerms) {
-    this.lowercaseExpandedTerms = lowercaseExpandedTerms;
-    return this;
-  }
-
-  /**
-   * Set fuzzy max expansions.
-   */
-  public TextQueryString fuzzyMaxExpansions(int fuzzyMaxExpansions) {
-    this.fuzzyMaxExpansions = fuzzyMaxExpansions;
-    return this;
-  }
-
-  /**
-   * Set fuzziness.
-   */
-  public TextQueryString fuzziness(String fuzziness) {
-    this.fuzziness = fuzziness;
-    return this;
-  }
-
-  /**
-   * Set the fuzzy prefix length.
-   */
-  public TextQueryString fuzzyPrefixLength(int fuzzyPrefixLength) {
-    this.fuzzyPrefixLength = fuzzyPrefixLength;
-    return this;
-  }
-
-  /**
-   * Set the phrase slop.
-   */
-  public TextQueryString phraseSlop(double phraseSlop) {
-    this.phraseSlop = phraseSlop;
-    return this;
-  }
-
-  /**
-   * Set the boost.
-   */
-  public TextQueryString boost(double boost) {
-    this.boost = boost;
-    return this;
-  }
-
-  /**
-   * Set the analyze wildcard mode.
-   */
-  public TextQueryString analyzeWildcard(boolean analyzeWildcard) {
-    this.analyzeWildcard = analyzeWildcard;
-    return this;
-  }
-
-  /**
-   * Set the auto generate phrase queries mode.
-   */
-  public TextQueryString autoGeneratePhraseQueries(boolean autoGeneratePhraseQueries) {
-    this.autoGeneratePhraseQueries = autoGeneratePhraseQueries;
-    return this;
-  }
-
-  /**
-   * Set the time zone.
-   */
-  public TextQueryString timeZone(String timeZone) {
-    this.timeZone = timeZone;
-    return this;
-  }
-
-  /**
-   * Set the rewrite option.
-   */
-  public TextQueryString rewrite(String rewrite) {
-    this.rewrite = rewrite;
-    return this;
-  }
-
-  /**
-   * Return the rewrite option.
-   */
-  public String getRewrite() {
-    return rewrite;
-  }
-
-  /**
-   * Return the fields.
-   */
-  public String[] getFields() {
-    return fields;
-  }
-
-  /**
-   * Return true if AND is the default operator.
-   */
-  public boolean isOperatorAnd() {
-    return operatorAnd;
-  }
-
-  /**
-   * Return the analyzer.
-   */
-  public String getAnalyzer() {
-    return analyzer;
-  }
-
-  /**
-   * Return the locale.
-   */
-  public String getLocale() {
-    return locale;
-  }
-
-  /**
-   * Return lenient mode.
-   */
-  public boolean isLenient() {
-    return lenient;
-  }
-
-  /**
-   * Return the minimum should match.
-   */
-  public String getMinShouldMatch() {
-    return minShouldMatch;
-  }
-
-  /**
-   * Return the useDixMax mode.
-   */
-  public boolean isUseDisMax() {
-    return useDisMax;
-  }
-
-  /**
-   * Return the tie breaker.
-   */
-  public double getTieBreaker() {
-    return tieBreaker;
-  }
-
-  /**
-   * Return the default field.
-   */
-  public String getDefaultField() {
-    return defaultField;
-  }
-
-  /**
-   * Return the allow leading wildcard mode.
-   */
-  public boolean isAllowLeadingWildcard() {
-    return allowLeadingWildcard;
-  }
-
-  /**
-   * Return the lowercase expanded terms mode.
-   */
-  public boolean isLowercaseExpandedTerms() {
-    return lowercaseExpandedTerms;
-  }
-
-  /**
-   * Return the fuzzy max expansions.
-   */
-  public int getFuzzyMaxExpansions() {
-    return fuzzyMaxExpansions;
-  }
-
-  /**
-   * Return the fuzziness.
-   */
-  public String getFuzziness() {
-    return fuzziness;
-  }
-
-  /**
-   * Return the fuzzy prefix length.
-   */
-  public int getFuzzyPrefixLength() {
-    return fuzzyPrefixLength;
-  }
-
-  /**
-   * Return the phrase slop.
-   */
-  public double getPhraseSlop() {
-    return phraseSlop;
-  }
-
-  /**
-   * Return the analyze wildcard mode.
-   */
-  public boolean isAnalyzeWildcard() {
-    return analyzeWildcard;
-  }
-
-  /**
-   * Return the boost.
-   */
-  public double getBoost() {
-    return boost;
-  }
-
-  /**
-   * Return the auto generate phase queries mode.
-   */
-  public boolean isAutoGeneratePhraseQueries() {
-    return autoGeneratePhraseQueries;
-  }
-
-  /**
-   * Return the time zone.
-   */
-  public String getTimeZone() {
-    return timeZone;
-  }
-
-}
@@ -1,193 +0,0 @@
-package io.ebean.search;
-
-/**
- * Simple text query options.
- * <p>
- * This maps to an ElasticSearch "simple text query".
- * </p>
- * <pre>{@code
- *
- *  TextSimple options = new TextSimple()
- *       .analyzeWildcard(true)
- *       .fields("name")
- *       .lenient(true)
- *       .opAnd();
- *
- *   List<Customer> customers = database.find(Customer.class)
- *       .text()
- *       .textSimple("quick brown", options)
- *       .findList();
- *
- * }</pre>
- */
-public class TextSimple {
-
-  protected String[] fields;
-
-  protected boolean operatorAnd;
-
-  protected String analyzer;
-
-  protected String flags;
-
-  protected boolean lowercaseExpandedTerms = true;
-
-  protected boolean analyzeWildcard;
-
-  protected String locale;
-
-  protected boolean lenient;
-
-  protected String minShouldMatch;
-
-  /**
-   * Construct
-   */
-  public TextSimple() {
-  }
-
-  /**
-   * Set the fields.
-   */
-  public TextSimple fields(String... fields) {
-    this.fields = fields;
-    return this;
-  }
-
-  /**
-   * Use AND as the default operator.
-   */
-  public TextSimple opAnd() {
-    this.operatorAnd = true;
-    return this;
-  }
-
-  /**
-   * Use OR as the default operator.
-   */
-  public TextSimple opOr() {
-    this.operatorAnd = false;
-    return this;
-  }
-
-  /**
-   * Set the analyzer
-   */
-  public TextSimple analyzer(String analyzer) {
-    this.analyzer = analyzer;
-    return this;
-  }
-
-  /**
-   * Set the flags.
-   */
-  public TextSimple flags(String flags) {
-    this.flags = flags;
-    return this;
-  }
-
-
-  /**
-   * Set the false to not use lowercase expanded terms.
-   */
-  public TextSimple lowercaseExpandedTerms(boolean lowercaseExpandedTerms) {
-    this.lowercaseExpandedTerms = lowercaseExpandedTerms;
-    return this;
-  }
-
-  /**
-   * Set to true to use analyze wildcard.
-   */
-  public TextSimple analyzeWildcard(boolean analyzeWildcard) {
-    this.analyzeWildcard = analyzeWildcard;
-    return this;
-  }
-
-  /**
-   * Set the locale.
-   */
-  public TextSimple locale(String locale) {
-    this.locale = locale;
-    return this;
-  }
-
-  /**
-   * Set the lenient mode.
-   */
-  public TextSimple lenient(boolean lenient) {
-    this.lenient = lenient;
-    return this;
-  }
-
-  /**
-   * Set the minimum should match.
-   */
-  public TextSimple minShouldMatch(String minShouldMatch) {
-    this.minShouldMatch = minShouldMatch;
-    return this;
-  }
-
-  /**
-   * Return lenient mode.
-   */
-  public boolean isLenient() {
-    return lenient;
-  }
-
-  /**
-   * Return true to analyse wildcard.
-   */
-  public boolean isAnalyzeWildcard() {
-    return analyzeWildcard;
-  }
-
-  /**
-   * Return lowercase expanded terms mode.
-   */
-  public boolean isLowercaseExpandedTerms() {
-    return lowercaseExpandedTerms;
-  }
-
-  /**
-   * Return true if the default operator should be AND.
-   */
-  public boolean isOperatorAnd() {
-    return operatorAnd;
-  }
-
-  /**
-   * Return the analyzer to use.
-   */
-  public String getAnalyzer() {
-    return analyzer;
-  }
-
-  /**
-   * Return the fields.
-   */
-  public String[] getFields() {
-    return fields;
-  }
-
-  /**
-   * Return the locale.
-   */
-  public String getLocale() {
-    return locale;
-  }
-
-  /**
-   * Return the flags.
-   */
-  public String getFlags() {
-    return flags;
-  }
-
-  /**
-   * Return the minimum should match.
-   */
-  public String getMinShouldMatch() {
-    return minShouldMatch;
-  }
-
-}
@@ -1,4 +0,0 @@
-/**
- * Provides text search expressions like Match, TextQueryString etc.
- */
-package io.ebean.search;
@@ -1,7 +1,7 @@
 package io.ebean.service;

 import io.ebean.Database;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;

 /**
 * Creates the Database implementations. This is used internally by the EbeanServerFactory and is not currently
@@ -14,7 +14,7 @@ public interface SpiContainer {
   *
   * @param configuration The configuration information for this database.
   */
-  Database createServer(DatabaseBuilder configuration);
+  Database createServer(DatabaseConfig configuration);

  /**
   * Create an EbeanServer just using the name.
@@ -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.
   */
@@ -30,13 +30,10 @@ module io.ebean.api {
  exports io.ebean.config;
  exports io.ebean.config.dbplatform;
  exports io.ebean.event;
-  exports io.ebean.event.readaudit;
  exports io.ebean.event.changelog;
  exports io.ebean.common;
-  exports io.ebean.docstore;
  exports io.ebean.plugin;
  exports io.ebean.metric;
-  exports io.ebean.search;
  exports io.ebean.service;
  exports io.ebean.text;
  exports io.ebean.text.json;
@@ -21,4 +21,9 @@ class DbPrimaryTest {
    assertEquals("h2", DbPrimary.getDefaultServerName());
  }

+  @Test
+  void testLoadProperties() {
+    Properties properties = DbPrimary.getProperties();
+    assertFalse(properties.isEmpty());
+  }
 }
@@ -1,7 +1,6 @@
 package io.ebean.config;

 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.ebean.DatabaseBuilder;
 import io.ebean.annotation.MutationDetection;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.config.dbplatform.IdType;
@@ -18,7 +17,7 @@ class DatabaseConfigTest {

  @Test
  void testLoadFromEbeanProperties() {
-    var config = new DatabaseConfig().settings();
+    DatabaseConfig config = new DatabaseConfig();
    config.loadFromProperties();

    assertEquals(PersistBatch.NONE, config.getPersistBatch());
@@ -33,7 +32,7 @@ class DatabaseConfigTest {
    Properties props = new Properties();
    props.setProperty("ddl.initSql", "${user.home}" + fileSeparator + "initSql");

-    var config = new DatabaseConfig().settings();
+    DatabaseConfig config = new DatabaseConfig();
    config.loadFromProperties(props);

    String ddlInitSql = config.getDdlInitSql();
@@ -42,7 +41,7 @@ class DatabaseConfigTest {

  @Test
  void testLoadWithProperties() {
-    DatabaseBuilder config = new DatabaseConfig();
+    DatabaseConfig config = new DatabaseConfig();
    config.setPersistBatch(PersistBatch.NONE);
    config.setPersistBatchOnCascade(PersistBatch.NONE);
    config.setAutoReadOnlyDataSource(false);
@@ -74,9 +73,6 @@ class DatabaseConfigTest {
    props.setProperty("forUpdateNoKey", "true");
    props.setProperty("defaultServer", "false");
    props.setProperty("skipDataSourceCheck", "true");
-    props.setProperty("readOnlyDatabase", "true");
-    props.setProperty("lengthCheck", "ON");
-    props.setProperty("includeLabelInSql", "true");

    props.setProperty("queryPlan.enable", "true");
    props.setProperty("queryPlan.thresholdMicros", "10000");
@@ -87,56 +83,49 @@ class DatabaseConfigTest {

    config.loadFromProperties(props);

-    var settings = config.settings();
-    assertFalse(settings.isDefaultServer());
-    assertTrue(settings.isDisableL2Cache());
-    assertTrue(settings.isNotifyL2CacheInForeground());
-    assertTrue(settings.isDbOffline());
-    assertTrue(settings.isAutoReadOnlyDataSource());
-    assertTrue(settings.isAutoLoadModuleInfo());
-    assertTrue(settings.isLoadModuleInfo());
-    assertTrue(settings.skipDataSourceCheck());
-    assertTrue(settings.readOnlyDatabase());
-    assertTrue(settings.isIncludeLabelInSql());
-    assertThat(settings.getLengthCheck()).isEqualTo(LengthCheck.ON);
+    assertFalse(config.isDefaultServer());
+    assertTrue(config.isDisableL2Cache());
+    assertTrue(config.isNotifyL2CacheInForeground());
+    assertTrue(config.isDbOffline());
+    assertTrue(config.isAutoReadOnlyDataSource());
+    assertTrue(config.isAutoLoadModuleInfo());
+    assertTrue(config.isLoadModuleInfo());
+    assertTrue(config.skipDataSourceCheck());

-    assertTrue(settings.isIdGeneratorAutomatic());
-    assertFalse(settings.getPlatformConfig().isCaseSensitiveCollation());
-    assertTrue(settings.getPlatformConfig().isForUpdateNoKey());
+    assertTrue(config.isIdGeneratorAutomatic());
+    assertFalse(config.getPlatformConfig().isCaseSensitiveCollation());
+    assertTrue(config.getPlatformConfig().isForUpdateNoKey());

-    assertThat(settings.getNamingConvention()).isInstanceOf(MatchingNamingConvention.class);
+    assertThat(config.getNamingConvention()).isInstanceOf(MatchingNamingConvention.class);

-    assertEquals(MutationDetection.NONE, settings.getJsonMutationDetection());
+    assertEquals(MutationDetection.NONE, config.getJsonMutationDetection());
    config.setJsonMutationDetection(MutationDetection.SOURCE);
-    assertEquals(MutationDetection.SOURCE, settings.getJsonMutationDetection());
-    assertEquals(IdType.SEQUENCE, settings.getIdType());
-    assertEquals(PersistBatch.ALL, settings.getPersistBatch());
-    assertEquals(PersistBatch.ALL, settings.getPersistBatchOnCascade());
-    Assertions.assertEquals(PlatformConfig.DbUuid.BINARY, settings.getPlatformConfig().getDbUuid());
-    Assertions.assertEquals(JsonConfig.DateTime.MILLIS, settings.getJsonDateTime());
-    assertEquals(JsonConfig.Date.MILLIS, settings.getJsonDate());
+    assertEquals(MutationDetection.SOURCE, config.getJsonMutationDetection());
+    assertEquals(IdType.SEQUENCE, config.getIdType());
+    assertEquals(PersistBatch.ALL, config.getPersistBatch());
+    assertEquals(PersistBatch.ALL, config.getPersistBatchOnCascade());
+    Assertions.assertEquals(PlatformConfig.DbUuid.BINARY, config.getPlatformConfig().getDbUuid());
+    Assertions.assertEquals(JsonConfig.DateTime.MILLIS, config.getJsonDateTime());
+    assertEquals(JsonConfig.Date.MILLIS, config.getJsonDate());

-    assertEquals("r0,users,orgs", settings.getEnabledL2Regions());
+    assertEquals("r0,users,orgs", config.getEnabledL2Regions());

-    assertEquals(42, settings.getJdbcFetchSizeFindEach());
-    assertEquals(43, settings.getJdbcFetchSizeFindList());
-    assertEquals(4, settings.getBackgroundExecutorSchedulePoolSize());
-    assertEquals(98, settings.getBackgroundExecutorShutdownSecs());
+    assertEquals(42, config.getJdbcFetchSizeFindEach());
+    assertEquals(43, config.getJdbcFetchSizeFindList());
+    assertEquals(4, config.getBackgroundExecutorSchedulePoolSize());
+    assertEquals(98, config.getBackgroundExecutorShutdownSecs());

-    assertTrue(settings.isQueryPlanEnable());
-    assertEquals(10000, settings.getQueryPlanThresholdMicros());
-    assertTrue(settings.isQueryPlanCapture());
-    assertEquals(42, settings.getQueryPlanCapturePeriodSecs());
-    assertEquals(560, settings.getQueryPlanCaptureMaxTimeMillis());
-    assertEquals(7, settings.getQueryPlanCaptureMaxCount());
+    assertTrue(config.isQueryPlanEnable());
+    assertEquals(10000, config.getQueryPlanThresholdMicros());
+    assertTrue(config.isQueryPlanCapture());
+    assertEquals(42, config.getQueryPlanCapturePeriodSecs());
+    assertEquals(560, config.getQueryPlanCaptureMaxTimeMillis());
+    assertEquals(7, config.getQueryPlanCaptureMaxCount());

-    assertThat(settings.getMappingLocations()).containsExactly("classpath:/foo","bar");
-
-    config.persistBatch(PersistBatch.NONE)
-      .persistBatchOnCascade(PersistBatch.NONE)
-      .lengthCheck(LengthCheck.ON)
-      .lengthCheck(LengthCheck.UTF8);
+    assertThat(config.getMappingLocations()).containsExactly("classpath:/foo","bar");

+    config.setPersistBatch(PersistBatch.NONE);
+    config.setPersistBatchOnCascade(PersistBatch.NONE);

    Properties props1 = new Properties();
    props1.setProperty("ebean.persistBatch", "ALL");
@@ -148,20 +137,19 @@ class DatabaseConfigTest {
    props1.setProperty("ebean.notifyL2CacheInForeground", "false");

    config.loadFromProperties(props1);
-    assertFalse(settings.isDisableL2Cache());
-    assertFalse(settings.isNotifyL2CacheInForeground());
+    assertFalse(config.isDisableL2Cache());
+    assertFalse(config.isNotifyL2CacheInForeground());

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

    config.setEnabledL2Regions("r0,orgs");
-    assertEquals("r0,orgs", settings.getEnabledL2Regions());
+    assertEquals("r0,orgs", config.getEnabledL2Regions());
  }

  @Test
  void test_defaults() {
-    DatabaseBuilder.Settings config = new DatabaseConfig().settings();
+    DatabaseConfig config = new DatabaseConfig();
    assertTrue(config.isIdGeneratorAutomatic());
    assertTrue(config.isDefaultServer());
    assertFalse(config.isAutoPersistUpdates());
@@ -182,8 +170,6 @@ class DatabaseConfigTest {
    assertEquals(600, config.getQueryPlanCapturePeriodSecs());
    assertEquals(10000L, config.getQueryPlanCaptureMaxTimeMillis());
    assertEquals(10, config.getQueryPlanCaptureMaxCount());
-    assertThat(config.getLengthCheck()).isEqualTo(LengthCheck.OFF);
-    assertFalse(config.isIncludeLabelInSql());

    config.setLoadModuleInfo(false);
    assertFalse(config.isAutoLoadModuleInfo());
@@ -198,7 +184,7 @@ class DatabaseConfigTest {
  void test_putServiceObject() {
    ObjectMapper objectMapper = new ObjectMapper();

-    var config = new DatabaseConfig().settings();
+    DatabaseConfig config = new DatabaseConfig();
    config.putServiceObject(objectMapper);

    ObjectMapper mapper0 = config.getServiceObject(ObjectMapper.class);
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
  </parent>

  <name>ebean bom</name>
@@ -89,103 +89,106 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

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

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-mapper</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</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.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
+        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
+        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
+        <scope>test</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <!-- platforms -->
@@ -193,79 +196,79 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-clickhouse</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis-types</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
      </dependency>

    </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
  </parent>

  <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

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

+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
  </dependencies>

 </project>
@@ -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,6 +1,6 @@
 package io.ebean.core.type;

-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;

 import java.util.List;

@@ -12,5 +12,5 @@ public interface ExtraTypeFactory {
  /**
   * Provide extra types to Ebean.
   */
-  List<? extends ScalarType<?>> createTypes(DatabaseBuilder.Settings config, Object objectMapper);
+  List<? extends ScalarType<?>> createTypes(DatabaseConfig config, Object objectMapper);
 }
@@ -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;
-  }
-}
@@ -1,7 +1,7 @@
 package io.ebean.core.type;

 import io.avaje.lang.Nullable;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;

 /**
 * Factory to create ScalarTypeSet.
@@ -12,6 +12,6 @@ public interface ScalarTypeSetFactory {
   * Create the ScalarTypeSet given the config and optional objectMapper.
   */
  @Nullable
-  ScalarTypeSet<?> createTypeSet(DatabaseBuilder.Settings config, @Nullable Object objectMapper);
+  ScalarTypeSet<?> createTypeSet(DatabaseConfig config, @Nullable Object objectMapper);

 }
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>13.23.0-jakarta</version>
  </parent>

  <artifactId>ebean-core</artifactId>
@@ -22,7 +22,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

    <dependency>
@@ -46,20 +46,9 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
    </dependency>

-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>14.0.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4-runtime</artifactId>
-      <version>4.13.1</version>
-    </dependency>

    <!--
    Class retention Nonnull and Nullable annotations
@@ -151,7 +140,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.7.2</version>
+      <version>42.6.0</version>
      <optional>true</optional>
    </dependency>

@@ -159,21 +148,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
      <scope>test</scope>
    </dependency>

@@ -184,6 +173,13 @@
      <scope>test</scope>
    </dependency>

+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
  </dependencies>

  <build>
@@ -234,25 +230,6 @@
        </configuration>
      </plugin>

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

    </plugins>

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

-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.server.type.GeoTypeBinder;

 /**
@@ -11,5 +11,5 @@ public interface GeoTypeProvider {
  /**
   * Create a binder for binding geometry types.
   */
-  GeoTypeBinder createBinder(DatabaseBuilder.Settings config);
+  GeoTypeBinder createBinder(DatabaseConfig config);
 }
@@ -111,7 +111,7 @@ public final class LoadBeanRequest extends LoadRequest {
  }

  private String mode() {
-    return lazy ? "lazy" : loadBuffer.isCache() ? "cache" : "query";
+    return lazy ? "+lazy" : loadBuffer.isCache() ? "+cache" : "+query";
  }

  /**
@@ -51,8 +51,4 @@ public interface LoadContext {
   */
  void register(String path, BeanPropertyAssocMany<?> many, BeanCollection<?> bc);

-  /**
-   * Use soft-references for streaming queries, so unreachable entries can be garbage collected.
-   */
-  void useReferences(boolean useReferences);
 }
@@ -43,5 +43,4 @@ public interface LoadManyBuffer {

  void configureQuery(SpiQuery<?> query);

-  boolean isUseDocStore();
 }
@@ -3,7 +3,6 @@ package io.ebeaninternal.api;
 import io.ebean.CacheMode;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
-import io.ebean.bean.PersistenceContext;
 import io.ebeaninternal.server.core.BindPadding;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -58,22 +57,17 @@ public final class LoadManyRequest extends LoadRequest {
    return loadContext.fullPath();
  }

-  private List<Object> parentIdList(SpiEbeanServer server, BeanPropertyAssocMany<?> many, PersistenceContext pc) {
-    final var idList = new ArrayList<>(loadContext.size());
-    final var descriptor = many.descriptor();
+  private List<Object> parentIdList(SpiEbeanServer server) {
+    List<Object> idList = new ArrayList<>();
+    BeanPropertyAssocMany<?> many = many();
    for (int i = 0; i < loadContext.size(); i++) {
-      final BeanCollection<?> bc = loadContext.get(i);
+      BeanCollection<?> bc = loadContext.get(i);
      if (bc != null) {
-        final var parent = bc.owner();
-        final var parentId = descriptor.getId(parent);
-        idList.add(parentId);
-        bc.setLoader(server); // don't use the load buffer again
-        if (lazy) {
-          descriptor.contextPutIfAbsent(pc, parentId, parent);
-          if (!originIncluded && bc == originCollection) {
-            originIncluded = true;
-          }
+        if (lazy && !originIncluded && bc == originCollection) {
+          originIncluded = true;
        }
+        idList.add(many.parentId(bc.owner()));
+        bc.setLoader(server); // don't use the load buffer again
      }
    }
    if (originCollection != null && !originIncluded) {
@@ -81,7 +75,7 @@ public final class LoadManyRequest extends LoadRequest {
      idList.add(many.parentId(originCollection.owner()));
      originCollection.setLoader(server); // don't use the load buffer again
    }
-    if (descriptor.isPadInExpression()) {
+    if (many.targetDescriptor().isPadInExpression()) {
      BindPadding.padIds(idList);
    }
    return idList;
@@ -105,10 +99,9 @@ public final class LoadManyRequest extends LoadRequest {
      query.where().raw(extraWhere.replace("${ta}", "t0").replace("${mta}", "int_"));
    }
    query.setLazyLoadForParents(many);
-    final var pc = loadContext.persistenceContext();
-    many.addWhereParentIdIn(query, parentIdList(server, many, pc), loadContext.isUseDocStore());
-    query.setPersistenceContext(pc);
-    query.setLoadDescription(lazy ? "lazy" : "query", description());
+    many.addWhereParentIdIn(query, parentIdList(server));
+    query.setPersistenceContext(loadContext.persistenceContext());
+    query.setLoadDescription(lazy ? "+lazy" : "+query", description());
    if (lazy) {
      query.setLazyLoadBatchSize(loadContext.batchSize());
    } else {
@@ -3,8 +3,6 @@ package io.ebeaninternal.api;
 import io.ebean.TxScope;

 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;

 /**
 * Used internally to handle the scoping of transactions for methods.
@@ -49,11 +47,6 @@ public final class ScopeTrans {
  private boolean nestedCommit;
  private boolean nestedUseSavepoint;

-  /**
-   * The UserObjects when using in nested transactions.
-   */
-  private Map<String, Object> userObjects;
-
  public ScopeTrans(boolean rollbackOnChecked, boolean created, SpiTransaction transaction, TxScope txScope) {
    this.rollbackOnChecked = rollbackOnChecked;
    this.created = created;
@@ -225,17 +218,4 @@ public final class ScopeTrans {
    return e instanceof RuntimeException || rollbackOnChecked;
  }

-  public void putUserObject(String name, Object value) {
-    if (userObjects == null) {
-      userObjects = new HashMap<>();
-    }
-    userObjects.put(name, value);
-  }
-
-  public Object getUserObject(String name) {
-    if (userObjects == null) {
-      return null;
-    }
-    return userObjects.get(name);
-  }
 }
@@ -2,6 +2,7 @@ package io.ebeaninternal.api;

 import io.ebeaninternal.server.transaction.TransactionScopeManager;
 import io.ebeaninternal.server.util.ArrayStack;
+
 import jakarta.persistence.PersistenceException;

 /**
@@ -172,31 +173,4 @@ public final class ScopedTransaction extends SpiTransactionProxy {
    return current.caughtThrowable(e);
  }

-  /**
-   * New user objects are always written to the current ScopeTrans.
-   */
-  @Override
-  public void putUserObject(String name, Object value) {
-    current.putUserObject(name, value);
-  }
-
-  /**
-   * Returns the userObject in the stack, Herew we search
-   * the stack and return the first found userObject
-   */
-  @Override
-  public Object getUserObject(String name) {
-    Object obj = current.getUserObject(name);
-    if (obj != null) {
-      return obj;
-    }
-    for (ScopeTrans trans : stack) {
-      obj = trans.getUserObject(name);
-      if (obj != null) {
-        return obj;
-      }
-    }
-    return transaction.getUserObject(name);
-  }
-
 }
@@ -4,8 +4,6 @@ import io.avaje.lang.Nullable;
 import io.ebean.*;
 import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.CallOrigin;
-import io.ebean.event.readaudit.ReadAuditLogger;
-import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.plugin.SpiServer;
 import io.ebeaninternal.api.SpiQuery.Type;
@@ -86,11 +84,6 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  SpiTransactionManager transactionManager();

-  /**
-   * End the current transaction if it is active.
-   */
-  void endTransaction();
-
  /**
   * Return all the descriptors.
   */
@@ -106,11 +99,6 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  BeanDescriptor<?> descriptorById(String className);

-  /**
-   * Return BeanDescriptor using it's unique doc store queueId.
-   */
-  BeanDescriptor<?> descriptorByQueueId(String queueId);
-
  /**
   * Return BeanDescriptors mapped to this table.
   */
@@ -195,17 +183,6 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  boolean isSupportedType(java.lang.reflect.Type genericType);

-  /**
-   * Return the ReadAuditLogger to use for logging all read audit events.
-   */
-  ReadAuditLogger readAuditLogger();
-
-  /**
-   * Return the ReadAuditPrepare used to populate the read audit events with
-   * user context information (user id, user ip address etc).
-   */
-  ReadAuditPrepare readAuditPrepare();
-
  /**
   * Return the DataTimeZone to use when reading/writing timestamps via JDBC.
   */
@@ -354,10 +331,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);
@@ -3,9 +3,6 @@ package io.ebeaninternal.api;
 import io.ebean.Expression;
 import io.ebean.event.BeanQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.expression.DocQueryContext;
-
-import java.io.IOException;


 /**
@@ -21,16 +18,6 @@ public interface SpiExpression extends Expression {
   */
  void simplify();

-  /**
-   * Write the expression as an elastic search expression.
-   */
-  void writeDocQuery(DocQueryContext context) throws IOException;
-
-  /**
-   * Return the nested path for this expression.
-   */
-  String nestedPath(BeanDescriptor<?> desc);
-
  /**
   * Process "Many" properties populating ManyWhereJoins.
   * <p>
@@ -84,7 +71,7 @@ public interface SpiExpression extends Expression {
   *
   * @param request the associated request.
   */
-  void addBindValues(SpiExpressionBind request);
+  void addBindValues(SpiExpressionRequest request);

  /**
   * Validate all the properties/paths associated with this expression.
@@ -1,29 +0,0 @@
-package io.ebeaninternal.api;
-
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-
-/**
- * Expression bind values capture.
- */
-public interface SpiExpressionBind {
-
-  /**
-   * Return the bean descriptor for the root type.
-   */
-  BeanDescriptor<?> descriptor();
-
-  /**
-   * Add an encryption key to bind to this request.
-   */
-  void addBindEncryptKey(Object encryptKey);
-
-  /**
-   * Add a bind value to this request.
-   */
-  void addBindValue(Object bindValue);
-
-  /**
-   * Escapes a string to use it as exact match in Like clause.
-   */
-  String escapeLikeString(String value);
-}
@@ -2,7 +2,6 @@ package io.ebeaninternal.api;

 import io.ebean.ExpressionList;
 import io.ebean.Junction;
-import io.ebeaninternal.server.expression.DocQueryContext;

 import java.io.IOException;
 import java.util.List;
@@ -32,11 +31,6 @@ public interface SpiExpressionList<T> extends ExpressionList<T>, SpiExpression {
   */
  boolean isEmpty();

-  /**
-   * Write the top level where expressions taking into account possible extra idEquals expression.
-   */
-  void writeDocQuery(DocQueryContext context, SpiExpression idEquals) throws IOException;
-
  /**
   * Apply firstRow maxRows limits on the filterMany query.
   */
@@ -1,15 +1,15 @@
 package io.ebeaninternal.api;

 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
-import io.ebeaninternal.server.expression.platform.DbExpressionRequest;

 import java.util.List;

 /**
 * Request object used for gathering expression sql and bind values.
 */
-public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionRequest {
+public interface SpiExpressionRequest {

  /**
   * Return the DB specific handler for JSON and ARRAY expressions.
@@ -21,6 +21,11 @@ public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionReq
   */
  String parseDeploy(String logicalProp);

+  /**
+   * Return the bean descriptor for the root type.
+   */
+  BeanDescriptor<?> descriptor();
+
  /**
   * Return the associated QueryRequest.
   */
@@ -29,13 +34,11 @@ public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionReq
  /**
   * Append to the expression sql without any parsing.
   */
-  @Override
  SpiExpressionRequest append(String expression);

  /**
   * Append to the expression sql without any parsing.
   */
-  @Override
  SpiExpressionRequest append(char c);

  /**
@@ -44,7 +47,6 @@ public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionReq
   * This is a fast path case when expression is a bean property path and falls back to using parse()
   * when that isn't the case.
   */
-  @Override
  SpiExpressionRequest property(String expression);

  /**
@@ -52,6 +54,16 @@ public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionReq
   */
  SpiExpressionRequest parse(String expression);

+  /**
+   * Add an encryption key to bind to this request.
+   */
+  void addBindEncryptKey(Object encryptKey);
+
+  /**
+   * Add a bind value to this request.
+   */
+  void addBindValue(Object bindValue);
+
  /**
   * Return the accumulated expression sql for all expressions in this request.
   */
@@ -72,6 +84,11 @@ public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionReq
   */
  void appendLike(boolean rawLikeExpression);

+  /**
+   * Escapes a string to use it as exact match in Like clause.
+   */
+  String escapeLikeString(String value);
+
  /**
   * Append IN expression taking into account platform and type support for Multi-value.
   */
@@ -1,17 +1,10 @@
 package io.ebeaninternal.api;

 import io.ebean.Junction;
-import io.ebeaninternal.server.expression.DocQueryContext;
-
-import java.io.IOException;

 /**
 * SPI methods for Junction.
 */
 public interface SpiJunction<T> extends Junction<T> {

-  /**
-   * Write the Junction taking into account it is implied.
-   */
-  void writeDocQueryJunction(DocQueryContext context) throws IOException;
 }
@@ -1,6 +1,5 @@
 package io.ebeaninternal.api;

-import io.avaje.lang.Nullable;
 import io.ebean.CacheMode;
 import io.ebean.CountDistinctOrder;
 import io.ebean.ExpressionList;
@@ -11,7 +10,6 @@ import io.ebean.Query;
 import io.ebean.bean.CallOrigin;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.PersistenceContext;
-import io.ebean.event.readaudit.ReadEvent;
 import io.ebean.plugin.BeanType;
 import io.ebeaninternal.server.autotune.ProfilingListener;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
@@ -170,11 +168,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
     */
    SOFT_DELETED(false),

-    /**
-     * Query runs against draft tables.
-     */
-    DRAFT(false),
-
    /**
     * Query runs against current data (normal).
     */
@@ -226,11 +219,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  ProfileLocation profileLocation();

-  /**
-   * Return the SQL hint to include in the query.
-   */
-  String hint();
-
  /**
   * Return the label set on the query.
   */
@@ -297,17 +285,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  SpiRawSql rawSql();

-  /**
-   * Return true if this query should be executed against the doc store.
-   */
-  boolean isUseDocStore();
-
-  /**
-   * For doc store query return the document index name to search against.
-   * This is for partitioned indexes (like daily logstash indexes etc).
-   */
-  String getDocIndexName();
-
  /**
   * Return the PersistenceContextScope that this query should use.
   * <p>
@@ -345,7 +322,7 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
  /**
   * Set the on a secondary query given the label, relativePath and profile location of the parent query.
   */
-  void setProfilePath(String label, String relativePath, @Nullable ProfileLocation profileLocation);
+  void setProfilePath(String label, String relativePath, ProfileLocation profileLocation);

  /**
   * Set the query mode.
@@ -382,11 +359,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  boolean isAsOfQuery();

-  /**
-   * Return true if this is a 'As Draft' query.
-   */
-  boolean isAsDraft();
-
  /**
   * Return true if this query includes soft deleted rows.
   */
@@ -515,11 +487,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  NaturalKeyBindParam naturalKeyBindParam();

-  /**
-   * Prepare the query for docstore execution with nested paths.
-   */
-  void prepareDocNested();
-
  /**
   * Set the query to be a delete query.
   */
@@ -659,16 +626,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  ObjectGraphNode parentNode();

-  /**
-   * Set that this is a future query that will execute in the background.
-   */
-  void usingFuture();
-
-  /**
-   * Return true if this is a future query.
-   */
-  boolean isUsingFuture();
-
  /**
   * Return false when this is a lazy load or refresh query for a bean.
   * <p>
@@ -735,11 +692,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  SpiExpressionList<T> havingExpressions();

-  /**
-   * Return the text expressions.
-   */
-  SpiExpressionList<T> textExpression();
-
  /**
   * Returns true if either firstRow or maxRows has been set.
   */
@@ -806,11 +758,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  boolean tuneFetchProperties(OrmQueryDetail detail);

-  /**
-   * If this is a RawSql based entity set the default RawSql if not set.
-   */
-  void setDefaultRawSqlIfRequired();
-
  /**
   * Set to true if this query has been tuned by autoTune.
   */
@@ -888,21 +835,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  int bufferFetchSizeHint();

-  /**
-   * Return true if read auditing is disabled on this query.
-   */
-  boolean isDisableReadAudit();
-
-  /**
-   * Set the readEvent for future queries (as prepared in foreground thread).
-   */
-  void setFutureFetchAudit(ReadEvent event);
-
-  /**
-   * Read the readEvent for future queries (null otherwise).
-   */
-  ReadEvent futureFetchAudit();
-
  /**
   * Return the base table to use if user defined on the query.
   */
@@ -9,7 +9,6 @@ import io.ebeaninternal.server.core.PersistDeferredRelationship;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.transaction.ProfileStream;
-import io.ebeanservice.docstore.api.DocStoreTransaction;

 import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
@@ -103,19 +102,6 @@ public interface SpiTransaction extends Transaction {
   */
  Boolean isUpdateAllLoadedProperties();

-  /**
-   * Return the batchSize specifically set for this transaction or 0.
-   * <p>
-   * Returning 0 implies to use the system wide default batch size.
-   */
-  DocStoreMode docStoreMode();
-
-  /**
-   * Return the batch size to us for ElasticSearch Bulk API calls
-   * as a result of this transaction.
-   */
-  int getDocStoreBatchSize();
-
  /**
   * Return the batchSize specifically set for this transaction or 0.
   * <p>
@@ -287,11 +273,6 @@ public interface SpiTransaction extends Transaction {
   */
  void sendChangeLog(ChangeSet changeSet);

-  /**
-   * Return a document store transaction.
-   */
-  DocStoreTransaction docStoreTransaction();
-
  /**
   * Set the current Tenant Id.
   */
@@ -2,14 +2,12 @@ package io.ebeaninternal.api;

 import io.ebean.ProfileLocation;
 import io.ebean.TransactionCallback;
-import io.ebean.annotation.DocStoreMode;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebeaninternal.server.core.PersistDeferredRelationship;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.transaction.ProfileStream;
-import io.ebeanservice.docstore.api.DocStoreTransaction;

 import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
@@ -112,32 +110,6 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
    return transaction.tenantId();
  }

-  @Override
-  public DocStoreTransaction docStoreTransaction() {
-    return transaction.docStoreTransaction();
-  }
-
-  @Override
-  public DocStoreMode docStoreMode() {
-    return transaction.docStoreMode();
-  }
-
-  @Override
-  public void setDocStoreMode(DocStoreMode mode) {
-    transaction.setDocStoreMode(mode);
-  }
-
-  @Override
-  public int getDocStoreBatchSize() {
-    return transaction.getDocStoreBatchSize();
-  }
-
-  @Override
-  public void setDocStoreBatchSize(int batchSize) {
-    transaction.setDocStoreBatchSize(batchSize);
-  }
-
-
  @Override
  public boolean isLogSql() {
    return transaction.isLogSql();
@@ -6,7 +6,6 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.transaction.DeleteByIdMap;
 import io.ebeaninternal.server.transaction.TransactionManager;
-import io.ebeanservice.docstore.api.DocStoreUpdates;

 import java.io.Serializable;
 import java.util.ArrayList;
@@ -125,18 +124,6 @@ public final class TransactionEvent implements Serializable {
    return changeSet;
  }

-  /**
-   * Add any relevant PersistRequestBean's to DocStoreUpdates for later processing.
-   */
-  public void addDocStoreUpdates(DocStoreUpdates docStoreUpdates) {
-    List<PersistRequestBean<?>> requests = listenerNotify();
-    if (requests != null) {
-      for (PersistRequestBean<?> persistRequestBean : requests) {
-        persistRequestBean.addDocStoreUpdates(docStoreUpdates);
-      }
-    }
-  }
-
  /**
   * Return the CacheChangeSet that we add cache notification messages to.
   * <p>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	964f9c68c9	Update 15x branch	2023-10-10 23:45:08 +13:00
Rob Bygrave	d8e382b393	[15x] Remove Inheritance support	2023-10-10 23:45:08 +13:00
Rob Bygrave	545a02c3ca	[15x] Remove "Future queries" findFutureList, findFutureIds, findFutureCount Note that findFutureCount still exists as an internal implementation detail of findPagedList but not exposed via Query API for public use.	2023-10-10 23:45:08 +13:00
Rob Bygrave	cd0c066431	[15x] Remove ElasticSearch support	2023-10-10 23:45:08 +13:00
Rob Bygrave	c0ebfbc4e0	[15x] Remove Draftable support	2023-10-10 23:45:08 +13:00
Rob Bygrave	8f89b19128	[15x] Remove Read Auditing feature	2023-10-10 23:45:07 +13:00
Rob Bygrave	9373275ffa	[15x] Remove Named DTO queries and External Mapping (loading named queries)	2023-10-10 23:45:07 +13:00
Rob Bygrave	6abd37e3b4	[15x] Remove Named queries, ANTLR, Query language parser	2023-10-10 23:45:07 +13:00