Merge branch 'master' into v15-2

Note that findFutureCount still exists as an internal implementation detail
of findPagedList but not exposed via Query API for public use.

.github/workflows/build.yml

@@ -1,10 +1,7 @@
 
 name: Build
 
-on:
-  pull_request:
-  push:
-    branches: master
+on: [push, pull_request]
 
 jobs:
   build:

.github/workflows/multi-jdk-build.yml

@@ -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
 

composites/ebean-clickhouse/pom.xml

@@ -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>

composites/ebean-cockroach/pom.xml

@@ -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>

composites/ebean-db2/pom.xml

@@ -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>

composites/ebean-h2/pom.xml

@@ -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>

composites/ebean-hana/pom.xml

@@ -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>

composites/ebean-mariadb/pom.xml

@@ -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>

composites/ebean-mysql/pom.xml

@@ -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>

composites/ebean-nuodb/pom.xml

@@ -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>

composites/ebean-oracle/pom.xml

@@ -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>

composites/ebean-postgis/pom.xml

@@ -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,19 @@
     <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>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-postgis-types</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>

composites/ebean-postgres/pom.xml

@@ -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>

composites/ebean-sqlite/pom.xml

@@ -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>

composites/ebean-sqlserver/pom.xml

@@ -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>

composites/ebean-yugabyte/pom.xml

@@ -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>

composites/ebean/pom.xml

@@ -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>

composites/pom.xml

@@ -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>

ebean-api/pom.xml

@@ -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>

ebean-api/src/main/java/io/ebean/DB.java

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

ebean-api/src/main/java/io/ebean/DInsertOptionsBuilder.java

@@ -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;
-    }
-  }
-}

ebean-api/src/main/java/io/ebean/DataIntegrityException.java

@@ -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);
-  }
 }

ebean-api/src/main/java/io/ebean/Database.java

@@ -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.
    */
@@ -607,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>
@@ -1125,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.
    */

ebean-api/src/main/java/io/ebean/DatabaseFactory.java

@@ -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);

ebean-api/src/main/java/io/ebean/DbPrimary.java

@@ -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();
     }

ebean-api/src/main/java/io/ebean/DtoQuery.java

@@ -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();

ebean-api/src/main/java/io/ebean/ExpressionList.java

@@ -53,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) {
@@ -71,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() {
@@ -216,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>
@@ -227,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);
 
   /**
@@ -239,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);
 
   /**
@@ -418,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>

ebean-api/src/main/java/io/ebean/FutureIds.java

@@ -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();
-
-}

ebean-api/src/main/java/io/ebean/InsertOptions.java

@@ -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();
-
-  }
-}

ebean-api/src/main/java/io/ebean/QueryBuilder.java

@@ -1,903 +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);
-
-  /**
-   * 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);
-
-   /**
-   * 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();
-
-  /**
-   * 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);
-
-  /**
-   * 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);
-
-  /**
-   * 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();
-
-}

ebean-api/src/main/java/io/ebean/QueryBuilderProjection.java

@@ -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);
-
-}

ebean-api/src/main/java/io/ebean/SqlQuery.java

@@ -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();

ebean-api/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java

@@ -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);
 }

ebean-api/src/main/java/io/ebean/cache/ServerCachePlugin.java

@@ -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);
 }

ebean-api/src/main/java/io/ebean/config/AutoConfigure.java

@@ -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);
 
 }

ebean-api/src/main/java/io/ebean/config/ContainerConfig.java

@@ -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)));
   }
+
 }

ebean-api/src/main/java/io/ebean/config/DatabaseConfigProvider.java

@@ -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);
 }

ebean-api/src/main/java/io/ebean/config/LengthCheck.java

@@ -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
-}

ebean-api/src/main/java/io/ebean/config/SlowQueryEvent.java

@@ -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;
+  }
 }

ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java

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

ebean-api/src/main/java/io/ebean/event/ServerConfigStartup.java

@@ -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);
 
 }

ebean-api/src/main/java/io/ebean/event/ShutdownManager.java

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

ebean-api/src/main/java/io/ebean/plugin/SpiServer.java

@@ -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.

ebean-api/src/main/java/io/ebean/service/SpiContainer.java

@@ -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.

ebean-api/src/main/java/io/ebean/text/json/JsonWriteOptions.java

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

ebean-api/src/test/java/io/ebean/DbPrimaryTest.java

@@ -21,4 +21,9 @@ class DbPrimaryTest {
     assertEquals("h2", DbPrimary.getDefaultServerName());
   }
 
+  @Test
+  void testLoadProperties() {
+    Properties properties = DbPrimary.getProperties();
+    assertFalse(properties.isEmpty());
+  }
 }

ebean-api/src/test/java/io/ebean/config/DatabaseConfigTest.java

@@ -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);

ebean-bom/pom.xml

@@ -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,103 @@
       <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>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>14.1.0</version>
+        <version>13.23.0-jakarta</version>
       </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 +193,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>

ebean-core-type/pom.xml

@@ -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>

ebean-core-type/src/main/java/io/ebean/core/type/DataBinder.java

@@ -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();
-
 }

ebean-core-type/src/main/java/io/ebean/core/type/ExtraTypeFactory.java

@@ -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);
 }

ebean-core-type/src/main/java/io/ebean/core/type/InputStreamInfo.java

@@ -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;
-  }
-}

ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeSetFactory.java

@@ -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);
 
 }

ebean-core/pom.xml

@@ -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,9 +46,10 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.1.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
+
     <!--
     Class retention Nonnull and Nullable annotations
     to assist with IDE auto-completion with Ebean API
@@ -139,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>
 
@@ -147,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>
 
@@ -172,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>
@@ -222,6 +230,7 @@
         </configuration>
       </plugin>
 
+
     </plugins>
 
   </build>

ebean-core/src/main/java/io/ebeaninternal/api/GeoTypeProvider.java

@@ -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);
 }

ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java

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

ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java

@@ -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));
-    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 {

ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java

@@ -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);
-  }
 }

ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java

@@ -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);
-  }
-
 }

ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java

@@ -84,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.
    */
@@ -336,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);

ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java

@@ -71,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.

ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionBind.java

@@ -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);
-}

ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionRequest.java

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

ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java

@@ -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;
@@ -220,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.
    */
@@ -328,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.
@@ -632,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>

ebean-core/src/main/java/io/ebeaninternal/server/autotune/AutoTuneServiceProvider.java

@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.autotune;
 
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.api.SpiEbeanServer;
 
 public interface AutoTuneServiceProvider {
 
-  AutoTuneService create(SpiEbeanServer server, DatabaseBuilder config);
+  AutoTuneService create(SpiEbeanServer server, DatabaseConfig config);
 }

ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBind.java

@@ -1,14 +1,10 @@
 package io.ebeaninternal.server.bind;
 
 import io.ebean.core.type.DataBinder;
-import io.ebean.core.type.InputStreamInfo;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
+import java.io.*;
 import java.math.BigDecimal;
 import java.sql.*;
 import java.util.ArrayList;
