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/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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>14.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>14.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.0.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.0.0</version>
+    <version>13.23.0-jakarta</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-postgis-types</artifactId>
-      <version>14.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.24.0</version>
+      <version>13.18.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.24.0</version>
+      <version>13.18.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>14.0.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.0.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.0.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.10</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/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() {

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/Query.java

@@ -650,9 +650,9 @@ public interface Query<T> extends CancelableQuery {
    * 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.
    */
   Query<T> usingMaster();
@@ -918,25 +918,6 @@ public interface Query<T> extends CancelableQuery {
   @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();
-
   /**
    * Return true if this is countDistinct query.
    */
@@ -1307,7 +1288,7 @@ public interface Query<T> extends CancelableQuery {
   Query<T> orderBy(String orderByClause);
 
   /**
-   * @deprecated migrate to {@link #orderBy()}.
+   * Deprecated migrate to orderBy().
    */
   @Deprecated(since = "13.19", forRemoval = true)
   default Query<T> order(String orderByClause) {
@@ -1326,7 +1307,7 @@ public interface Query<T> extends CancelableQuery {
   OrderBy<T> orderBy();
 
   /**
-   * @deprecated migrate to {@link #orderBy()}.
+   * Deprecated migrate to orderBy().
    */
   @Deprecated(since = "13.19", forRemoval = true)
   default OrderBy<T> order() {
@@ -1339,7 +1320,7 @@ public interface Query<T> extends CancelableQuery {
   Query<T> setOrderBy(OrderBy<T> orderBy);
 
   /**
-   * @deprecated migrate to {@link #setOrderBy(OrderBy)}.
+   * Deprecated migrate to setOrderBy().
    */
   @Deprecated(since = "13.19", forRemoval = true)
   default Query<T> setOrder(OrderBy<T> orderBy) {

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

@@ -1,8 +1,5 @@
 package io.ebean.config;
 
-import io.avaje.config.Config;
-import io.avaje.config.Configuration;
-
 import java.util.Properties;
 
 /**
@@ -18,17 +15,8 @@ public class ContainerConfig {
   private String namespace;
   private String podName;
   private int port;
-  private Properties properties;
-  private Configuration configuration;
 
-  public ContainerConfig() {
-    this.configuration = Config.asConfiguration();
-    this.active = configuration.getBool("ebean.cluster.active", active);
-    this.serviceName = configuration.getNullable("ebean.cluster.serviceName", serviceName);
-    this.namespace = configuration.getNullable("ebean.cluster.namespace", namespace);
-    this.podName = configuration.getNullable("ebean.cluster.podName", podName);
-    this.port = configuration.getInt("ebean.cluster.port", 0);
-  }
+  private Properties properties;
 
   /**
    * Return the service name.
@@ -104,7 +92,7 @@ public class ContainerConfig {
    * Return the deployment properties.
    */
   public Properties getProperties() {
-    return properties != null ? properties : configuration.asProperties();
+    return properties;
   }
 
   /**
@@ -114,4 +102,26 @@ public class ContainerConfig {
     this.properties = properties;
   }
 
+  /**
+   * Load the settings from properties.
+   */
+  public void loadFromProperties(Properties properties) {
+    this.properties = properties;
+    this.active = getProperty(properties, "ebean.cluster.active", active);
+    this.serviceName = properties.getProperty("ebean.cluster.serviceName", serviceName);
+    this.namespace = properties.getProperty("ebean.cluster.namespace", namespace);
+    this.podName = properties.getProperty("ebean.cluster.podName", podName);
+    String portParam = properties.getProperty("ebean.cluster.port");
+    if (portParam != null) {
+      this.port = Integer.parseInt(portParam);
+    }
+  }
+
+  /**
+   * Return the boolean property setting.
+   */
+  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/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/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,7 +73,6 @@ class DatabaseConfigTest {
     props.setProperty("forUpdateNoKey", "true");
     props.setProperty("defaultServer", "false");
     props.setProperty("skipDataSourceCheck", "true");
-    props.setProperty("readOnlyDatabase", "true");
 
     props.setProperty("queryPlan.enable", "true");
     props.setProperty("queryPlan.thresholdMicros", "10000");
@@ -85,48 +83,46 @@ 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());
+    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");
+    assertThat(config.getMappingLocations()).containsExactly("classpath:/foo","bar");
 
     config.setPersistBatch(PersistBatch.NONE);
     config.setPersistBatchOnCascade(PersistBatch.NONE);
@@ -141,19 +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(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());
@@ -188,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.0.0</version>
+    <version>13.23.0-jakarta</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,49 +89,49 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>13.24.0</version>
+        <version>13.18.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-jsonnode</artifactId>
-        <version>13.24.0</version>
+        <version>13.18.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-mapper</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
@@ -155,37 +155,37 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-spring-txn</artifactId>
-        <version>14.0.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.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-db2</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-h2</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-hana</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mariadb</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mysql</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-nuodb</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-oracle</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgres</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis-types</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlite</artifactId>
-        <version>14.0.0</version>
+        <version>13.23.0-jakarta</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlserver</artifactId>
-        <version>14.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
     <dependency>
@@ -34,6 +34,13 @@
       <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/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/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.0.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.0.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.0.0</version>
+      <version>13.23.0-jakarta</version>
     </dependency>
 
+
     <!--
     Class retention Nonnull and Nullable annotations
     to assist with IDE auto-completion with Ebean API
@@ -147,21 +148,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.0</version>
+      <version>13.23.0-jakarta</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.0</version>
+      <version>13.23.0-jakarta</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.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

@@ -101,7 +101,7 @@ public final class LoadManyRequest extends LoadRequest {
     query.setLazyLoadForParents(many);
     many.addWhereParentIdIn(query, parentIdList(server));
     query.setPersistenceContext(loadContext.persistenceContext());
-    query.setLoadDescription(lazy ? "lazy" : "query", description());
+    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.
    */

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;
@@ -323,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.
@@ -627,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/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/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

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

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();
     }
@@ -1242,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/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;
@@ -180,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
@@ -201,7 +200,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   }
 
   @Override
-  public DatabaseBuilder.Settings config() {
+  public DatabaseConfig config() {
     return config;
   }
 
@@ -315,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());
   }
 
   /**
@@ -360,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);
           }
         }
       }
@@ -489,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.";
   }
@@ -1032,7 +1032,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
       setConcurrencyMode(desc);
     }
     // generate the byte code
-    setAccessors(desc);
+    createByteCode(desc);
   }
 
   /**
@@ -1100,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);
   }
 
   /**
@@ -1133,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(
@@ -1212,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 " +

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/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/meta/DeployBeanDescriptor.java

@@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy.meta;
 
 import io.ebean.annotation.Cache;
 import io.ebean.annotation.Identity;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.TableName;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
@@ -18,10 +18,6 @@ import io.ebeaninternal.server.idgen.UuidV1IdGenerator;
 import io.ebeaninternal.server.idgen.UuidV1RndIdGenerator;
 import io.ebeaninternal.server.idgen.UuidV4IdGenerator;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.MappedSuperclass;
-
-import java.lang.reflect.Field;
 import java.util.*;
 
 /**
@@ -39,7 +35,9 @@ public class DeployBeanDescriptor<T> {
 
   private static final PropOrder PROP_ORDER = new PropOrder();
 
-  private final DatabaseBuilder.Settings config;
+  private static final String I_SCALAOBJECT = "scala.ScalaObject";
+
+  private final DatabaseConfig config;
   private final BeanDescriptorManager manager;
   /**
    * Map of BeanProperty Linked so as to preserve order.
@@ -104,36 +102,16 @@ public class DeployBeanDescriptor<T> {
   /**
    * Construct the BeanDescriptor.
    */
-  public DeployBeanDescriptor(BeanDescriptorManager manager, Class<T> beanType, DatabaseBuilder.Settings config) {
+  public DeployBeanDescriptor(BeanDescriptorManager manager, Class<T> beanType, DatabaseConfig config) {
     this.manager = manager;
     this.config = config;
     this.beanType = beanType;
   }
 
-  private String[] readPropertyNames() {
-    try {
-      Field field = beanType.getField("_ebean_props");
-      return (String[]) field.get(null);
-    } catch (Exception e) {
-      throw new IllegalStateException("Error getting _ebean_props field on type " + beanType, e);
-    }
-  }
-
-  public void setPropertyNames(String[] properties) {
-    this.properties = properties;
-  }
-
-  public String[] propertyNames() {
-    if (properties == null) {
-      properties = readPropertyNames();
-    }
-    return properties;
-  }
-
   /**
    * Set the IdClass to use.
    */
-  public void setIdClass(Class<?> idClass) {
+  public void setIdClass(Class idClass) {
     this.idClass = idClass;
   }
 
@@ -216,10 +194,23 @@ public class DeployBeanDescriptor<T> {
     return tablespaceMeta;
   }
 
+  public boolean isScalaObject() {
+    Class<?>[] interfaces = beanType.getInterfaces();
+    for (Class<?> anInterface : interfaces) {
+      String iname = anInterface.getName();
+      if (I_SCALAOBJECT.equals(iname)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   public DeployBeanTable createDeployBeanTable() {
+
     DeployBeanTable beanTable = new DeployBeanTable(getBeanType());
     beanTable.setBaseTable(baseTable);
     beanTable.setIdProperty(idProperty());
+
     return beanTable;
   }
 
@@ -287,6 +278,14 @@ public class DeployBeanDescriptor<T> {
     this.identityMode.setIdType(type);
   }
 
+  public String[] getProperties() {
+    return properties;
+  }
+
+  public void setProperties(String[] props) {
+    this.properties = props;
+  }
+
   /**
    * Return the class type this BeanDescriptor describes.
    */

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

@@ -213,9 +213,9 @@ final class AnnotationAssocManys extends AnnotationAssoc {
 
     int sortOrder = 0;
     if (!prop.getManyType().isMap()) {
-      elementDescriptor.setPropertyNames(new String[]{"value"});
+      elementDescriptor.setProperties(new String[]{"value"});
     } else {
-      elementDescriptor.setPropertyNames(new String[]{"key", "value"});
+      elementDescriptor.setProperties(new String[]{"key", "value"});
       String dbKeyColumn = "mkey";
       MapKeyColumn mapKeyColumn = get(prop, MapKeyColumn.class);
       if (mapKeyColumn != null) {

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

@@ -90,10 +90,6 @@ final class AnnotationFields extends AnnotationParser {
     if (formula != null) {
       prop.setSqlFormula(processFormula(formula.select()), processFormula(formula.join()));
     }
-    DbComment comment = get(prop, DbComment.class);
-    if (comment != null) {
-      prop.setDbComment(comment.value());
-    }
     initWhoProperties(prop);
     initDbMigration(prop);
   }

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

@@ -1,8 +1,13 @@
 package io.ebeaninternal.server.deploy.parse;
 
-import io.ebean.DatabaseBuilder;
 import io.ebean.annotation.*;
-import io.ebean.config.*;
+import io.ebean.config.DatabaseConfig;
+import io.ebean.config.EncryptDeploy;
+import io.ebean.config.EncryptDeployManager;
+import io.ebean.config.EncryptKeyManager;
+import io.ebean.config.Encryptor;
+import io.ebean.config.NamingConvention;
+import io.ebean.config.TableName;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.core.type.ScalarType;
@@ -44,7 +49,7 @@ public final class DeployUtil {
   private final Encryptor bytesEncryptor;
   private final boolean useValidationNotNull;
 
-  public DeployUtil(TypeManager typeMgr, DatabaseBuilder.Settings config) {
+  public DeployUtil(TypeManager typeMgr, DatabaseConfig config) {
     this.typeManager = typeMgr;
     this.namingConvention = config.getNamingConvention();
     this.dbPlatform = config.getDatabasePlatform();

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

@@ -4,7 +4,7 @@ import io.ebean.annotation.Aggregation;
 import io.ebean.annotation.Formula;
 import io.ebean.annotation.Where;
 import io.ebean.config.ClassLoadConfig;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
@@ -31,7 +31,7 @@ final class ReadAnnotationConfig {
   private final ReadValidationAnnotations jakartaValidation;
   private final Set<Class<?>> metaAnnotations = new HashSet<>();
 
-  ReadAnnotationConfig(GeneratedPropertyFactory generatedPropFactory, String asOfViewSuffix, String versionsBetweenSuffix, DatabaseBuilder.Settings config) {
+  ReadAnnotationConfig(GeneratedPropertyFactory generatedPropFactory, String asOfViewSuffix, String versionsBetweenSuffix, DatabaseConfig config) {
     this.generatedPropFactory = generatedPropFactory;
     this.asOfViewSuffix = asOfViewSuffix;
     this.versionsBetweenSuffix = versionsBetweenSuffix;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy.parse;
 
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory;
 
@@ -12,7 +12,7 @@ public final class ReadAnnotations {
 
   private final ReadAnnotationConfig readConfig;
 
-  public ReadAnnotations(GeneratedPropertyFactory generatedPropFactory, String asOfViewSuffix, String versionsBetweenSuffix, DatabaseBuilder.Settings config) {
+  public ReadAnnotations(GeneratedPropertyFactory generatedPropFactory, String asOfViewSuffix, String versionsBetweenSuffix, DatabaseConfig config) {
     this.readConfig = new ReadAnnotationConfig(generatedPropFactory, asOfViewSuffix, versionsBetweenSuffix, config);
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java

@@ -60,7 +60,7 @@ final class BetweenPropertyExpression extends NonPrepareExpression {
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-    request.append("?").append(BETWEEN).property(name(lowProperty)).append(" and ").property(name(highProperty));
+    request.append(" ?").append(BETWEEN).property(name(lowProperty)).append(" and ").property(name(highProperty));
   }
 
   @Override

ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java

@@ -52,15 +52,10 @@ abstract class DLoadBaseContext {
   void setLabel(SpiQuery<?> query) {
     String label = parent.planLabel();
     if (label != null) {
-      query.setProfilePath(label, pathMode(query), parent.profileLocation());
+      query.setProfilePath(label, fullPath + "(" + query.loadMode() + ")", parent.profileLocation());
     }
   }
 
-  private String pathMode(SpiQuery<?> query) {
-    final var loadMode = query.loadMode();
-    return fullPath == null ? '_' + loadMode : fullPath + "__" + loadMode;
-  }
-
   PersistenceContext persistenceContext() {
     return parent.persistenceContext();
   }

ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java

@@ -119,11 +119,7 @@ public final class Binder {
             if (param.isEncryptionKey()) {
               bindLog.append("****");
             } else {
-              String sv = String.valueOf(value);
-              if (sv.length() > 50) {
-                sv = sv.substring(0, 47) + "...";
-              }
-              bindLog.append(sv);
+              bindLog.append(value);
             }
           }
           if (value instanceof Collection) {

ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java

@@ -212,7 +212,7 @@ public final class DefaultPersister implements Persister {
     if (bean._ebean_getIntercept().isUpdate()) {
       update(bean, t);
     } else {
-      insert(bean, null, t);
+      insert(bean, t);
     }
   }
 
@@ -220,15 +220,12 @@ public final class DefaultPersister implements Persister {
    * Insert this bean.
    */
   @Override
-  public void insert(EntityBean bean, InsertOptions insertOptions, Transaction t) {
+  public void insert(EntityBean bean, Transaction t) {
     PersistRequestBean<?> req = createRequest(bean, t, PersistRequest.Type.INSERT);
     if (req.isSkipReference()) {
       // skip insert on reference bean
       return;
     }
-    if (insertOptions != null) {
-      req.setInsertOptions(insertOptions);
-    }
     try {
       req.initTransIfRequiredWithBatchCascade();
       insert(req);

ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java

@@ -326,7 +326,7 @@ final class SaveManyBeans extends SaveManyBase {
   }
 
   private boolean isChangedProperty() {
-    return request.isChangedProperty(many.propertyIndex());
+    return parentBean._ebean_getIntercept().isChangedProperty(many.propertyIndex());
   }
 
   private void removeAssocManyOrphans() {

ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java

@@ -1,15 +1,11 @@
 package io.ebeaninternal.server.persist.dml;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Helper to support the generation of DML statements.
  */
 public final class GenerateDmlRequest {
 
   private final StringBuilder sb = new StringBuilder(100);
-  private final List<String> columns = new ArrayList<>();
   private StringBuilder insertBindBuffer;
   private String prefix;
   private String prefix2;
@@ -30,7 +26,7 @@ public final class GenerateDmlRequest {
     ++bindColumnCount;
     sb.append(prefix);
     sb.append(column);
-    columns.add(column);
+    //sb.append(expr);
     if (insertMode > 0) {
       if (insertMode++ > 1) {
         insertBindBuffer.append(',');
@@ -79,8 +75,4 @@ public final class GenerateDmlRequest {
   public boolean isUpdate() {
     return insertMode == 0;
   }
-
-  public List<String> columns() {
-    return columns;
-  }
 }

ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java

@@ -69,7 +69,7 @@ public final class InsertHandler extends DmlHandler {
 
     SpiTransaction t = persistRequest.transaction();
     // get the appropriate sql
-    sql = meta.sql(withId, persistRequest.insertOptions());
+    sql = meta.getSql(withId);
     PreparedStatement pstmt;
     if (persistRequest.isBatched()) {
       pstmt = pstmtBatch(t, sql, persistRequest, useGeneratedKeys);
@@ -134,8 +134,7 @@ public final class InsertHandler extends DmlHandler {
       if (idValue != null) {
         persistRequest.setGeneratedKey(idValue);
       }
-    } else if (persistRequest.insertOptions() == null) {
-      // insert on conflict do nothing can not return generated key
+    } else {
       throw new PersistenceException("Autoincrement getGeneratedKeys() returned no rows?");
     }
   }

ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java

@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.persist.dml;
 
-import io.ebean.InsertOptions;
 import io.ebean.annotation.Platform;
 import io.ebean.bean.EntityBean;
 import io.ebean.config.dbplatform.DatabasePlatform;
@@ -31,17 +30,15 @@ final class InsertMeta {
   private final Bindable shadowFKey;
   private final String[] identityDbColumns;
   private final Platform platform;
-  private final InsertMetaOptions options;
 
   InsertMeta(DatabasePlatform dbPlatform, BeanDescriptor<?> desc, Bindable shadowFKey, BindableId id, BindableList all) {
     this.platform = dbPlatform.platform();
-    this.options = InsertMetaPlatform.create(platform, desc, this);
     this.id = id;
     this.all = all;
     this.shadowFKey = shadowFKey;
 
     String tableName = desc.baseTable();
-    this.sqlWithId = sql(false, tableName);
+    this.sqlWithId = genSql(false, tableName);
 
     // only available for single Id property
     if (id.isConcatenated()) {
@@ -64,7 +61,7 @@ final class InsertMeta {
         this.supportsGetGeneratedKeys = dbPlatform.dbIdentity().isSupportsGetGeneratedKeys();
         this.supportsSelectLastInsertedId = desc.supportsSelectLastInsertedId();
       }
-      this.sqlNullId = sql(true, tableName);
+      this.sqlNullId = genSql(true, tableName);
     }
   }
 
@@ -116,31 +113,22 @@ final class InsertMeta {
   }
 
   /**
-   * Return the sql for the given options.
+   * get the sql based whether the id value(s) are null.
    */
-  public String sql(boolean withId, InsertOptions insertOptions) {
-    if (insertOptions == null) {
-      return sqlFor(withId);
+  public String getSql(boolean withId) {
+    if (withId) {
+      return sqlWithId;
+    } else {
+      return sqlNullId;
     }
-    return options.sql(withId, insertOptions);
   }
 
-  String sqlFor(boolean withId) {
-    return withId ? sqlWithId : sqlNullId;
-  }
-
-  private String sql(boolean nullId, String table) {
+  private String genSql(boolean nullId, String table) {
     GenerateDmlRequest request = new GenerateDmlRequest();
-    sql(request, nullId, table);
-    return request.toString();
-  }
-
-  void sql(GenerateDmlRequest request, boolean nullId, String table) {
     request.setInsertSetMode();
     request.append("insert into ").append(table);
     if (nullId && noColumnsForInsert()) {
-      request.append(defaultValues());
-      return;
+      return request.append(defaultValues()).toString();
     }
     request.append(" (");
     if (!nullId) {
@@ -154,6 +142,7 @@ final class InsertMeta {
     request.append(") values (");
     request.append(request.insertBindBuffer());
     request.append(")");
+    return request.toString();
   }
 
   private String defaultValues() {
@@ -176,4 +165,5 @@ final class InsertMeta {
     return shadowFKey == null
       && all.isEmpty();
   }
+
 }

ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMetaOptions.java

@@ -1,14 +0,0 @@
-package io.ebeaninternal.server.persist.dml;
-
-import io.ebean.InsertOptions;
-
-/**
- * Generator for insert SQL with options.
- */
-interface InsertMetaOptions {
-
-  /**
-   * Generate the SQL for the given insert options.
-   */
-  String sql(boolean withId, InsertOptions insertOptions);
-}

ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMetaOptionsPostgres.java

@@ -1,113 +0,0 @@
-package io.ebeaninternal.server.persist.dml;
-
-import io.ebean.InsertOptions;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanProperty;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
-/**
- * Postgres specific generation of insert on conflict.
- */
-final class InsertMetaOptionsPostgres implements InsertMetaOptions {
-
-  private final InsertMeta meta;
-  private final BeanDescriptor<?> desc;
-  private final String baseTable;
-  private final Map<String, String> sqlCache = new ConcurrentHashMap<>();
-
-  InsertMetaOptionsPostgres(InsertMeta meta, BeanDescriptor<?> desc) {
-    this.meta = meta;
-    this.desc = desc;
-    this.baseTable = desc.baseTable();
-  }
-
-  @Override
-  public String sql(boolean withId, InsertOptions options) {
-    String key = withId + options.key();
-    return sqlCache.computeIfAbsent(key, k -> generate(withId, options));
-  }
-
-  private String generate(boolean withId, InsertOptions options) {
-    char type = options.key().charAt(0);
-    switch (type) {
-      case 'U':
-        return generate(withId, false, options);
-      case 'N':
-        return generate(withId, true, options);
-      default:
-        return meta.sqlFor(withId);
-    }
-  }
-
-  private String generate(boolean withId, boolean doNothing, InsertOptions options) {
-    GenerateDmlRequest request = new GenerateDmlRequest();
-    meta.sql(request, !withId, baseTable);
-    request.append(" on conflict ");
-
-    List<String> uniqueColumns = desc.uniqueProps().stream()
-      .flatMap(Arrays::stream)
-      .map(BeanProperty::dbColumn)
-      .collect(Collectors.toList());
-
-    String constraintName = options.constraint();
-    if (constraintName != null) {
-      request.append("on constraint ").append(constraintName);
-    } else {
-      request.append("(");
-      String cols = options.uniqueColumns();
-      if (cols != null) {
-        request.append(cols);
-      } else {
-        appendUniqueColumns(uniqueColumns, request);
-      }
-      request.append(")");
-    }
-    if (doNothing) {
-      request.append(" do nothing");
-      return request.toString();
-    }
-    request.append(" do update set ");
-    String updateSet = options.updateSet();
-    if (updateSet != null) {
-      request.append(updateSet);
-    } else {
-      setColumns(withId, request, uniqueColumns);
-    }
-    return request.toString();
-  }
-
-  private void setColumns(boolean withId, GenerateDmlRequest request, List<String> uniqueColumns) {
-    List<String> columns = request.columns();
-    columns.removeAll(uniqueColumns);
-    if (withId) {
-      BeanProperty idProperty = desc.idProperty();
-      if (idProperty != null && !idProperty.isEmbedded()) {
-        columns.remove(idProperty.dbColumn());
-      }
-    }
-    for (int i = 0; i < columns.size(); i++) {
-      if (i > 0) {
-        request.append(", ");
-      }
-      String col = columns.get(i);
-      request.append(col).append("=excluded.").append(col);
-    }
-  }
-
-  private static void appendUniqueColumns(List<String> uniqueColumns, GenerateDmlRequest request) {
-    if (uniqueColumns.isEmpty()) {
-      throw new IllegalStateException("Unable to identify unique columns for INSERT ON CONFLICT - Add mapping like @Column(unique=true) or @Index(unique=true)");
-    }
-    for (int i = 0; i < uniqueColumns.size(); i++) {
-      if (i > 0) {
-        request.append(", ");
-      }
-      request.append(uniqueColumns.get(i));
-    }
-  }
-}

ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMetaPlatform.java

@@ -1,29 +0,0 @@
-package io.ebeaninternal.server.persist.dml;
-
-import io.ebean.InsertOptions;
-import io.ebean.annotation.Platform;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-
-final class InsertMetaPlatform {
-
-  private static final NotSupported NOT_SUPPORTED = new NotSupported();
-
-  static InsertMetaOptions create(Platform platform, BeanDescriptor<?> desc, InsertMeta meta) {
-    switch (platform.base()) {
-      case POSTGRES:
-      case YUGABYTE:
-      case COCKROACH:
-        return new InsertMetaOptionsPostgres(meta, desc);
-      default:
-        return NOT_SUPPORTED;
-    }
-  }
-
-  static final class NotSupported implements InsertMetaOptions {
-    @Override
-    public String sql(boolean withId, InsertOptions insertOptions) {
-      throw new UnsupportedOperationException("InsertOptions not supported on this database platform");
-    }
-  }
-
-}

ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java

@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.properties;
 
+import java.lang.reflect.Field;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -9,14 +11,34 @@ import java.util.Map;
 public final class BeanPropertiesReader {
 
   private final Map<String, Integer> propertyIndexMap = new HashMap<>();
+  private final String[] props;
 
-  public BeanPropertiesReader(String[] props) {
+  public BeanPropertiesReader(Class<?> clazz) {
+    this.props = getProperties(clazz);
     for (int i = 0; i < props.length; i++) {
       propertyIndexMap.put(props[i], i);
     }
   }
 
-  public Integer propertyIndex(String property) {
+  public String[] getProperties() {
+    return props;
+  }
+
+  @Override
+  public String toString() {
+    return Arrays.toString(props);
+  }
+
+  public Integer getPropertyIndex(String property) {
     return propertyIndexMap.get(property);
   }
+
+  private String[] getProperties(Class<?> clazz) {
+    try {
+      Field field = clazz.getField("_ebean_props");
+      return (String[]) field.get(null);
+    } catch (Exception e) {
+      throw new IllegalStateException("Error getting _ebean_props field on type " + clazz, e);
+    }
+  }
 }

ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java

@@ -169,7 +169,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
     this.queryMode = query.mode();
     this.loadContextBean = queryMode.isLoadContextBean() || query.getForUpdateLockType() != null;
     this.lazyLoadManyProperty = query.lazyLoadMany();
-    this.readOnly = query.isReadOnly();
+    this.readOnly = request.isReadOnly();
     this.disableLazyLoading = query.isDisableLazyLoading();
     this.objectGraphNode = query.parentNode();
     this.profilingListener = query.profilingListener();

ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java

@@ -7,7 +7,7 @@ import io.ebean.annotation.Platform;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.ObjectGraphNode;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.util.JdbcClose;
 import io.ebean.util.StringHelper;
@@ -38,7 +38,7 @@ public final class CQueryEngine {
   private final CQueryHistorySupport historySupport;
   private final DatabasePlatform dbPlatform;
 
-  public CQueryEngine(DatabaseBuilder.Settings config, DatabasePlatform dbPlatform, Binder binder, Map<String, String> asOfTableMapping) {
+  public CQueryEngine(DatabaseConfig config, DatabasePlatform dbPlatform, Binder binder, Map<String, String> asOfTableMapping) {
     this.dbPlatform = dbPlatform;
     this.defaultFetchSizeFindEach = config.getJdbcFetchSizeFindEach();
     this.defaultFetchSizeFindList = config.getJdbcFetchSizeFindList();
@@ -74,9 +74,6 @@ public final class CQueryEngine {
       if (request.logSql()) {
         request.logSql("{0}; --bind({1}) --micros({2}) --rows({3})", query.generatedSql(), query.bindLog(), query.micros(), rows);
       }
-      if (rows > 0) {
-        request.clearContext();
-      }
       return rows;
     } catch (SQLException e) {
       throw translate(request, query.bindLog(), query.generatedSql(), e);

ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java

@@ -61,7 +61,6 @@ final class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery
   /**
    * Execute the update or delete statement returning the row count.
    */
-  @SuppressWarnings("resource")
   public int execute() throws SQLException {
     long startNano = System.nanoTime();
     try {
@@ -110,7 +109,6 @@ final class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery
     pstmt = null;
   }
 
-  @SuppressWarnings("resource")
   @Override
   public void profile() {
     transaction()

ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java

@@ -287,11 +287,6 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
-  @Override
-  public <A> Optional<A> findSingleAttributeOrEmpty() {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
   @Override
   public boolean isCountDistinct() {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");

ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java

@@ -51,10 +51,6 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine {
    * Flushes the jdbc batch by default unless explicitly turned off on the transaction.
    */
   private <T> void flushJdbcBatchOnQuery(OrmQueryRequest<T> request) {
-    if (request.query().isUsingFuture()) {
-      // future queries never invoke a flush
-      return;
-    }
     SpiTransaction t = request.transaction();
     if (t.isFlushOnQuery()) {
       // before we perform a query, we need to flush any