@@ -27,8 +23,6 @@ public class DataBind implements DataBinder {
   protected int pos;
   private String json;
 
-  private Object lastObject = null;
-
   public DataBind(DataTimeZone dataTimeZone, PreparedStatement pstmt, Connection connection) {
     this.dataTimeZone = dataTimeZone;
     this.pstmt = pstmt;
@@ -71,19 +65,16 @@ public class DataBind implements DataBinder {
   @Override
   public void setObject(Object value) throws SQLException {
     pstmt.setObject(++pos, value);
-    lastObject = value;
   }
 
   @Override
   public final void setObject(Object value, int sqlType) throws SQLException {
     pstmt.setObject(++pos, value, sqlType);
-    lastObject = value;
   }
 
   @Override
   public void setNull(int jdbcType) throws SQLException {
     pstmt.setNull(++pos, jdbcType);
-    lastObject = null;
   }
 
   @Override
@@ -105,7 +96,7 @@ public class DataBind implements DataBinder {
     }
   }
 
-  public void closeInputStreams() {
+  private void closeInputStreams() {
     if (inputStreams != null) {
       for (InputStream inputStream : inputStreams) {
         try {
@@ -126,43 +117,36 @@ public class DataBind implements DataBinder {
   @Override
   public void setString(String value) throws SQLException {
     pstmt.setString(++pos, value);
-    lastObject = value;
   }
 
   @Override
   public final void setInt(int value) throws SQLException {
     pstmt.setInt(++pos, value);
-    lastObject = null;
   }
 
   @Override
   public final void setLong(long value) throws SQLException {
     pstmt.setLong(++pos, value);
-    lastObject = null;
   }
 
   @Override
   public final void setShort(short value) throws SQLException {
     pstmt.setShort(++pos, value);
-    lastObject = null;
   }
 
   @Override
   public final void setFloat(float value) throws SQLException {
     pstmt.setFloat(++pos, value);
-    lastObject = null;
   }
 
   @Override
   public final void setDouble(double value) throws SQLException {
     pstmt.setDouble(++pos, value);
-    lastObject = null;
   }
 
   @Override
   public final void setBigDecimal(BigDecimal value) throws SQLException {
     pstmt.setBigDecimal(++pos, value);
-    lastObject = null;
   }
 
   @Override
@@ -173,7 +157,6 @@ public class DataBind implements DataBinder {
     } else {
       pstmt.setDate(++pos, value);
     }
-    lastObject = null;
   }
 
   @Override
@@ -184,7 +167,6 @@ public class DataBind implements DataBinder {
     } else {
       pstmt.setTimestamp(++pos, value);
     }
-    lastObject = null;
   }
 
   @Override
@@ -195,31 +177,26 @@ public class DataBind implements DataBinder {
     } else {
       pstmt.setTime(++pos, value);
     }
-    lastObject = null;
   }
 
   @Override
   public void setBoolean(boolean value) throws SQLException {
     pstmt.setBoolean(++pos, value);
-    lastObject = null;
   }
 
   @Override
   public void setBytes(byte[] value) throws SQLException {
     pstmt.setBytes(++pos, value);
-    lastObject = value;
   }
 
   @Override
   public void setByte(byte value) throws SQLException {
     pstmt.setByte(++pos, value);
-    lastObject = null;
   }
 
   @Override
   public void setChar(char value) throws SQLException {
     pstmt.setString(++pos, String.valueOf(value));
-    lastObject = null;
   }
 
   @Override
@@ -234,31 +211,21 @@ public class DataBind implements DataBinder {
     }
     inputStreams.add(inputStream);
     pstmt.setBinaryStream(++pos, inputStream, length);
-    lastObject = new InputStreamInfo(inputStream, length);
   }
 
   @Override
   public void setBlob(byte[] bytes) throws SQLException {
     pstmt.setBinaryStream(++pos, new ByteArrayInputStream(bytes), bytes.length);
-    lastObject = bytes;
   }
 
   @Override
   public void setClob(String content) throws SQLException {
     pstmt.setCharacterStream(++pos, new StringReader(content), content.length());
-    lastObject = content;
   }
 
   @Override
   public void setArray(String arrayType, Object[] elements) throws SQLException {
     pstmt.setArray(++pos, connection.createArrayOf(arrayType, elements));
-    lastObject = null;
   }
 
-  @Override
-  public Object popLastObject() {
-    Object ret = lastObject;
-    lastObject = null;
-    return ret;
-  }
 }

ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheManagerOptions.java

@@ -4,7 +4,7 @@ import io.ebean.cache.QueryCacheEntryValidate;
 import io.ebean.cache.ServerCacheFactory;
 import io.ebean.cache.ServerCacheOptions;
 import io.ebean.config.CurrentTenantProvider;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.server.cluster.ClusterManager;
 
 /**
@@ -13,7 +13,7 @@ import io.ebeaninternal.server.cluster.ClusterManager;
 public final class CacheManagerOptions {
 
   private final ClusterManager clusterManager;
-  private final DatabaseBuilder.Settings databaseBuilder;
+  private final DatabaseConfig databaseConfig;
   private final boolean localL2Caching;
   private CurrentTenantProvider currentTenantProvider;
   private QueryCacheEntryValidate queryCacheEntryValidate;
@@ -24,15 +24,15 @@ public final class CacheManagerOptions {
   CacheManagerOptions() {
     this.localL2Caching = true;
     this.clusterManager = null;
-    this.databaseBuilder = null;
+    this.databaseConfig = null;
     this.cacheFactory = new DefaultServerCacheFactory();
     this.beanDefault = new ServerCacheOptions();
     this.queryDefault = new ServerCacheOptions();
   }
 
-  public CacheManagerOptions(ClusterManager clusterManager, DatabaseBuilder.Settings config, boolean localL2Caching) {
+  public CacheManagerOptions(ClusterManager clusterManager, DatabaseConfig config, boolean localL2Caching) {
     this.clusterManager = clusterManager;
-    this.databaseBuilder = config;
+    this.databaseConfig = config;
     this.localL2Caching = localL2Caching;
     this.currentTenantProvider = config.getCurrentTenantProvider();
   }
@@ -55,7 +55,7 @@ public final class CacheManagerOptions {
   }
 
   public String getServerName() {
-    return (databaseBuilder == null) ? "db" : databaseBuilder.getName();
+    return (databaseConfig == null) ? "db" : databaseConfig.getName();
   }
 
   public boolean isLocalL2Caching() {

ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCachePlugin.java

@@ -3,7 +3,7 @@ package io.ebeaninternal.server.cache;
 import io.ebean.BackgroundExecutor;
 import io.ebean.cache.ServerCacheFactory;
 import io.ebean.cache.ServerCachePlugin;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 
 /**
  * Default implementation of ServerCachePlugin.
@@ -14,7 +14,7 @@ public final class DefaultServerCachePlugin implements ServerCachePlugin {
    * Creates the default ServerCacheFactory.
    */
   @Override
-  public ServerCacheFactory create(DatabaseBuilder config, BackgroundExecutor executor) {
+  public ServerCacheFactory create(DatabaseConfig config, BackgroundExecutor executor) {
     return new DefaultServerCacheFactory(executor);
   }
 }

ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java

@@ -5,6 +5,7 @@ import io.ebean.Database;
 import io.ebean.config.ContainerConfig;
 import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
 
+import java.util.Iterator;
 import java.util.ServiceLoader;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
@@ -19,22 +20,38 @@ public class ClusterManager implements ServerLookup {
   private static final System.Logger clusterLogger = AppLog.getLogger("io.ebean.Cluster");
 
   private final ReentrantLock lock = new ReentrantLock();
+
   private final ConcurrentHashMap<String, Database> serverMap = new ConcurrentHashMap<>();
+
+  private final Object monitor = new Object();
+
   private final ClusterBroadcast broadcast;
+
   private boolean started;
+
   private boolean shutdown;
 
   public ClusterManager(ContainerConfig config) {
-    if (config.isActive()) {
-      ClusterBroadcastFactory factory = createFactory();
-      broadcast = factory != null ? factory.create(this, config) : null;
+    ClusterBroadcastFactory factory = createFactory();
+    if (factory != null && config.isActive()) {
+      broadcast = factory.create(this, config);
     } else {
       broadcast = null;
     }
   }
 
+  /**
+   * Return the ClusterTransportFactory via ServiceLoader.
+   */
   private ClusterBroadcastFactory createFactory() {
-    return ServiceLoader.load(ClusterBroadcastFactory.class).findFirst().orElse(null);
+
+    ServiceLoader<ClusterBroadcastFactory> load = ServiceLoader.load(ClusterBroadcastFactory.class);
+    ClusterBroadcastFactory factory = null;
+    Iterator<ClusterBroadcastFactory> iterator = load.iterator();
+    if (iterator.hasNext()) {
+      factory = iterator.next();
+    }
+    return factory;
   }
 
   public void registerServer(Database server) {

ebean-core/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java

@@ -2,7 +2,7 @@ package io.ebeaninternal.server.core;
 
 import io.avaje.classpath.scanner.ClassPathScanner;
 import io.avaje.classpath.scanner.ClassPathScannerFactory;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,7 +16,7 @@ public class ClassPathScanners {
   /**
    * Return the list of ClassPathScanner services using DatabaseConfig service loader.
    */
-  public static List<ClassPathScanner> find(DatabaseBuilder.Settings config) {
+  public static List<ClassPathScanner> find(DatabaseConfig config) {
     List<ClassPathScanner> scanners = new ArrayList<>();
     for (ClassPathScannerFactory factory : ServiceLoader.load(ClassPathScannerFactory.class)) {
       scanners.add(factory.createScanner(config.getClassLoadConfig().getClassLoader()));

ebean-core/src/main/java/io/ebeaninternal/server/core/DSlowQueryEvent.java

@@ -1,70 +0,0 @@
-package io.ebeaninternal.server.core;
-
-import io.ebean.ProfileLocation;
-import io.ebean.bean.ObjectGraphNode;
-import io.ebean.config.SlowQueryEvent;
-
-import java.util.List;
-
-/**
- * Slow query event.
- */
-final class DSlowQueryEvent implements SlowQueryEvent {
-
-  private final String sql;
-  private final long timeMillis;
-  private final int rowCount;
-  private final ObjectGraphNode originNode;
-  private final List<Object> bindParams;
-  private final String label;
-  private final ProfileLocation profileLocation;
-
-  /**
-   * Construct with the SQL and execution time in millis.
-   */
-  DSlowQueryEvent(String sql, long timeMillis, int rowCount, ObjectGraphNode originNode,
-                         List<Object> bindParams, String label, ProfileLocation profileLocation) {
-    this.sql = sql;
-    this.timeMillis = timeMillis;
-    this.rowCount = rowCount;
-    this.originNode = originNode;
-    this.bindParams = bindParams;
-    this.profileLocation = profileLocation;
-    this.label = label != null ? label : profileLocation == null ? null : profileLocation.label();
-  }
-
-  @Override
-  public String getSql() {
-    return sql;
-  }
-
-  @Override
-  public long getTimeMillis() {
-    return timeMillis;
-  }
-
-  @Override
-  public int getRowCount() {
-    return rowCount;
-  }
-
-  @Override
-  public ObjectGraphNode getOriginNode() {
-    return originNode;
-  }
-
-  @Override
-  public List<Object> getBindParams() {
-    return bindParams;
-  }
-
-  @Override
-  public String getLabel() {
-    return label;
-  }
-
-  @Override
-  public ProfileLocation getProfileLocation() {
-    return profileLocation;
-  }
-}

ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DatabasePlatformProvider;
 import io.ebeaninternal.api.CoreLog;
@@ -37,7 +37,7 @@ public class DatabasePlatformFactory {
   /**
    * Create the appropriate database specific platform.
    */
-  public DatabasePlatform create(DatabaseBuilder.Settings config) {
+  public DatabasePlatform create(DatabaseConfig config) {
     try {
       String offlinePlatform = DbOffline.getPlatform();
       if (offlinePlatform != null) {

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java

@@ -63,8 +63,8 @@ final class DefaultBeanLoader {
     Object parentId = parentDesc.getId(parentBean);
     if (pc == null) {
       pc = new DefaultPersistenceContext();
+      parentDesc.contextPut(pc, parentId, parentBean);
     }
-    parentDesc.contextPutIfAbsent(pc, parentId, parentBean);
     boolean useManyIdCache = beanCollection != null && parentDesc.isManyPropCaching() && many.isUseCache();
     if (useManyIdCache) {
       Boolean readOnly = null;
@@ -82,9 +82,9 @@ final class DefaultBeanLoader {
       // populate a new collection
       BeanCollection<?> emptyCollection = many.createEmpty(parentBean);
       many.setValue(parentBean, emptyCollection);
-      query.setLoadDescription("refresh", null);
+      query.setLoadDescription("+refresh", null);
     } else {
-      query.setLoadDescription("lazy", null);
+      query.setLoadDescription("+lazy", null);
     }
 
     query.select(parentDesc.idBinder().idSelect());

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java

@@ -1,7 +1,5 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.Database;
-import io.ebean.DatabaseBuilder;
 import io.ebean.config.*;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.event.ShutdownManager;
@@ -14,13 +12,11 @@ import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.bootup.BootupClassPathSearch;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.executor.DefaultBackgroundExecutor;
-import jakarta.persistence.PersistenceException;
 
+import jakarta.persistence.PersistenceException;
 import java.net.URL;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
@@ -36,22 +32,12 @@ public final class DefaultContainer implements SpiContainer {
 
   private final ReentrantLock lock = new ReentrantLock();
   private final ClusterManager clusterManager;
-  private final List<EntityClassRegister> entityClassRegisters;
 
   public DefaultContainer(ContainerConfig containerConfig) {
     this.clusterManager = new ClusterManager(containerConfig);
     // register so that we can shutdown any Ebean wide
     // resources such as clustering
     ShutdownManager.registerContainer(this);
-    entityClassRegisters = initEntityRegisters();
-  }
-
-  private List<EntityClassRegister> initEntityRegisters() {
-    var entityClassRegisters = new ArrayList<EntityClassRegister>();
-    for (EntityClassRegister entityClassRegister : ServiceLoader.load(EntityClassRegister.class)) {
-      entityClassRegisters.add(entityClassRegister);
-    }
-    return entityClassRegisters;
   }
 
   @Override
@@ -65,12 +51,13 @@ public final class DefaultContainer implements SpiContainer {
    */
   @Override
   public SpiEbeanServer createServer(String name) {
-    var builder = Database.builder().name(name).loadFromProperties();
-    return createServer(builder);
+    DatabaseConfig config = new DatabaseConfig();
+    config.setName(name);
+    config.loadFromProperties();
+    return createServer(config);
   }
 
-  private SpiBackgroundExecutor createBackgroundExecutor(DatabaseBuilder builder) {
-    var config = builder.settings();
+  private SpiBackgroundExecutor createBackgroundExecutor(DatabaseConfig config) {
     String namePrefix = "ebean-" + config.getName();
     int schedulePoolSize = config.getBackgroundExecutorSchedulePoolSize();
     int shutdownSecs = config.getBackgroundExecutorShutdownSecs();
@@ -82,10 +69,9 @@ public final class DefaultContainer implements SpiContainer {
    * Create the implementation from the configuration.
    */
   @Override
-  public SpiEbeanServer createServer(DatabaseBuilder builder) {
+  public SpiEbeanServer createServer(DatabaseConfig config) {
     lock.lock();
     try {
-      var config = builder.settings();
       long start = System.currentTimeMillis();
       applyConfigServices(config);
       setNamingConvention(config);
@@ -125,7 +111,7 @@ public final class DefaultContainer implements SpiContainer {
     }
   }
 
-  private void applyConfigServices(DatabaseBuilder.Settings config) {
+  private void applyConfigServices(DatabaseConfig config) {
     if (config.isDefaultServer()) {
       for (DatabaseConfigProvider configProvider : ServiceLoader.load(DatabaseConfigProvider.class)) {
         configProvider.apply(config);
@@ -133,10 +119,12 @@ public final class DefaultContainer implements SpiContainer {
     }
     if (config.isLoadModuleInfo()) {
       // auto register entity classes
-      for (EntityClassRegister loader : entityClassRegisters) {
+      boolean found = false;
+      for (EntityClassRegister loader : ServiceLoader.load(EntityClassRegister.class)) {
         config.addAll(loader.classesFor(config.getName(), config.isDefaultServer()));
+        found = true;
       }
-      if (entityClassRegisters.isEmpty()) {
+      if (!found) {
         checkMissingModulePathProvides();
       }
     }
@@ -166,7 +154,7 @@ public final class DefaultContainer implements SpiContainer {
    * Get the entities, scalarTypes, Listeners etc combining the class registered
    * ones with the already created instances.
    */
-  private BootupClasses bootupClasses(DatabaseBuilder.Settings config) {
+  private BootupClasses bootupClasses(DatabaseConfig config) {
     BootupClasses bootup = bootupClasses1(config);
     bootup.addServerConfigStartup(config.getServerConfigStartupListeners());
     bootup.runServerConfigStartup(config);
@@ -184,7 +172,7 @@ public final class DefaultContainer implements SpiContainer {
   /**
    * Get the class based entities, scalarTypes, Listeners etc.
    */
-  private BootupClasses bootupClasses1(DatabaseBuilder.Settings config) {
+  private BootupClasses bootupClasses1(DatabaseConfig config) {
     Set<Class<?>> classes = config.classes();
     if (config.isDisableClasspathSearch() || (classes != null && !classes.isEmpty())) {
       // use classes we explicitly added via configuration
@@ -196,16 +184,16 @@ public final class DefaultContainer implements SpiContainer {
   /**
    * Set the naming convention to underscore if it has not already been set.
    */
-  private void setNamingConvention(DatabaseBuilder.Settings config) {
+  private void setNamingConvention(DatabaseConfig config) {
     if (config.getNamingConvention() == null) {
-      config.namingConvention(new UnderscoreNamingConvention());
+      config.setNamingConvention(new UnderscoreNamingConvention());
     }
   }
 
   /**
    * Set the DatabasePlatform if it has not already been set.
    */
-  private void setDatabasePlatform(DatabaseBuilder.Settings config) {
+  private void setDatabasePlatform(DatabaseConfig config) {
     DatabasePlatform platform = config.getDatabasePlatform();
     if (platform == null) {
       if (config.getTenantMode().isDynamicDataSource()) {
@@ -213,7 +201,7 @@ public final class DefaultContainer implements SpiContainer {
       }
       // automatically determine the platform
       platform = new DatabasePlatformFactory().create(config);
-      config.databasePlatform(platform);
+      config.setDatabasePlatform(platform);
     }
     platform.configure(config.getPlatformConfig());
   }
@@ -221,7 +209,7 @@ public final class DefaultContainer implements SpiContainer {
   /**
    * Set the DataSource if it has not already been set.
    */
-  private void setDataSource(DatabaseBuilder.Settings config) {
+  private void setDataSource(DatabaseConfig config) {
     if (isOfflineMode(config)) {
       log.log(DEBUG, "... DbOffline using platform [{0}]", DbOffline.getPlatform());
     } else {
@@ -229,7 +217,7 @@ public final class DefaultContainer implements SpiContainer {
     }
   }
 
-  private boolean isOfflineMode(DatabaseBuilder.Settings config) {
+  private boolean isOfflineMode(DatabaseConfig config) {
     return config.isDbOffline() || DbOffline.isSet();
   }
 
@@ -237,11 +225,13 @@ public final class DefaultContainer implements SpiContainer {
    * Check the autoCommit and Transaction Isolation levels of the DataSource.
    * <p>
    * If autoCommit is true this could be a real problem.
+   * </p>
    * <p>
    * If the Isolation level is not READ_COMMITTED then optimistic concurrency
    * checking may not work as expected.
+   * </p>
    */
-  private boolean checkDataSource(DatabaseBuilder.Settings config) {
+  private boolean checkDataSource(DatabaseConfig config) {
     if (isOfflineMode(config)) {
       return false;
     }

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java

@@ -71,7 +71,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   private static final System.Logger log = CoreLog.internal;
 
   private final ReentrantLock lock = new ReentrantLock();
-  private final DatabaseBuilder.Settings config;
+  private final DatabaseConfig config;
   private final String serverName;
   private final DatabasePlatform databasePlatform;
   private final TransactionManager transactionManager;
@@ -158,7 +158,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Create the CallStackFactory depending if AutoTune is being used.
    */
-  private CallOriginFactory initCallStackFactory(DatabaseBuilder.Settings config) {
+  private CallOriginFactory initCallStackFactory(DatabaseConfig config) {
     if (!config.getAutoTuneConfig().isActive()) {
       // use a common CallStack for performance as we don't care with no AutoTune
       return new NoopCallOriginFactory();
@@ -210,7 +210,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public DatabaseBuilder.Settings config() {
+  public DatabaseConfig config() {
     return config;
   }
 
@@ -714,6 +714,16 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     currentTransaction().flush();
   }
 
+  @Override
+  public void commitTransaction() {
+    currentTransaction().commit();
+  }
+
+  @Override
+  public void rollbackTransaction() {
+    currentTransaction().rollback();
+  }
+
   @Override
   public void endTransaction() {
     Transaction transaction = transactionManager.inScope();
@@ -875,7 +885,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
       transaction = currentServerTransaction();
     }
     if (!query.isRawSql()) {
-      if (!query.isAutoTunable() || !autoTuneService.tuneQuery(query)) {
+      if (query.isAutoTunable() && !autoTuneService.tuneQuery(query)) {
         // use deployment FetchType.LAZY/EAGER annotations
         // to define the 'default' select clause
         query.setDefaultSelectClause();
@@ -1184,7 +1194,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public <T> FutureRowCount<T> findFutureCount(SpiQuery<T> query) {
     SpiQuery<T> copy = query.copy();
-    copy.usingFuture();
     boolean createdTransaction = false;
     SpiTransaction transaction = query.transaction();
     if (transaction == null) {
@@ -1200,47 +1209,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return queryFuture;
   }
 
-  @Override
-  public <T> FutureIds<T> findFutureIds(SpiQuery<T> query) {
-    SpiQuery<T> copy = query.copy();
-    copy.usingFuture();
-    boolean createdTransaction = false;
-    SpiTransaction transaction = query.transaction();
-    if (transaction == null) {
-      transaction = currentServerTransaction();
-      if (transaction == null) {
-        transaction = (SpiTransaction) createTransaction();
-        createdTransaction = true;
-      }
-      copy.usingTransaction(transaction);
-    }
-    QueryFutureIds<T> queryFuture = new QueryFutureIds<>(new CallableQueryIds<>(this, copy, createdTransaction));
-    backgroundExecutor.execute(queryFuture.futureTask());
-    return queryFuture;
-  }
-
-  @Override
-  public <T> FutureList<T> findFutureList(SpiQuery<T> query) {
-    SpiQuery<T> spiQuery = query.copy();
-    spiQuery.usingFuture();
-    // FutureList query always run in it's own persistence content
-    spiQuery.setPersistenceContext(new DefaultPersistenceContext());
-    // Create a new transaction solely to execute the findList() at some future time
-    boolean createdTransaction = false;
-    SpiTransaction transaction = query.transaction();
-    if (transaction == null) {
-      transaction = currentServerTransaction();
-      if (transaction == null) {
-        transaction = (SpiTransaction) createTransaction();
-        createdTransaction = true;
-      }
-      spiQuery.usingTransaction(transaction);
-    }
-    QueryFutureList<T> queryFuture = new QueryFutureList<>(new CallableQueryList<>(this, spiQuery, createdTransaction));
-    backgroundExecutor.execute(queryFuture.futureTask());
-    return queryFuture;
-  }
-
   @Override
   public <T> PagedList<T> findPagedList(SpiQuery<T> query) {
     int maxRows = query.getMaxRows();
@@ -1543,50 +1511,41 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }, transaction);
   }
 
+  /**
+   * Insert the bean.
+   */
   @Override
   public void insert(Object bean) {
-    persister.insert(checkEntityBean(bean), null, null);
-  }
-
-  @Override
-  public void insert(Object bean, @Nullable InsertOptions insertOptions) {
-    persister.insert(checkEntityBean(bean), insertOptions, null);
+    insert(bean, null);
   }
 
+  /**
+   * Insert the bean with a transaction.
+   */
   @Override
   public void insert(Object bean, @Nullable Transaction transaction) {
-    persister.insert(checkEntityBean(bean), null, transaction);
-  }
-
-  @Override
-  public void insert(Object bean, InsertOptions insertOptions, Transaction transaction) {
-    persister.insert(checkEntityBean(bean), insertOptions, transaction);
+    persister.insert(checkEntityBean(bean), transaction);
   }
 
+  /**
+   * Insert all beans in the collection.
+   */
   @Override
   public void insertAll(Collection<?> beans) {
-    insertAll(beans, null, null);
-  }
-
-  @Override
-  public void insertAll(Collection<?> beans, InsertOptions options) {
-    insertAll(beans, options, null);
+    insertAll(beans, null);
   }
 
+  /**
+   * Insert all beans in the collection with a transaction.
+   */
   @Override
   public void insertAll(@Nullable Collection<?> beans, @Nullable Transaction transaction) {
-    insertAll(beans, null, transaction);
-  }
-
-  @Override
-  public void insertAll(@Nullable Collection<?> beans, InsertOptions options, @Nullable Transaction transaction) {
     if (beans == null || beans.isEmpty()) {
       return;
     }
     executeInTrans((txn) -> {
-      txn.checkBatchEscalationOnCollection();
       for (Object bean : beans) {
-        persister.insert(checkEntityBean(bean), options, txn);
+        persister.insert(checkEntityBean(bean), txn);
       }
       return 0;
     }, transaction);
@@ -2020,9 +1979,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public void slowQueryCheck(long timeMicros, int rowCount, SpiQuery<?> query) {
     if (timeMicros > slowQueryMicros && slowQueryListener != null) {
-      List<Object> bindParams = new SlowQueryBindCapture(query).capture();
-      slowQueryListener.process(new DSlowQueryEvent(query.getGeneratedSql(), timeMicros / 1000L, rowCount,
-        query.parentNode(), bindParams, query.label(), query.profileLocation()));
+      slowQueryListener.process(new SlowQueryEvent(query.getGeneratedSql(), timeMicros / 1000L, rowCount, query.parentNode()));
     }
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSlowQueryListener.java

@@ -1,12 +1,10 @@
 package io.ebeaninternal.server.core;
 
 import io.avaje.applog.AppLog;
-import io.ebean.ProfileLocation;
+import io.ebean.bean.ObjectGraphNode;
 import io.ebean.config.SlowQueryEvent;
 import io.ebean.config.SlowQueryListener;
 
-import java.util.List;
-
 import static java.lang.System.Logger.Level.WARNING;
 
 /**
@@ -18,10 +16,11 @@ final class DefaultSlowQueryListener implements SlowQueryListener {
 
   @Override
   public void process(SlowQueryEvent event) {
-    ProfileLocation profileLocation = event.getProfileLocation();
-    String loc = profileLocation == null ? "" : profileLocation.fullLocation();
-    List<Object> bindParams = event.getBindParams();
-    log.log(WARNING, "Slow query warning - millis:{0} rows:{1} location:{2} sql[{3}] params{4}",
-      event.getTimeMillis(), event.getRowCount(), loc, event.getSql(), bindParams);
+    String firstStack = "";
+    ObjectGraphNode node = event.getOriginNode();
+    if (node != null) {
+      firstStack = node.origin().top();
+    }
+    log.log(WARNING, "Slow query warning - millis:{0} rows:{1} caller[{2}] sql[{3}]", event.getTimeMillis(), event.getRowCount(), firstStack, event.getSql());
   }
 }

ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java

@@ -1,8 +1,11 @@
 package io.ebeaninternal.server.core;
 
 import io.ebean.annotation.Platform;
-import io.ebean.DatabaseBuilder;
-import io.ebean.datasource.*;
+import io.ebean.config.DatabaseConfig;
+import io.ebean.datasource.DataSourceAlertFactory;
+import io.ebean.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceFactory;
+import io.ebean.datasource.DataSourcePoolListener;
 
 import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;
@@ -12,16 +15,16 @@ import javax.sql.DataSource;
  */
 final class InitDataSource {
 
-  private final DatabaseBuilder.Settings config;
+  private final DatabaseConfig config;
 
   /**
    * Create and set the main DataSource and read-only DataSource.
    */
-  static void init(DatabaseBuilder.Settings config) {
+  static void init(DatabaseConfig config) {
     new InitDataSource(config).initialise();
   }
 
-  InitDataSource(DatabaseBuilder.Settings config) {
+  InitDataSource(DatabaseConfig config) {
     this.config = config;
   }
 
@@ -38,23 +41,19 @@ final class InitDataSource {
    * Initialise the "main" read write DataSource from configuration.
    */
   private DataSource initDataSource() {
-    return createFromConfig(config.getDataSourceConfig(), config.readOnlyDatabase(), false);
+    return createFromConfig(config.getDataSourceConfig(), false);
   }
 
   /**
    * Initialise the "read only" DataSource from configuration.
    */
   private DataSource initReadOnlyDataSource() {
-    if (config.readOnlyDatabase()) {
-      // using the same DataSource instance
-      return config.getDataSource();
-    }
-    var roConfig = readOnlyConfig();
-    return roConfig == null ? null : createFromConfig(roConfig, false, true);
+    DataSourceConfig roConfig = readOnlyConfig();
+    return roConfig == null ? null : createFromConfig(roConfig, true);
   }
 
-  DataSourceBuilder.Settings readOnlyConfig() {
-    var roConfig = config.getReadOnlyDataSourceConfig();
+  DataSourceConfig readOnlyConfig() {
+    DataSourceConfig roConfig = config.getReadOnlyDataSourceConfig();
     if (roConfig == null) {
       // it has explicitly been set to null, not expected but ok
       return null;
@@ -65,11 +64,11 @@ final class InitDataSource {
     // convenient alternate place to set the read-only url
     final String readOnlyUrl = config.getDataSourceConfig().getReadOnlyUrl();
     if (urlSet(readOnlyUrl)) {
-      roConfig.url(readOnlyUrl);
+      roConfig.setUrl(readOnlyUrl);
       return roConfig;
     }
     if (config.isAutoReadOnlyDataSource()) {
-      roConfig.url(null); // blank out in case it is "none"
+      roConfig.setUrl(null); // blank out in case it is "none"
       return roConfig;
     } else {
       return null;
@@ -80,27 +79,25 @@ final class InitDataSource {
     return url != null && !"none".equalsIgnoreCase(url) && !url.trim().isEmpty();
   }
 
-  private DataSource createFromConfig(DataSourceBuilder.Settings dsConfig, boolean readOnlyDB, boolean readOnly) {
+  private DataSource createFromConfig(DataSourceConfig dsConfig, boolean readOnly) {
     if (dsConfig == null) {
-      throw new PersistenceException("No  DataSourceBuilder defined for " + config.getName());
+      throw new PersistenceException("No DataSourceConfig defined for " + config.getName());
     }
-    if (dsConfig.isOffline() && config.getDatabasePlatformName() == null) {
-      throw new PersistenceException("You MUST specify a DatabasePlatformName on DatabaseConfig when offline");
+    if (dsConfig.isOffline()) {
+      if (config.getDatabasePlatformName() == null) {
+        throw new PersistenceException("You MUST specify a DatabasePlatformName on DatabaseConfig when offline");
+      }
     }
 
     attachAlert(dsConfig);
     attachListener(dsConfig);
 
-    if (readOnlyDB) {
-      dsConfig.autoCommit(true);
-      dsConfig.readOnly(true);
-    } else if (readOnly) {
+    if (readOnly) {
       // setup to use AutoCommit such that we skip explicit commit
-      var mainSettings = config.getDataSourceConfig();
-      dsConfig.autoCommit(true);
-      dsConfig.readOnly(true);
-      dsConfig.setDefaults(mainSettings);
-      dsConfig.isolationLevel(mainSettings.getIsolationLevel());
+      dsConfig.setAutoCommit(true);
+      dsConfig.setReadOnly(true);
+      dsConfig.setDefaults(config.getDataSourceConfig());
+      dsConfig.setIsolationLevel(config.getDataSourceConfig().getIsolationLevel());
     } else if (isPostgresAllQuotedIdentifiers()) {
       dsConfig.addProperty("quoteReturningIdentifiers", false);
     }
@@ -111,32 +108,32 @@ final class InitDataSource {
     return config.isAllQuotedIdentifiers() && Platform.POSTGRES == config.getDatabasePlatform().platform().base();
   }
 
-  private DataSource create(DataSourceBuilder dsConfig, boolean readOnly) {
+  private DataSource create(DataSourceConfig dsConfig, boolean readOnly) {
     String poolName = config.getName() + (readOnly ? "-ro" : "");
-    return dsConfig.name(poolName).build();
+    return DataSourceFactory.create(poolName, dsConfig);
   }
 
   /**
    * Attach DataSourceAlert via service loader if present.
    */
-  private void attachAlert(DataSourceBuilder.Settings dsConfig) {
+  private void attachAlert(DataSourceConfig dsConfig) {
     DataSourceAlertFactory alertFactory = config.getServiceObject(DataSourceAlertFactory.class);
     if (alertFactory == null) {
       alertFactory = ServiceUtil.service(DataSourceAlertFactory.class);
     }
     if (alertFactory != null) {
-      dsConfig.alert(alertFactory.createAlert());
+      dsConfig.setAlert(alertFactory.createAlert());
     }
   }
 
   /**
    * Create and attach a DataSourcePoolListener if it has been specified via properties and there is not one already attached.
    */
-  private void attachListener(DataSourceBuilder.Settings dsConfig) {
+  private void attachListener(DataSourceConfig dsConfig) {
     if (dsConfig.getListener() == null) {
       String poolListener = dsConfig.getPoolListener();
       if (poolListener != null) {
-        dsConfig.listener((DataSourcePoolListener) config.getClassLoadConfig().newInstance(poolListener));
+        dsConfig.setListener((DataSourcePoolListener) config.getClassLoadConfig().newInstance(poolListener));
       }
     }
   }

ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java

@@ -1,11 +1,13 @@
 package io.ebeaninternal.server.core;
 
 import com.fasterxml.jackson.core.JsonFactory;
-import io.ebean.DatabaseBuilder;
 import io.ebean.ExpressionFactory;
 import io.ebean.annotation.Platform;
 import io.ebean.cache.*;
-import io.ebean.config.*;
+import io.ebean.config.DatabaseConfig;
+import io.ebean.config.ExternalTransactionManager;
+import io.ebean.config.ProfilingConfig;
+import io.ebean.config.SlowQueryListener;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbHistorySupport;
 import io.ebean.event.changelog.ChangeLogListener;
@@ -58,7 +60,7 @@ public final class InternalConfiguration {
 
   private final TableModState tableModState;
   private final boolean online;
-  private final DatabaseBuilder.Settings config;
+  private final DatabaseConfig config;
   private final BootupClasses bootupClasses;
   private final DatabasePlatform databasePlatform;
   private final TypeManager typeManager;
@@ -85,12 +87,12 @@ public final class InternalConfiguration {
   private boolean localL2Caching;
 
   InternalConfiguration(boolean online, ClusterManager clusterManager, SpiBackgroundExecutor backgroundExecutor,
-                        DatabaseBuilder.Settings config, BootupClasses bootupClasses) {
+                        DatabaseConfig config, BootupClasses bootupClasses) {
 
     this.online = online;
     this.config = config;
     this.jacksonCorePresent = config.getClassLoadConfig().isJacksonCorePresent();
-    this.clockService = new ClockService(config.settings().getClock());
+    this.clockService = new ClockService(config.getClock());
     this.tableModState = new TableModState();
     this.logManager = initLogManager();
     this.jsonFactory = config.getJsonFactory();
@@ -143,7 +145,7 @@ public final class InternalConfiguration {
   /**
    * Create and return the ExpressionFactory based on configuration and database platform.
    */
-  private ExpressionFactory initExpressionFactory(DatabaseBuilder.Settings config) {
+  private ExpressionFactory initExpressionFactory(DatabaseConfig config) {
     boolean nativeIlike = config.isExpressionNativeIlike() && databasePlatform.supportsNativeIlike();
     return new DefaultExpressionFactory(config.isExpressionEqualsWithNullAsNoop(), nativeIlike);
   }
@@ -274,7 +276,7 @@ public final class InternalConfiguration {
     return config.getDatabasePlatform();
   }
 
-  public DatabaseBuilder.Settings getConfig() {
+  public DatabaseConfig getConfig() {
     return config;
   }
 
@@ -517,16 +519,14 @@ public final class InternalConfiguration {
    */
   QueryPlanLogger queryPlanLogger(Platform platform) {
     switch (platform.base()) {
+      case POSTGRES:
+        return new QueryPlanLoggerPostgres();
       case SQLSERVER:
         return new QueryPlanLoggerSqlServer();
       case ORACLE:
         return new QueryPlanLoggerOracle();
-      case POSTGRES:
-        return new QueryPlanLoggerExplain("explain (analyze, buffers) ");
-      case YUGABYTE:
-        return new QueryPlanLoggerExplain("explain (analyze, buffers, dist) ");
       default:
-        return new QueryPlanLoggerExplain("explain ");
+        return new QueryPlanLoggerExplain();
     }
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java

@@ -35,6 +35,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   private final OrmQueryEngine queryEngine;
   private final SpiQuery<T> query;
   private final BeanFindController finder;
+  private final Boolean readOnly;
   private LoadContext loadContext;
   private PersistenceContext persistenceContext;
   private HashQuery cacheKey;
@@ -51,6 +52,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     this.finder = beanDescriptor.beanFinder();
     this.queryEngine = queryEngine;
     this.query = query;
+    this.readOnly = query.isReadOnly();
     this.persistenceContext = query.persistenceContext();
   }
 
@@ -132,6 +134,13 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     return loadContext.secondaryQueriesMinBatchSize();
   }
 
+  /**
+   * Return the Normal, sharedInstance, ReadOnly state of this query.
+   */
+  public Boolean isReadOnly() {
+    return readOnly;
+  }
+
   /**
    * Return the BeanDescriptor for the associated bean.
    */
@@ -711,10 +720,4 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   public int forwardOnlyFetchSize() {
     return queryEngine.forwardOnlyFetchSize();
   }
-
-  public void clearContext() {
-    if (!transaction.isAutoPersistUpdates()) {
-      beanDescriptor.contextClear(transaction.persistenceContext());
-    }
-  }
 }

ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java

@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.InsertOptions;
 import io.ebean.ValuePair;
+import io.ebean.annotation.DocStoreMode;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PreGetterCallback;
@@ -19,6 +19,8 @@ import io.ebeaninternal.server.transaction.BeanPersistIdMap;
 
 import jakarta.persistence.EntityNotFoundException;
 import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
+import java.io.IOException;
 import java.sql.Statement;
 import java.util.*;
 
@@ -117,7 +119,6 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    * Many-to-many intersection table changes that are held for later batch processing.
    */
   private List<SaveMany> saveMany;
-  private InsertOptions insertOptions;
 
   public PersistRequestBean(SpiEbeanServer server, T bean, Object parentBean, BeanManager<T> mgr, SpiTransaction t,
                             PersistExecute persistExecute, PersistRequest.Type type, int flags) {
@@ -349,14 +350,6 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     return intercept.dirtyPropertyNames();
   }
 
-  public boolean isChangedProperty(int propertyIndex) {
-    if (dirtyProperties == null) {
-      return intercept.isChangedProperty(propertyIndex);
-    } else {
-      return dirtyProperties[propertyIndex];
-    }
-  }
-
   /**
    * Return the dirty properties on this request.
    */
@@ -404,6 +397,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     return isNotifyPersistListener();
   }
 
+
   private boolean isNotifyPersistListener() {
     return beanPersistListener != null;
   }
@@ -763,7 +757,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     }
     setNotifyCache();
     boolean isChangeLog = beanDescriptor.isChangeLog();
-    if (type == Type.UPDATE) {
+    if (type == Type.UPDATE && (isChangeLog || notifyCache)) {
       // get the dirty properties for update notification to the doc store
       dirtyProperties = intercept.dirtyProperties();
     }
@@ -807,27 +801,21 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   }
 
   private void controllerPost() {
-    boolean old = transaction.isFlushOnQuery();
-    transaction.setFlushOnQuery(false);
-    try {
-      switch (type) {
-        case INSERT:
-          controller.postInsert(this);
-          break;
-        case UPDATE:
-          controller.postUpdate(this);
-          break;
-        case DELETE_SOFT:
-          controller.postSoftDelete(this);
-          break;
-        case DELETE:
-          controller.postDelete(this);
-          break;
-        default:
-          break;
-      }
-    } finally {
-      transaction.setFlushOnQuery(old);
+    switch (type) {
+      case INSERT:
+        controller.postInsert(this);
+        break;
+      case UPDATE:
+        controller.postUpdate(this);
+        break;
+      case DELETE_SOFT:
+        controller.postSoftDelete(this);
+        break;
+      case DELETE:
+        controller.postDelete(this);
+        break;
+      default:
+        break;
     }
   }
 
@@ -1248,12 +1236,4 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   private void setGeneratedId() {
     beanDescriptor.setGeneratedId(entityBean, transaction);
   }
-
-  public void setInsertOptions(InsertOptions insertOptions) {
-    this.insertOptions  = insertOptions;
-  }
-
-  public InsertOptions insertOptions() {
-    return insertOptions;
-  }
 }

ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java

@@ -77,13 +77,10 @@ public final class PersistRequestOrmUpdate extends PersistRequest {
    */
   @Override
   public void postExecute() {
-    OrmUpdateType ormUpdateType = ormUpdate.ormUpdateType();
-    if (OrmUpdateType.INSERT != ormUpdateType && !transaction.isAutoPersistUpdates()) {
-      beanDescriptor.contextClear(transaction.persistenceContext());
-    }
     if (startNanos > 0) {
       persistExecute.collectOrmUpdate(label, startNanos);
     }
+    OrmUpdateType ormUpdateType = ormUpdate.ormUpdateType();
     String tableName = ormUpdate.baseTable();
     if (transaction.isLogSummary()) {
       transaction.logSummary("{0} table[{1}] rows[{2}] bind[{3}]", ormUpdateType, tableName, rowCount, bindLog);

ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java

@@ -3,13 +3,10 @@ package io.ebeaninternal.server.core;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.persist.PersistExecute;
 import io.ebeaninternal.server.persist.TrimLogSql;
 
-import java.util.List;
-
 /**
  * Persist request specifically for CallableSql.
  */
@@ -159,14 +156,6 @@ public final class PersistRequestUpdateSql extends PersistRequest {
    */
   @Override
   public void postExecute() {
-    if (sqlType != SqlType.SQL_INSERT && !transaction.isAutoPersistUpdates()) {
-      List<BeanDescriptor<?>> descriptors = server.descriptors(tableName);
-      if (descriptors != null) {
-        for (BeanDescriptor<?> descriptor : descriptors) {
-          descriptor.contextClear(transaction.persistenceContext());
-        }
-      }
-    }
     if (startNanos > 0) {
       persistExecute.collectSqlUpdate(label, startNanos);
     }

ebean-core/src/main/java/io/ebeaninternal/server/core/Persister.java

@@ -1,7 +1,11 @@
 package io.ebeaninternal.server.core;
 
-import io.avaje.lang.Nullable;
-import io.ebean.*;
+import io.ebean.CallableSql;
+import io.ebean.MergeOptions;
+import io.ebean.Query;
+import io.ebean.SqlUpdate;
+import io.ebean.Transaction;
+import io.ebean.Update;
 import io.ebean.bean.EntityBean;
 import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.api.SpiSqlUpdate;
@@ -27,9 +31,9 @@ public interface Persister {
   void update(EntityBean entityBean, Transaction t);
 
   /**
-   * Perform an Insert using the given bean.
+   * Force an Insert using the given bean.
    */
-  void insert(EntityBean entityBean, @Nullable InsertOptions insertOptions, @Nullable Transaction t);
+  void insert(EntityBean entityBean, Transaction t);
 
   /**
    * Insert or update the bean depending on its state.
@@ -40,6 +44,7 @@ public interface Persister {
    * Delete a bean given it's type and id value.
    * <p>
    * This will also cascade delete one level of children.
+   * </p>
    */
   int delete(Class<?> beanType, Object id, Transaction transaction, boolean permanent);
 

ebean-core/src/main/java/io/ebeaninternal/server/core/SlowQueryBindCapture.java

@@ -1,71 +0,0 @@
-package io.ebeaninternal.server.core;
-
-import io.ebeaninternal.api.BindParams;
-import io.ebeaninternal.api.SpiExpressionBind;
-import io.ebeaninternal.api.SpiExpressionList;
-import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.persist.MultiValueWrapper;
-
-import java.util.ArrayList;
-import java.util.List;
-
-final class SlowQueryBindCapture implements SpiExpressionBind {
-
-  private final SpiQuery<?> query;
-  private final List<Object> bindParams = new ArrayList<>();
-
-  SlowQueryBindCapture(SpiQuery<?> query) {
-    this.query = query;
-  }
-
-  List<Object> capture() {
-    var params = query.bindParams();
-    if (params != null) {
-      var positionedParameters = params.positionedParameters();
-      for (BindParams.Param param : positionedParameters) {
-        if (param.isInParam()) {
-          add(param.inValue());
-        }
-      }
-    }
-    Object id = query.getId();
-    if (id != null) {
-      add(id);
-    }
-    SpiExpressionList<?> spiExpressionList = query.whereExpressions();
-    if (spiExpressionList != null) {
-      spiExpressionList.addBindValues(this);
-    }
-    return bindParams;
-  }
-
-  private void add(Object value) {
-    if (value instanceof MultiValueWrapper) {
-      var mvw = (MultiValueWrapper) value;
-      bindParams.add(mvw.getValues());
-    } else {
-      bindParams.add(value);
-    }
-  }
-
-  @Override
-  public BeanDescriptor<?> descriptor() {
-    return query.descriptor();
-  }
-
-  @Override
-  public void addBindValue(Object bindValue) {
-    add(bindValue);
-  }
-
-  @Override
-  public void addBindEncryptKey(Object encryptKey) {
-    bindParams.add("*");
-  }
-
-  @Override
-  public String escapeLikeString(String value) {
-    return query.descriptor().ebeanServer().databasePlatform().escapeLikeString(value);
-  }
-}

ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java

@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.core.bootup;
 
 import io.avaje.classpath.scanner.ClassPathScanner;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.server.core.ClassPathScanners;
 
@@ -24,11 +24,11 @@ public class BootupClassPathSearch {
    * Search the classPath for the classes we are interested in returning
    * them as BootupClasses.
    */
-  public static BootupClasses search(DatabaseBuilder.Settings config) {
+  public static BootupClasses search(DatabaseConfig config) {
     return new BootupClassPathSearch(config).getBootupClasses();
   }
 
-  private BootupClassPathSearch(DatabaseBuilder.Settings config) {
+  private BootupClassPathSearch(DatabaseConfig config) {
     // find packages defined in ebean.mf resources
     Set<String> mfPackages = ManifestReader.create(config.getClassLoadConfig().getClassLoader())
       .read("META-INF/ebean.mf")

ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java

@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.core.bootup;
 
 import io.ebean.annotation.DocStore;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.IdGenerator;
 import io.ebean.config.ScalarTypeConverter;
 import io.ebean.core.type.ScalarType;
@@ -85,7 +85,7 @@ public class BootupClasses implements Predicate<Class<?>> {
   /**
    * Run any ServerConfigStartup listeners.
    */
-  public void runServerConfigStartup(DatabaseBuilder config) {
+  public void runServerConfigStartup(DatabaseConfig config) {
     for (Class<?> cls : serverConfigStartupCandidates) {
       try {
         ServerConfigStartup newInstance = (ServerConfigStartup) cls.getDeclaredConstructor().newInstance();
@@ -166,7 +166,7 @@ public class BootupClasses implements Predicate<Class<?>> {
     add(startupInstances, serverConfigStartupInstances, serverConfigStartupCandidates);
   }
 
-  public void addChangeLogInstances(DatabaseBuilder.Settings config) {
+  public void addChangeLogInstances(DatabaseConfig config) {
     changeLogPrepare = config.getChangeLogPrepare();
     changeLogListener = config.getChangeLogListener();
     changeLogRegister = config.getChangeLogRegister();

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -4,7 +4,7 @@ import io.ebean.*;
 import io.ebean.annotation.DocStoreMode;
 import io.ebean.bean.*;
 import io.ebean.cache.QueryCacheEntry;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.EncryptKey;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
@@ -207,7 +207,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
     this.owner = owner;
     this.multiValueSupported = owner.isMultiValueSupported();
     this.entityType = deploy.getEntityType();
-    this.properties = deploy.propertyNames();
+    this.properties = deploy.getProperties();
     this.name = InternString.intern(deploy.getName());
     this.baseTableAlias = "t0";
     this.fullName = InternString.intern(deploy.getFullName());
@@ -240,7 +240,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
     this.partitionMeta = deploy.getPartitionMeta();
     this.tablespaceMeta = deploy.getTablespaceMeta();
     this.storageEngine = deploy.getStorageEngine();
-    this.autoTunable = entityType == EntityType.ORM || entityType == EntityType.VIEW;
+    this.autoTunable = beanFinder == null && (entityType == EntityType.ORM || entityType == EntityType.VIEW);
     // helper object used to derive lists of properties
     DeployBeanPropertyLists listHelper = new DeployBeanPropertyLists(owner, this, deploy);
     this.softDeleteProperty = listHelper.getSoftDeleteProperty();
@@ -379,7 +379,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   /**
    * Return the DatabaseConfig.
    */
-  public DatabaseBuilder.Settings config() {
+  public DatabaseConfig config() {
     return owner.config();
   }
 
@@ -1737,13 +1737,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
     pc.clear(rootBeanType, idValue);
   }
 
-  /**
-   * Clear a bean from the persistence context.
-   */
-  public void contextClear(PersistenceContext pc) {
-    pc.clear(rootBeanType);
-  }
-
   /**
    * Delete a bean from the persistence context (such that we don't fetch it in the same transaction).
    */

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java

@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.DatabaseBuilder;
 import io.ebean.Model;
 import io.ebean.annotation.ConstraintMode;
 import io.ebean.bean.BeanCollection;
@@ -71,7 +70,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   private final NamingConvention namingConvention;
   private final DeployCreateProperties createProperties;
   private final BeanManagerFactory beanManagerFactory;
-  private final DatabaseBuilder.Settings config;
+  private final DatabaseConfig config;
   private final ChangeLogListener changeLogListener;
   private final ChangeLogRegister changeLogRegister;
   private final ChangeLogPrepare changeLogPrepare;
@@ -96,7 +95,6 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   private final String asOfViewSuffix;
   private final boolean jacksonCorePresent;
   private final int queryPlanTTLSeconds;
-  private final BindMaxLength bindMaxLength;
   private int entityBeanCount;
   private List<BeanDescriptor<?>> immutableDescriptorList;
   /**
@@ -145,19 +143,6 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     this.changeLogListener = config.changeLogListener(bootupClasses.getChangeLogListener());
     this.changeLogRegister = config.changeLogRegister(bootupClasses.getChangeLogRegister());
     this.jacksonCorePresent = config.isJacksonCorePresent();
-    this.bindMaxLength = initMaxLength();
-  }
-
-  BindMaxLength initMaxLength() {
-    LengthCheck lengthCheck = this.config.getLengthCheck();
-    switch (lengthCheck) {
-      case OFF:
-        return null;
-      case UTF8:
-        return BindMaxLength.ofUtf8();
-      default:
-        return BindMaxLength.ofStandard();
-    }
   }
 
   @Override
@@ -194,19 +179,19 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   /**
    * Return the AsOfViewSuffix based on the DbHistorySupport.
    */
-  private String asOfViewSuffix(DatabasePlatform databasePlatform, DatabaseBuilder.Settings config) {
+  private String asOfViewSuffix(DatabasePlatform databasePlatform, DatabaseConfig serverConfig) {
     DbHistorySupport historySupport = databasePlatform.historySupport();
     // with historySupport returns a simple view suffix or the sql2011 as of timestamp suffix
-    return (historySupport == null) ? config.getAsOfViewSuffix() : historySupport.getAsOfViewSuffix(config.getAsOfViewSuffix());
+    return (historySupport == null) ? serverConfig.getAsOfViewSuffix() : historySupport.getAsOfViewSuffix(serverConfig.getAsOfViewSuffix());
   }
 
   /**
    * Return the versions between timestamp suffix based on the DbHistorySupport.
    */
-  private String versionsBetweenSuffix(DatabasePlatform databasePlatform, DatabaseBuilder.Settings config) {
+  private String versionsBetweenSuffix(DatabasePlatform databasePlatform, DatabaseConfig serverConfig) {
     DbHistorySupport historySupport = databasePlatform.historySupport();
     // with historySupport returns a simple view suffix or the sql2011 versions between timestamp suffix
-    return (historySupport == null) ? config.getAsOfViewSuffix() : historySupport.getVersionsBetweenSuffix(config.getAsOfViewSuffix());
+    return (historySupport == null) ? serverConfig.getAsOfViewSuffix() : historySupport.getVersionsBetweenSuffix(serverConfig.getAsOfViewSuffix());
   }
 
   @Override
@@ -215,7 +200,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   }
 
   @Override
-  public DatabaseBuilder.Settings config() {
+  public DatabaseConfig config() {
     return config;
   }
 
@@ -329,7 +314,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    * Return the BeanDescriptors mapped to the table.
    */
   public List<BeanDescriptor<?>> descriptors(String tableName) {
-    return tableName == null ? Collections.emptyList() : tableToDescMap.get(tableName.toLowerCase());
+    return tableToDescMap.get(tableName.toLowerCase());
   }
 
   /**
@@ -374,10 +359,11 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
         // build map of tables to view entities dependent on those tables
         // for the purpose of invalidating appropriate query caches
         String[] dependentTables = desc.dependentTables();
-        if (dependentTables != null) {
+        if (dependentTables != null && dependentTables.length > 0) {
           for (String depTable : dependentTables) {
             depTable = depTable.toLowerCase();
-            tableToViewDescMap.computeIfAbsent(depTable, k -> new ArrayList<>(1)).add(desc);
+            List<BeanDescriptor<?>> list = tableToViewDescMap.computeIfAbsent(depTable, k -> new ArrayList<>(1));
+            list.add(desc);
           }
         }
       }
@@ -503,7 +489,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     }
   }
 
-  private String errNothingRegistered() {
+  private <T> String errNothingRegistered() {
     return "There are no registered entities. If using query beans, that generates EbeanEntityRegister.java into " +
       "generated sources and is service loaded. If using module-info.java, then probably missing 'provides io.ebean.config.EntityClassRegister with EbeanEntityRegister' clause.";
   }
@@ -1046,7 +1032,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
       setConcurrencyMode(desc);
     }
     // generate the byte code
-    setAccessors(desc);
+    createByteCode(desc);
   }
 
   /**
@@ -1114,13 +1100,13 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     return databasePlatform.createSequenceIdGenerator(backgroundExecutor, dataSource, stepSize, seqName);
   }
 
-  private void setAccessors(DeployBeanDescriptor<?> deploy) {
+  private void createByteCode(DeployBeanDescriptor<?> deploy) {
     // check to see if the bean supports EntityBean interface
     // generate a subclass if required
-    confirmEnhanced(deploy);
+    setEntityBeanClass(deploy);
     // use Code generation or Standard reflection to support
     // getter and setter methods
-    setPropertyAccessors(deploy);
+    setBeanReflect(deploy);
   }
 
   /**
@@ -1147,14 +1133,15 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    * and getting of properties. It is generally faster to use code generation
    * rather than reflection to do this.
    */
-  private void setPropertyAccessors(DeployBeanDescriptor<?> desc) {
+  private void setBeanReflect(DeployBeanDescriptor<?> desc) {
     // Set the BeanReflectGetter and BeanReflectSetter that typically
     // use generated code. NB: Due to Bug 166 so now doing this for
     // abstract classes as well.
-    BeanPropertiesReader reflectProps = new BeanPropertiesReader(desc.propertyNames());
+    BeanPropertiesReader reflectProps = new BeanPropertiesReader(desc.getBeanType());
+    desc.setProperties(reflectProps.getProperties());
     for (DeployBeanProperty prop : desc.propertiesAll()) {
       String propName = prop.getName();
-      Integer pos = reflectProps.propertyIndex(propName);
+      Integer pos = reflectProps.getPropertyIndex(propName);
       if (pos == null) {
         if (isPersistentField(prop)) {
           throw new IllegalStateException(
@@ -1226,7 +1213,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   /**
    * Test the bean type to see if it implements EntityBean interface already.
    */
-  private void confirmEnhanced(DeployBeanDescriptor<?> desc) {
+  private void setEntityBeanClass(DeployBeanDescriptor<?> desc) {
     Class<?> beanClass = desc.getBeanType();
     if (!hasEntityBeanInterface(beanClass)) {
       String msg = "Bean " + beanClass + " is not enhanced? Check packages specified in ebean.mf. If you are running in IDEA or " +
@@ -1360,10 +1347,6 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     return list;
   }
 
-  public BindMaxLength bindMaxLength() {
-    return bindMaxLength;
-  }
-
   /**
    * Comparator to sort the BeanDescriptors by name.
    */

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.EncryptKey;
 import io.ebean.config.NamingConvention;
 import io.ebean.core.type.ScalarType;
@@ -24,7 +24,7 @@ public interface BeanDescriptorMap {
   /**
    * Return the DatabaseConfig.
    */
-  DatabaseBuilder.Settings config();
+  DatabaseConfig config();
 
   /**
    * Return the Cache Manager.

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java

@@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebean.annotation.PostSoftDelete;
 import io.ebean.annotation.PreSoftDelete;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.event.BeanPersistAdapter;
 import io.ebean.event.BeanPersistRequest;
 import io.ebean.event.BeanPostConstructListener;
@@ -34,7 +34,7 @@ final class BeanLifecycleAdapterFactory {
 
   private final boolean postConstructPresent;
 
-  BeanLifecycleAdapterFactory(DatabaseBuilder.Settings config) {
+  BeanLifecycleAdapterFactory(DatabaseConfig config) {
     this.postConstructPresent = config.getClassLoadConfig().isJavaxPostConstructPresent();
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java

@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
 import com.fasterxml.jackson.core.JsonToken;
-import io.ebean.DataIntegrityException;
 import io.ebean.ValuePair;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
@@ -11,6 +10,7 @@ import io.ebean.config.EncryptKey;
 import io.ebean.config.dbplatform.DbEncryptFunction;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarType;
 import io.ebean.plugin.Property;
 import io.ebean.text.StringParser;
@@ -161,7 +161,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    */
   private final String dbComment;
   private final DbEncryptFunction dbEncryptFunction;
-  private final BindMaxLength bindMaxLength;
   private int deployOrder;
   final boolean jsonSerialize;
   final boolean jsonDeserialize;
@@ -245,7 +244,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     }
     this.jsonSerialize = deploy.isJsonSerialize();
     this.jsonDeserialize = deploy.isJsonDeserialize();
-    this.bindMaxLength = deploy.bindMaxLength();
   }
 
   private String tableAliasIntern(BeanDescriptor<?> descriptor, String s, boolean dbEncrypted, String dbColumn) {
@@ -328,7 +326,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     this.elPlaceHolderEncrypted = override.replace(source.elPlaceHolderEncrypted, source.dbColumn);
     this.jsonSerialize = source.jsonSerialize;
     this.jsonDeserialize = source.jsonDeserialize;
-    this.bindMaxLength = source.bindMaxLength;
   }
 
   /**
@@ -539,18 +536,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   @SuppressWarnings("unchecked")
   public void bind(DataBind b, Object value) throws SQLException {
     scalarType.bind(b, value);
-    if (bindMaxLength != null) {
-      Object obj = b.popLastObject();
-      long length = bindMaxLength.length(dbLength, obj);
-      if (length > dbLength) {
-        b.closeInputStreams();
-        String s = String.valueOf(value); // take original bind value here.
-        if (s.length() > 50) {
-          s = s.substring(0, 47) + "...";
-        }
-        throw new DataIntegrityException("Cannot bind value '" + s + "' (effective length=" + length + ") to column '" + dbColumn + "' (length=" + dbLength + ")");
-      }
-    }
   }
 
   @SuppressWarnings(value = "unchecked")
@@ -1143,14 +1128,14 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    * Returns true if this <code>isLob()</code> or the type will effectively map to a lob.
    */
   @Override
-  public boolean isLobForPlatform() {
+  public boolean isDbLob() {
     if (lob) {
       return true;
     }
     switch (dbType) {
       case DbPlatformType.JSON:
       case DbPlatformType.JSONB:
-        return dbLength == 0 || dbLength > 4000; // must be analog to DbPlatformTypeMapping.lookup
+        return dbLength == 0; // must be analog to DbPlatformTypeMapping.lookup
       case DbPlatformType.JSONBlob:
       case DbPlatformType.JSONClob:
         return true;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java

@@ -360,9 +360,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     for (ExportedProperty exportedProperty : exportedProperties) {
       row.addColumn(exportedProperty.getForeignDbColumn());
     }
-    if (importedId == null) {
-      throw new PersistenceException("Missing @Id property on bean related to ManyToMany " + fullName());
-    }
     importedId.buildImport(row);
     return row.build();
   }
@@ -569,9 +566,10 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
   }
 
   /**
-   * Set the parent bean to the child (update the relationship).
+   * Set the join properties from the parent bean to the child bean.
+   * This is only valid for OneToMany and NOT valid for ManyToMany.
    */
-  public void setParentToChild(EntityBean parent, EntityBean child, Object mapKeyValue) {
+  public void setJoinValuesToChild(EntityBean parent, EntityBean child, Object mapKeyValue) {
     if (mapKeyProperty != null) {
       mapKeyProperty.setValue(child, mapKeyValue);
     }
@@ -582,31 +580,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     }
   }
 
-  /**
-   * Return true if the parent bean has been set to the child (updated the relationship).
-   */
-  public boolean setParentToChild(EntityBean parent, EntityBean child, Object mapKeyValue, BeanDescriptor<?> parentDesc) {
-    if (manyToMany
-      || childMasterProperty == null
-      || !child._ebean_getIntercept().isLoadedProperty(childMasterProperty.propertyIndex())) {
-      return false;
-    }
-
-    Object currentParent = childMasterProperty.getValue(child);
-    if (currentParent != null) {
-      Object newId = parentDesc.getId(parent);
-      Object oldId = parentDesc.id(currentParent);
-      if (Objects.equals(newId, oldId)) {
-        return false;
-      }
-    }
-    childMasterProperty.setValueIntercept(child, parent);
-    if (mapKeyProperty != null) {
-      mapKeyProperty.setValue(child, mapKeyValue);
-    }
-    return true;
-  }
-
   /**
    * Return the order by clause used to order the fetching of the data for
    * this list, set or map.

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BindMaxLength.java

@@ -1,90 +0,0 @@
-package io.ebeaninternal.server.deploy;
-
-import io.ebean.core.type.InputStreamInfo;
-
-import java.nio.charset.StandardCharsets;
-
-/**
- * The max length check on bind values.
- */
-public interface BindMaxLength {
-
-  /**
-   * Return a UTF8 based implementation.
-   */
-  static BindMaxLength ofUtf8() {
-    return new UTF8();
-  }
-
-  /**
-   * Return a standard implementation.
-   */
-  static BindMaxLength ofStandard() {
-    return new Standard();
-  }
-
-  /**
-   * Return the length of the object.
-   */
-  long length(int dbLength, Object obj);
-
-  /**
-   * Length check based on UTF8 bytes.
-   */
-  final class UTF8 implements BindMaxLength {
-
-    @Override
-    public long length(int dbLength, Object obj) {
-      if (obj == null) {
-        return -1;
-      } else if (obj instanceof String) {
-        String s = (String) obj;
-        return utf8String(dbLength, s);
-      } else if (obj instanceof byte[]) {
-        return ((byte[]) obj).length;
-      } else if (obj instanceof InputStreamInfo) {
-        return ((InputStreamInfo) obj).length();
-      } else if ("org.postgresql.util.PGobject".equals(obj.getClass().getCanonicalName())) {
-        String value = ((org.postgresql.util.PGobject) obj).getValue();
-        return value == null ? -1 : utf8String(dbLength, value);
-      } else {
-        return -1;
-      }
-    }
-
-    private static int utf8String(int dbLength, String s) {
-      int stringLength = s.length();
-      if (stringLength > dbLength) {
-        return stringLength;
-      } else if (stringLength * 4 <= dbLength) {
-        return -1;
-      } else {
-        return s.getBytes(StandardCharsets.UTF_8).length;
-      }
-    }
-  }
-
-  /**
-   * Standard string length implementation.
-   */
-  final class Standard implements BindMaxLength {
-
-    @Override
-    public long length(int dbLength, Object obj) {
-      if (obj == null) {
-        return -1;
-      } else if (obj instanceof String) {
-        return ((String) obj).length();
-      } else if (obj instanceof byte[]) {
-        return ((byte[]) obj).length;
-      } else if (obj instanceof InputStreamInfo) {
-        return ((InputStreamInfo) obj).length();
-      } else if ("org.postgresql.util.PGobject".equals(obj.getClass().getCanonicalName())) {
-        String value = ((org.postgresql.util.PGobject) obj).getValue();
-        return value == null ? -1 : value.length();
-      } else {
-        return -1;
-      }
-    }
-  }
-}

ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java

@@ -63,7 +63,7 @@ class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
   }
 
   @Override
-  public boolean isLobForPlatform() {
+  public boolean isDbLob() {
     return false;
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java

@@ -1,8 +1,10 @@
 package io.ebeaninternal.server.deploy.generatedproperty;
 
-import io.ebean.DatabaseBuilder;
 import io.ebean.Transaction;
-import io.ebean.config.*;
+import io.ebean.config.ClassLoadConfig;
+import io.ebean.config.CurrentUserProvider;
+import io.ebean.config.DatabaseConfig;
+import io.ebean.config.IdGenerator;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
@@ -27,7 +29,7 @@ public final class GeneratedPropertyFactory {
   private final ClassLoadConfig classLoadConfig;
   private final Map<String, PlatformIdGenerator> idGeneratorMap = new HashMap<>();
 
-  public GeneratedPropertyFactory(boolean offlineMode, DatabaseBuilder.Settings config, List<IdGenerator> idGenerators) {
+  public GeneratedPropertyFactory(boolean offlineMode, DatabaseConfig config, List<IdGenerator> idGenerators) {
     this.classLoadConfig = config.getClassLoadConfig();
     this.insertFactory = new InsertTimestampFactory(classLoadConfig);
     this.updateFactory = new UpdateTimestampFactory(classLoadConfig);

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java

@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.deploy.id;
 
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.deploy.BeanProperty;
@@ -144,7 +143,7 @@ public interface IdBinder {
   /**
    * Binds multiple id value to a request.
    */
-  void addBindValues(SpiExpressionBind request, Collection<?> ids);
+  void addBindValues(SpiExpressionRequest request, Collection<?> ids);
 
   /**
    * Return the sql for binding the id using an IN clause.

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java

@@ -2,7 +2,6 @@ package io.ebeaninternal.server.deploy.id;
 
 import io.ebean.bean.EntityBean;
 import io.ebean.util.SplitName;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -270,7 +269,7 @@ public final class IdBinderEmbedded implements IdBinder {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request, Collection<?> values) {
+  public void addBindValues(SpiExpressionRequest request, Collection<?> values) {
     for (Object value : values) {
       final EntityBean bean = (EntityBean) value;
       for (BeanProperty prop : props) {