Investigate BatchedBeanHolder ordering with updates before inserts

.github/workflows/build.yml

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

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

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [11, 17, 21]
+        java_version: [11, 17]
         os: [ubuntu-latest]
 
     steps:
@@ -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

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -17,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -42,13 +41,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-cockroach/pom.xml

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -17,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -42,13 +41,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-db2/pom.xml

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -17,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -42,13 +41,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-h2/pom.xml

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -17,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -42,13 +41,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-hana/pom.xml

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -17,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -42,13 +41,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-mariadb/pom.xml

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -17,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -42,13 +41,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-mysql/pom.xml

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -17,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -42,13 +41,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-nuodb/pom.xml

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -17,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -42,13 +41,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-oracle/pom.xml

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -17,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -42,13 +41,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-postgis/pom.xml

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-postgis</name>
-  <description>ebean-postgis composite</description>
-  <artifactId>ebean-postgis</artifactId>
-
-  <properties>
-    <postgis.jdbc.version>2.5.1</postgis.jdbc.version>
-    <postgres.jdbc.version>42.7.2</postgres.jdbc.version>
-  </properties>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-postgis-types</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <version>${postgres.jdbc.version}</version>
-      <exclusions>
-        <!-- exclude unnecessary checker framework -->
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>net.postgis</groupId>
-      <artifactId>postgis-jdbc</artifactId>
-      <version>${postgis.jdbc.version}</version>
-    </dependency>
-
-  </dependencies>
-</project>

composites/ebean-postgis/src/main/java/io/ebean/postgis/assembly/Assembly.java

@@ -1,7 +0,0 @@
-package io.ebean.postgis.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}

composites/ebean-postgis/src/main/java/module-info.java

@@ -1,10 +0,0 @@
-module io.ebean.postgis {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.postgres;
-  // requires transitive io.ebean.postgis.types;
-
-}

composites/ebean-postgres/pom.xml

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -17,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -42,13 +41,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlite/pom.xml

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -17,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -42,13 +41,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlserver/pom.xml

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -17,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -42,13 +41,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-yugabyte/pom.xml

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -17,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -42,13 +41,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean/pom.xml

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -17,31 +16,31 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>14.0.0</version>
+      <version>13.18.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>14.0.0</version>
+      <version>13.18.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -60,13 +59,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
@@ -23,7 +23,6 @@
     <module>ebean-nuodb</module>
     <module>ebean-oracle</module>
     <module>ebean-postgres</module>
-    <module>ebean-postgis</module>
 <!--    <module>sqlanywhere</module>-->
     <module>ebean-sqlite</module>
     <module>ebean-sqlserver</module>

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
@@ -39,12 +39,12 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>3.12</version>
+      <version>3.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>jakarta-persistence-api</artifactId>
+      <artifactId>persistence-api</artifactId>
       <version>${ebean-persistence-api.version}</version>
     </dependency>
 
@@ -90,22 +90,29 @@
       <optional>true</optional>
     </dependency>
 
-    <!-- JAVAX-DEPENDENCY-START ___
+    <!-- JAVAX-DEPENDENCY-START -->
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <version>3.1.0</version>
       <optional>true</optional>
     </dependency>
-    ____ JAVAX-DEPENDENCY-END -->
-    <!-- JAKARTA-DEPENDENCY-START -->
+    <!-- JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START ___
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
       <version>6.0.0</version>
       <optional>true</optional>
     </dependency>
-    <!-- JAKARTA-DEPENDENCY-END -->
+    ____ JAKARTA-DEPENDENCY-END -->
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
 
   </dependencies>
 

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

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import jakarta.persistence.PessimisticLockException;
+import javax.persistence.PessimisticLockException;
 
 /**
  * Thrown when failing to acquire a pessimistic lock.

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

@@ -7,8 +7,8 @@ import io.ebean.cache.ServerCacheManager;
 import io.ebean.plugin.Property;
 import io.ebean.text.json.JsonContext;
 
-import jakarta.persistence.OptimisticLockException;
-import jakarta.persistence.PersistenceException;
+import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -266,6 +266,49 @@ public final class DB {
     getDefault().register(transactionCallback);
   }
 
+  /**
+   * Commit the current transaction.
+   */
+  public static void commitTransaction() {
+    getDefault().commitTransaction();
+  }
+
+  /**
+   * Rollback the current transaction.
+   */
+  public static void rollbackTransaction() {
+    getDefault().rollbackTransaction();
+  }
+
+  /**
+   * If the current transaction has already been committed do nothing otherwise
+   * rollback the transaction.
+   * <p>
+   * It is preferable to use <em>try with resources</em> rather than this.
+   * <p>
+   * Useful to put in a finally block to ensure the transaction is ended, rather
+   * than a rollbackTransaction() in each catch block.
+   * <p>
+   * Code example:
+   *
+   * <pre>{@code
+   *   DB.beginTransaction();
+   *   try {
+   *     // do some fetching and or persisting
+   *
+   *     // commit at the end
+   *     DB.commitTransaction();
+   *
+   *   } finally {
+   *     // if commit didn't occur then rollback the transaction
+   *     DB.endTransaction();
+   *   }
+   * }</pre>
+   */
+  public static void endTransaction() {
+    getDefault().endTransaction();
+  }
+
   /**
    * Mark the current transaction as rollback only.
    */

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

@@ -1,104 +0,0 @@
-package io.ebean;
-
-final class DInsertOptionsBuilder implements InsertOptions.Builder {
-
-  private Boolean getGeneratedKeys;
-  private boolean onConflictUpdate;
-  private boolean onConflictNothing;
-  private String constraint;
-  private String uniqueColumns;
-  private String updateSet;
-
-  @Override
-  public InsertOptions.Builder onConflictNothing() {
-    this.onConflictNothing = true;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder onConflictUpdate() {
-    this.onConflictUpdate = true;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder constraint(String constraint) {
-    this.constraint = constraint;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder uniqueColumns(String uniqueColumns) {
-    this.uniqueColumns = uniqueColumns;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder updateSet(String updateSet) {
-    this.updateSet = updateSet;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder getGeneratedKeys(boolean getGeneratedKeys) {
-    this.getGeneratedKeys = getGeneratedKeys;
-    return this;
-  }
-
-  @Override
-  public InsertOptions build() {
-    return new Options(constraint, uniqueColumns, updateSet, onConflictUpdate, onConflictNothing, getGeneratedKeys);
-  }
-
-  static final class Options implements InsertOptions {
-
-    private static final String UPDATE = "U";
-    private static final String NOTHING = "N";
-    private static final String NORMAL = "_";
-    private final String key;
-    private final Boolean getGeneratedKeys;
-    private final String constraint;
-    private final String uniqueColumns;
-    private final String updateSet;
-
-    Options(String constraint, String uniqueColumns, String updateSet, boolean onConflictUpdate, boolean onConflictNothing, Boolean getGeneratedKeys) {
-      this.constraint = constraint;
-      this.uniqueColumns = uniqueColumns;
-      this.updateSet = updateSet;
-      this.getGeneratedKeys = getGeneratedKeys;
-      this.key = (onConflictUpdate ? UPDATE : onConflictNothing ? NOTHING : NORMAL)
-        + '+' + plus(constraint)
-        + '+' + plus(uniqueColumns)
-        + '+' + plus(updateSet);
-    }
-
-    private String plus(String val) {
-      return val == null ? "" : val;
-    }
-
-    @Override
-    public String key() {
-      return key;
-    }
-
-    @Override
-    public String constraint() {
-      return constraint;
-    }
-
-    @Override
-    public String uniqueColumns() {
-      return uniqueColumns;
-    }
-
-    @Override
-    public String updateSet() {
-      return updateSet;
-    }
-
-    @Override
-    public Boolean getGetGeneratedKeys() {
-      return getGeneratedKeys;
-    }
-  }
-}

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

@@ -1,9 +1,9 @@
 package io.ebean;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 
 /**
- * Thrown when a foreign key constraint is enforced or a field is too large.
+ * Thrown when a foreign key constraint is enforced.
  */
 public class DataIntegrityException extends PersistenceException {
   private static final long serialVersionUID = -6740171949170180970L;
@@ -14,11 +14,4 @@ public class DataIntegrityException extends PersistenceException {
   public DataIntegrityException(String message, Throwable cause) {
     super(message, cause);
   }
-
-  /**
-   * Create with message only.
-   */
-  public DataIntegrityException(String message) {
-    super(message);
-  }
 }

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

@@ -11,8 +11,8 @@ import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
 import io.ebean.text.json.JsonContext;
 
-import jakarta.persistence.OptimisticLockException;
-import jakarta.persistence.PersistenceException;
+import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.util.Collection;
 import java.util.List;
@@ -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.
    */
@@ -666,6 +649,43 @@ public interface Database {
    */
   void flush();
 
+  /**
+   * Commit the current transaction.
+   */
+  void commitTransaction();
+
+  /**
+   * Rollback the current transaction.
+   */
+  void rollbackTransaction();
+
+  /**
+   * If the current transaction has already been committed do nothing otherwise
+   * rollback the transaction.
+   * <p>
+   * Useful to put in a finally block to ensure the transaction is ended, rather
+   * than a rollbackTransaction() in each catch block.
+   * <p>
+   * Code example:
+   * <p>
+   * <pre>{@code
+   *
+   *   database.beginTransaction();
+   *   try {
+   *     // do some fetching and or persisting ...
+   *
+   *     // commit at the end
+   *     database.commitTransaction();
+   *
+   *   } finally {
+   *     // if commit didn't occur then rollback the transaction
+   *     database.endTransaction();
+   *   }
+   *
+   * }</pre>
+   */
+  void endTransaction();
+
   /**
    * Refresh the values of a bean.
    * <p>
@@ -1184,53 +1204,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 javax.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/DbContext.java

@@ -3,7 +3,7 @@ package io.ebean;
 import io.ebean.config.BeanNotEnhancedException;
 import io.ebean.datasource.DataSourceConfigurationException;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;

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

@@ -4,7 +4,7 @@ import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;
 import io.ebean.search.*;
 
-import jakarta.persistence.NonUniqueResultException;
+import javax.persistence.NonUniqueResultException;
 import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.*;
@@ -54,9 +54,9 @@ 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)
+  @Deprecated(since = "13.19")
   default ExpressionList<T> order(String orderByClause) {
     return orderBy(orderByClause);
   }
@@ -72,9 +72,9 @@ public interface ExpressionList<T> {
   ExpressionList<T> orderBy(String orderBy);
 
   /**
-   * @deprecated migrate to {@link #orderBy()}.
+   * Deprecated migrate to orderBy().
    */
-  @Deprecated(forRemoval = true)
+  @Deprecated
   default OrderBy<T> order() {
     return orderBy();
   }
@@ -508,7 +508,7 @@ public interface ExpressionList<T> {
   ExpressionList<T> filterMany(String manyProperty);
 
   /**
-   * @deprecated for removal - migrate to {@link #filterManyRaw(String, String, Object...)}.
+   * Deprecated for removal - migrate to filterManyRaw()
    * <p>
    * Add filter expressions to the many property.
    *

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

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 import java.util.List;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;

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

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 
 /**
  * Captures and wraps IOException's occurring during ElasticSearch processing etc.

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

@@ -3,7 +3,7 @@ package io.ebean;
 import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;
 
-import jakarta.persistence.NonUniqueResultException;
+import javax.persistence.NonUniqueResultException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.Timestamp;
@@ -702,9 +702,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();
@@ -970,25 +970,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.
    */
@@ -1415,9 +1396,9 @@ 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)
+  @Deprecated(since = "13.19")
   default Query<T> order(String orderByClause) {
     return orderBy(orderByClause);
   }
@@ -1434,9 +1415,9 @@ public interface Query<T> extends CancelableQuery {
   OrderBy<T> orderBy();
 
   /**
-   * @deprecated migrate to {@link #orderBy()}.
+   * Deprecated migrate to orderBy().
    */
-  @Deprecated(since = "13.19", forRemoval = true)
+  @Deprecated(since = "13.19")
   default OrderBy<T> order() {
     return orderBy();
   }
@@ -1447,9 +1428,9 @@ 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)
+  @Deprecated(since = "13.19")
   default Query<T> setOrder(OrderBy<T> orderBy) {
     return setOrderBy(orderBy);
   }
@@ -1601,14 +1582,6 @@ public interface Query<T> extends CancelableQuery {
    */
   Query<T> setLabel(String label);
 
-  /**
-   * Set a SQL query hint.
-   * <p>
-   * This results in an inline comment that immediately follows
-   * after the select keyword in the form: {@code /*+ hint *\/ }
-   */
-  Query<T> setHint(String hint);
-
   /**
    * Set to true if this query should execute against the doc store.
    * <p>

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

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import jakarta.persistence.OptimisticLockException;
+import javax.persistence.OptimisticLockException;
 
 /**
  * Thrown at SERIALIZABLE isolation level for non-recoverable concurrent conflict.

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

@@ -9,6 +9,7 @@ import java.util.Collection;
  * <p>
  * This is currently deemed to be experimental and subject to change.
  */
+@Deprecated(since = "experimental")
 public final class StdOperators {
 
   // ---- Functions ---- //

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

@@ -5,7 +5,7 @@ import io.ebean.annotation.PersistBatch;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.DocStoreConfig;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 import java.sql.Connection;
 
 /**

ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java

@@ -4,8 +4,8 @@ import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.ValuePair;
 
-import jakarta.persistence.EntityNotFoundException;
-import jakarta.persistence.PersistenceException;
+import javax.persistence.EntityNotFoundException;
+import javax.persistence.PersistenceException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;

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/common/BeanSet.java

@@ -119,7 +119,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
     try {
       if (set == null) {
         if (!disableLazyLoad && modifyListening) {
-          lazyLoadCollection(false);
+          lazyLoadCollection(true);
         } else {
           set = new LinkedHashSet<>();
         }
@@ -136,7 +136,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
         if (disableLazyLoad) {
           set = new LinkedHashSet<>();
         } else {
-          lazyLoadCollection(false);
+          lazyLoadCollection(true);
         }
       }
     } finally {

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

@@ -3,9 +3,9 @@ package io.ebean.config;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.util.AnnotationUtil;
 
-import jakarta.persistence.DiscriminatorValue;
-import jakarta.persistence.Inheritance;
-import jakarta.persistence.Table;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Inheritance;
+import javax.persistence.Table;
 
 import static io.ebean.util.StringHelper.isNull;
 

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

@@ -1,7 +1,5 @@
 package io.ebean.config;
 
-import io.ebean.DatabaseBuilder;
-
 /**
  * Used to provide some automatic configuration early in the creation of a Database.
  */
@@ -10,11 +8,11 @@ public interface AutoConfigure {
   /**
    * Perform configuration for the DatabaseConfig prior to properties load.
    */
-  void preConfigure(DatabaseBuilder config);
+  void preConfigure(DatabaseConfig config);
 
   /**
    * Provide some configuration the DatabaseConfig prior to server creation but after properties have been applied.
    */
-  void postConfigure(DatabaseBuilder config);
+  void postConfigure(DatabaseConfig config);
 
 }

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

@@ -15,6 +15,7 @@ public class ContainerConfig {
   private String namespace;
   private String podName;
   private int port;
+
   private Properties properties;
 
   /**
@@ -122,4 +123,5 @@ public class ContainerConfig {
   protected boolean getProperty(Properties properties, String key, boolean defaultValue) {
     return "true".equalsIgnoreCase(properties.getProperty(key, Boolean.toString(defaultValue)));
   }
+
 }

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

@@ -1,7 +1,5 @@
 package io.ebean.config;
 
-import io.ebean.DatabaseBuilder;
-
 /**
  * Provides a ServiceLoader based mechanism to configure a DatabaseConfig.
  * <p>
@@ -37,5 +35,5 @@ public interface DatabaseConfigProvider {
    * Typically we explicitly register entity bean classes and thus avoid classpath scanning.
    * </p>
    */
-  void apply(DatabaseBuilder config);
+  void apply(DatabaseConfig config);
 }

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

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

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

@@ -1,7 +1,7 @@
 package io.ebean.config;
 
 /**
- * Matches the functionality of jakarta.persistence.AttributeConverter
+ * Matches the functionality of javax.persistence.AttributeConverter
  * <p>
  * In general AttributeConverter should be used in preference to this
  * ScalarTypeConverter as it is JPA standard and offers the same functionality.

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

@@ -9,7 +9,7 @@ import io.ebean.config.CustomDbTypeMapping;
 import io.ebean.config.PlatformConfig;
 import io.ebean.util.JdbcClose;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.*;
 
@@ -769,15 +769,4 @@ public class DatabasePlatform {
   public boolean supportsNativeJavaTime() {
     return supportsNativeJavaTime;
   }
-
-  public String inlineSqlComment(String label) {
-    if (label == null) {
-      return "";
-    }
-    return "/* " + label + " */ ";
-  }
-
-  public String inlineSqlHint(String hint) {
-    return "/*+ " + hint + " */ ";
-  }
 }

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

@@ -5,7 +5,7 @@ import io.ebean.BackgroundExecutor;
 import io.ebean.Transaction;
 import io.ebean.util.JdbcClose;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.PreparedStatement;

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

@@ -3,7 +3,7 @@ package io.ebean.config.dbplatform;
 import io.ebean.Transaction;
 import io.ebean.util.JdbcClose;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.PreparedStatement;

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

@@ -5,7 +5,7 @@ import io.ebean.DataIntegrityException;
 import io.ebean.DuplicateKeyException;
 import io.ebean.SerializableConflictException;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.Collections;
 import java.util.Map;

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

@@ -1,6 +1,6 @@
 package io.ebean.config.dbplatform;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 import java.sql.SQLException;
 
 /**

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

@@ -1,11 +1,8 @@
 package io.ebean.event;
 
-import jakarta.servlet.ServletContextEvent;
+import javax.servlet.ServletContextEvent;
 
 /**
- * Deprecated for removal - no intention to replace. Create your own copy of this
- * ServletContextListener if needed for your application.
- * <p>
  * Listens for webserver server starting and stopping events.
  * <p>
  * This should be used when the deployment is into a servlet container where the webapp
@@ -18,8 +15,7 @@ import jakarta.servlet.ServletContextEvent;
  * hook that Ebean registers.
  * </p>
  */
-@Deprecated(forRemoval = true)
-public class ServletContextListener implements jakarta.servlet.ServletContextListener {
+public class ServletContextListener implements javax.servlet.ServletContextListener {
 
   /**
    * The servlet container is stopping.

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

@@ -187,22 +187,11 @@ final class MetricsAsJson implements ServerMetricsAsJson {
     }
     if (isIncludeDetail(metric)) {
       append("loc", metric.location());
-      append("sql", escape(metric.sql()));
+      append("sql", metric.sql());
     }
     metricEnd();
   }
 
-  static String escape(String sql) {
-    return sql == null ? null : sql
-      .replace("\\", "\\\\")
-      .replace("\"", "\\\"")
-      .replace("\b", "\\b")
-      .replace("\f", "\\f")
-      .replace("\n", "\\n")
-      .replace("\r", "\\r")
-      .replace("\t", "\\t");
-  }
-
   private boolean isIncludeDetail(MetaTimedMetric metric) {
     return includeExtraAttributes == 2 || includeExtraAttributes == 1 && metric.initialCollection();
   }

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

@@ -3,7 +3,7 @@ package io.ebean.plugin;
 import io.ebean.Database;
 import io.ebean.bean.BeanLoader;
 import io.ebean.bean.EntityBeanIntercept;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 
 import java.util.List;
@@ -16,7 +16,7 @@ public interface SpiServer extends Database {
   /**
    * Return the DatabaseConfig.
    */
-  DatabaseBuilder.Settings config();
+  DatabaseConfig config();
 
   /**
    * Return the DatabasePlatform for this database.

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

@@ -1,7 +1,7 @@
 package io.ebean.service;
 
 import io.ebean.Database;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 
 /**
  * Creates the Database implementations. This is used internally by the EbeanServerFactory and is not currently
@@ -14,7 +14,7 @@ public interface SpiContainer {
    *
    * @param configuration The configuration information for this database.
    */
-  Database createServer(DatabaseBuilder configuration);
+  Database createServer(DatabaseConfig configuration);
 
   /**
    * Create an EbeanServer just using the name.

ebean-api/src/main/java/io/ebean/stylesheet.css

@@ -0,0 +1,91 @@
+/* Javadoc style sheet */
+
+/* Define colors, fonts and other style attributes here to override the defaults */
+
+/* Page background color */
+body {
+  background-color: #FFFFFF;
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 10pt;
+}
+
+pre.code {
+  padding: 1em;
+  margin-left: 2em;
+  border: 1px solid #ccc;
+  background-color: #eee;
+}
+
+/* Headings */
+h1 {
+  font-size: 14pt
+}
+
+#overviewexamples h3 {
+  font-size: 10pt
+}
+
+/* Table colors */
+.TableHeadingColor {
+  background: #CCCCFF
+}
+
+/* Dark mauve */
+.TableSubHeadingColor {
+  background: #EEEEFF
+}
+
+/* Light mauve */
+.TableRowColor {
+  background: #FFFFFF
+}
+
+/* White */
+
+/* Font used in left-hand frame lists */
+.FrameTitleFont {
+  font-size: 12pt;
+  font-family: Helvetica, Arial, sans-serif
+}
+
+.FrameHeadingFont {
+  font-size: 10pt;
+  font-family: Helvetica, Arial, sans-serif
+}
+
+.FrameItemFont {
+  font-size: 10pt;
+  font-family: Helvetica, Arial, sans-serif
+}
+
+/* Navigation bar fonts and colors */
+.NavBarCell1 {
+  background-color: #EEEEFF;
+}
+
+/* Light mauve */
+.NavBarCell1Rev {
+  background-color: #00008B;
+}
+
+/* Dark Blue */
+.NavBarFont1 {
+  font-family: Arial, Helvetica, sans-serif;
+  color: #000000;
+}
+
+.NavBarFont1Rev {
+  font-family: Arial, Helvetica, sans-serif;
+  color: #FFFFFF;
+}
+
+.NavBarCell2 {
+  font-family: Arial, Helvetica, sans-serif;
+  background-color: #FFFFFF;
+}
+
+.NavBarCell3 {
+  font-family: Arial, Helvetica, sans-serif;
+  background-color: #FFFFFF;
+}
+

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

@@ -22,8 +22,6 @@ public class JsonWriteOptions {
 
   protected JsonConfig.Include include;
 
-  protected boolean includeLoadedImplicit = true;
-
   protected Map<String, JsonWriteBeanVisitor<?>> visitorMap;
 
   /**
@@ -75,20 +73,6 @@ public class JsonWriteOptions {
     this.include = include;
   }
 
-  /**
-   * Should loaded properties be included implicit, if no other fetch path is specified (default = true).
-   */
-  public boolean isIncludeLoadedImplicit() {
-    return includeLoadedImplicit;
-  }
-
-  /**
-   * Set include loaded properties implicit (default = true).
-   */
-  public void setIncludeLoadedImplicit(boolean includeLoadedImplicit) {
-    this.includeLoadedImplicit = includeLoadedImplicit;
-  }
-
   /**
    * Register a JsonWriteBeanVisitor for the root level.
    */

ebean-api/src/main/java/module-info.java

@@ -12,7 +12,7 @@ module io.ebean.api {
   requires transitive java.sql;
   requires transitive io.avaje.config;
   requires transitive io.avaje.lang;
-  requires transitive jakarta.persistence.api;
+  requires transitive persistence.api;
   requires transitive io.ebean.annotation;
   requires transitive io.ebean.datasource.api;
   requires transitive io.avaje.applog;
@@ -21,7 +21,7 @@ module io.ebean.api {
   requires static io.ebean.types;
   requires static com.fasterxml.jackson.core;
   requires static com.fasterxml.jackson.databind;
-  requires static jakarta.servlet;
+  requires static javax.servlet.api;
 
   exports io.ebean;
   exports io.ebean.bean;

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

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

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

@@ -1,7 +1,6 @@
 package io.ebean.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.ebean.DatabaseBuilder;
 import io.ebean.annotation.MutationDetection;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.config.dbplatform.IdType;
@@ -18,7 +17,7 @@ class DatabaseConfigTest {
 
   @Test
   void testLoadFromEbeanProperties() {
-    var config = new DatabaseConfig().settings();
+    DatabaseConfig config = new DatabaseConfig();
     config.loadFromProperties();
 
     assertEquals(PersistBatch.NONE, config.getPersistBatch());
@@ -33,7 +32,7 @@ class DatabaseConfigTest {
     Properties props = new Properties();
     props.setProperty("ddl.initSql", "${user.home}" + fileSeparator + "initSql");
 
-    var config = new DatabaseConfig().settings();
+    DatabaseConfig config = new DatabaseConfig();
     config.loadFromProperties(props);
 
     String ddlInitSql = config.getDdlInitSql();
@@ -42,7 +41,7 @@ class DatabaseConfigTest {
 
   @Test
   void testLoadWithProperties() {
-    DatabaseBuilder config = new DatabaseConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setPersistBatch(PersistBatch.NONE);
     config.setPersistBatchOnCascade(PersistBatch.NONE);
     config.setAutoReadOnlyDataSource(false);
@@ -74,9 +73,6 @@ class DatabaseConfigTest {
     props.setProperty("forUpdateNoKey", "true");
     props.setProperty("defaultServer", "false");
     props.setProperty("skipDataSourceCheck", "true");
-    props.setProperty("readOnlyDatabase", "true");
-    props.setProperty("lengthCheck", "ON");
-    props.setProperty("includeLabelInSql", "true");
 
     props.setProperty("queryPlan.enable", "true");
     props.setProperty("queryPlan.thresholdMicros", "10000");
@@ -87,56 +83,49 @@ class DatabaseConfigTest {
 
     config.loadFromProperties(props);
 
-    var settings = config.settings();
-    assertFalse(settings.isDefaultServer());
-    assertTrue(settings.isDisableL2Cache());
-    assertTrue(settings.isNotifyL2CacheInForeground());
-    assertTrue(settings.isDbOffline());
-    assertTrue(settings.isAutoReadOnlyDataSource());
-    assertTrue(settings.isAutoLoadModuleInfo());
-    assertTrue(settings.isLoadModuleInfo());
-    assertTrue(settings.skipDataSourceCheck());
-    assertTrue(settings.readOnlyDatabase());
-    assertTrue(settings.isIncludeLabelInSql());
-    assertThat(settings.getLengthCheck()).isEqualTo(LengthCheck.ON);
+    assertFalse(config.isDefaultServer());
+    assertTrue(config.isDisableL2Cache());
+    assertTrue(config.isNotifyL2CacheInForeground());
+    assertTrue(config.isDbOffline());
+    assertTrue(config.isAutoReadOnlyDataSource());
+    assertTrue(config.isAutoLoadModuleInfo());
+    assertTrue(config.isLoadModuleInfo());
+    assertTrue(config.skipDataSourceCheck());
 
-    assertTrue(settings.isIdGeneratorAutomatic());
-    assertFalse(settings.getPlatformConfig().isCaseSensitiveCollation());
-    assertTrue(settings.getPlatformConfig().isForUpdateNoKey());
+    assertTrue(config.isIdGeneratorAutomatic());
+    assertFalse(config.getPlatformConfig().isCaseSensitiveCollation());
+    assertTrue(config.getPlatformConfig().isForUpdateNoKey());
 
-    assertThat(settings.getNamingConvention()).isInstanceOf(MatchingNamingConvention.class);
+    assertThat(config.getNamingConvention()).isInstanceOf(MatchingNamingConvention.class);
 
-    assertEquals(MutationDetection.NONE, settings.getJsonMutationDetection());
+    assertEquals(MutationDetection.NONE, config.getJsonMutationDetection());
     config.setJsonMutationDetection(MutationDetection.SOURCE);
-    assertEquals(MutationDetection.SOURCE, settings.getJsonMutationDetection());
-    assertEquals(IdType.SEQUENCE, settings.getIdType());
-    assertEquals(PersistBatch.ALL, settings.getPersistBatch());
-    assertEquals(PersistBatch.ALL, settings.getPersistBatchOnCascade());
-    Assertions.assertEquals(PlatformConfig.DbUuid.BINARY, settings.getPlatformConfig().getDbUuid());
-    Assertions.assertEquals(JsonConfig.DateTime.MILLIS, settings.getJsonDateTime());
-    assertEquals(JsonConfig.Date.MILLIS, settings.getJsonDate());
+    assertEquals(MutationDetection.SOURCE, config.getJsonMutationDetection());
+    assertEquals(IdType.SEQUENCE, config.getIdType());
+    assertEquals(PersistBatch.ALL, config.getPersistBatch());
+    assertEquals(PersistBatch.ALL, config.getPersistBatchOnCascade());
+    Assertions.assertEquals(PlatformConfig.DbUuid.BINARY, config.getPlatformConfig().getDbUuid());
+    Assertions.assertEquals(JsonConfig.DateTime.MILLIS, config.getJsonDateTime());
+    assertEquals(JsonConfig.Date.MILLIS, config.getJsonDate());
 
-    assertEquals("r0,users,orgs", settings.getEnabledL2Regions());
+    assertEquals("r0,users,orgs", config.getEnabledL2Regions());
 
-    assertEquals(42, settings.getJdbcFetchSizeFindEach());
-    assertEquals(43, settings.getJdbcFetchSizeFindList());
-    assertEquals(4, settings.getBackgroundExecutorSchedulePoolSize());
-    assertEquals(98, settings.getBackgroundExecutorShutdownSecs());
+    assertEquals(42, config.getJdbcFetchSizeFindEach());
+    assertEquals(43, config.getJdbcFetchSizeFindList());
+    assertEquals(4, config.getBackgroundExecutorSchedulePoolSize());
+    assertEquals(98, config.getBackgroundExecutorShutdownSecs());
 
-    assertTrue(settings.isQueryPlanEnable());
-    assertEquals(10000, settings.getQueryPlanThresholdMicros());
-    assertTrue(settings.isQueryPlanCapture());
-    assertEquals(42, settings.getQueryPlanCapturePeriodSecs());
-    assertEquals(560, settings.getQueryPlanCaptureMaxTimeMillis());
-    assertEquals(7, settings.getQueryPlanCaptureMaxCount());
+    assertTrue(config.isQueryPlanEnable());
+    assertEquals(10000, config.getQueryPlanThresholdMicros());
+    assertTrue(config.isQueryPlanCapture());
+    assertEquals(42, config.getQueryPlanCapturePeriodSecs());
+    assertEquals(560, config.getQueryPlanCaptureMaxTimeMillis());
+    assertEquals(7, config.getQueryPlanCaptureMaxCount());
 
-    assertThat(settings.getMappingLocations()).containsExactly("classpath:/foo","bar");
-
-    config.persistBatch(PersistBatch.NONE)
-      .persistBatchOnCascade(PersistBatch.NONE)
-      .lengthCheck(LengthCheck.ON)
-      .lengthCheck(LengthCheck.UTF8);
+    assertThat(config.getMappingLocations()).containsExactly("classpath:/foo","bar");
 
+    config.setPersistBatch(PersistBatch.NONE);
+    config.setPersistBatchOnCascade(PersistBatch.NONE);
 
     Properties props1 = new Properties();
     props1.setProperty("ebean.persistBatch", "ALL");
@@ -148,20 +137,19 @@ class DatabaseConfigTest {
     props1.setProperty("ebean.notifyL2CacheInForeground", "false");
 
     config.loadFromProperties(props1);
-    assertFalse(settings.isDisableL2Cache());
-    assertFalse(settings.isNotifyL2CacheInForeground());
+    assertFalse(config.isDisableL2Cache());
+    assertFalse(config.isNotifyL2CacheInForeground());
 
-    assertEquals(PersistBatch.ALL, settings.getPersistBatch());
-    assertEquals(PersistBatch.ALL, settings.getPersistBatchOnCascade());
-    assertEquals(LengthCheck.UTF8, settings.getLengthCheck());
+    assertEquals(PersistBatch.ALL, config.getPersistBatch());
+    assertEquals(PersistBatch.ALL, config.getPersistBatchOnCascade());
 
     config.setEnabledL2Regions("r0,orgs");
-    assertEquals("r0,orgs", settings.getEnabledL2Regions());
+    assertEquals("r0,orgs", config.getEnabledL2Regions());
   }
 
   @Test
   void test_defaults() {
-    DatabaseBuilder.Settings config = new DatabaseConfig().settings();
+    DatabaseConfig config = new DatabaseConfig();
     assertTrue(config.isIdGeneratorAutomatic());
     assertTrue(config.isDefaultServer());
     assertFalse(config.isAutoPersistUpdates());
@@ -182,8 +170,6 @@ class DatabaseConfigTest {
     assertEquals(600, config.getQueryPlanCapturePeriodSecs());
     assertEquals(10000L, config.getQueryPlanCaptureMaxTimeMillis());
     assertEquals(10, config.getQueryPlanCaptureMaxCount());
-    assertThat(config.getLengthCheck()).isEqualTo(LengthCheck.OFF);
-    assertFalse(config.isIncludeLabelInSql());
 
     config.setLoadModuleInfo(false);
     assertFalse(config.isAutoLoadModuleInfo());
@@ -198,7 +184,7 @@ class DatabaseConfigTest {
   void test_putServiceObject() {
     ObjectMapper objectMapper = new ObjectMapper();
 
-    var config = new DatabaseConfig().settings();
+    DatabaseConfig config = new DatabaseConfig();
     config.putServiceObject(objectMapper);
 
     ObjectMapper mapper0 = config.getServiceObject(ObjectMapper.class);

ebean-api/src/test/java/io/ebean/meta/MetricsAsJsonTest.java

@@ -1,25 +0,0 @@
-package io.ebean.meta;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class MetricsAsJsonTest {
-
-  @Test
-  void trimIt() {
-    assertThat(MetricsAsJson.escape(null)).isNull();
-    assertThat(MetricsAsJson.escape("abc")).isEqualTo("abc");
-  }
-
-  @Test
-  void escape() {
-    assertThat(MetricsAsJson.escape("a\"bc")).isEqualTo("a\\\"bc");
-    assertThat(MetricsAsJson.escape("a\tbc")).isEqualTo("a\\tbc");
-    assertThat(MetricsAsJson.escape("a\bbc")).isEqualTo("a\\bbc");
-    assertThat(MetricsAsJson.escape("a\bc")).isEqualTo("a\\bc");
-    assertThat(MetricsAsJson.escape("a\rbc")).isEqualTo("a\\rbc");
-    assertThat(MetricsAsJson.escape("a\nbc")).isEqualTo("a\\nbc");
-    assertThat(MetricsAsJson.escape("a\\bc")).isEqualTo("a\\\\bc");
-  }
-}

ebean-bom/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -20,7 +20,7 @@
 
       <dependency>
         <groupId>io.ebean</groupId>
-        <artifactId>jakarta-persistence-api</artifactId>
+        <artifactId>persistence-api</artifactId>
         <version>${ebean-persistence-api.version}</version>
       </dependency>
 
@@ -89,103 +89,112 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>14.0.0</version>
+        <version>13.18.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-jsonnode</artifactId>
-        <version>14.0.0</version>
+        <version>13.18.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-mapper</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>14.0.0</version>
+        <version>13.18.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>14.0.0</version>
+        <version>13.18.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>14.0.0</version>
+        <version>13.18.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
+        <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
+        <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-postgis</artifactId>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-spring-txn</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <!-- platforms -->
@@ -193,79 +202,67 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-clickhouse</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-db2</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-h2</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-hana</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mariadb</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mysql</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-nuodb</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-oracle</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgres</artifactId>
-        <version>14.0.2</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-postgis</artifactId>
-        <version>14.0.2</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-postgis-types</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlite</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlserver</artifactId>
-        <version>14.0.2</version>
+        <version>13.21.1-SNAPSHOT</version>
       </dependency>
 
     </dependencies>

ebean-core-type/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -30,10 +30,17 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.7.2</version>
+      <version>42.4.3</version>
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
 </project>

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

@@ -174,9 +174,4 @@ public interface DataBinder {
    */
   String popJson();
 
-  /**
-   * Returns the last bound object (e.g. for BindValidation). Note for InputStreams you'll get an InputStreamInfo.
-   */
-  Object popLastObject();
-
 }

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

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

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

@@ -1,27 +0,0 @@
-package io.ebean.core.type;
-
-import java.io.InputStream;
-
-/**
- * Helper to transports length info of DataBind.setBinaryStream(stream, length) to BindValidation
- *
- * @author Roland Praml, FOCONIS AG
- */
-public final class InputStreamInfo {
-
-  private final InputStream stream;
-  private final long length;
-
-  public InputStreamInfo(InputStream stream, long length) {
-    this.stream = stream;
-    this.length = length;
-  }
-
-  public InputStream stream() {
-    return stream;
-  }
-
-  public long length() {
-    return length;
-  }
-}

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

@@ -1,7 +1,7 @@
 package io.ebean.core.type;
 
 import io.avaje.lang.Nullable;
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 
 /**
  * Factory to create ScalarTypeSet.
@@ -12,6 +12,6 @@ public interface ScalarTypeSetFactory {
    * Create the ScalarTypeSet given the config and optional objectMapper.
    */
   @Nullable
-  ScalarTypeSet<?> createTypeSet(DatabaseBuilder.Settings config, @Nullable Object objectMapper);
+  ScalarTypeSet<?> createTypeSet(DatabaseConfig config, @Nullable Object objectMapper);
 
 }

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>13.21.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -46,19 +46,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>14.0.0</version>
+      <version>13.18.0</version>
     </dependency>
 
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr4-runtime</artifactId>
-      <version>4.13.1</version>
+      <version>4.8-1</version>
     </dependency>
 
     <!--
@@ -81,15 +81,15 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- JAVAX-DEPENDENCY-START ___
+    <!-- JAVAX-DEPENDENCY-START -->
     <dependency>
       <groupId>javax.transaction</groupId>
       <artifactId>javax.transaction-api</artifactId>
       <version>1.3</version>
       <optional>true</optional>
     </dependency>
-    ____ JAVAX-DEPENDENCY-END -->
-    <!-- JAKARTA-DEPENDENCY-START -->
+    <!-- JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START ___
     <dependency>
       <groupId>jakarta.transaction</groupId>
       <artifactId>jakarta.transaction-api</artifactId>
@@ -102,7 +102,7 @@
       <version>4.0.1</version>
       <scope>provided</scope>
     </dependency>
-    <!-- JAKARTA-DEPENDENCY-END -->
+    ____ JAKARTA-DEPENDENCY-END -->
 
     <!-- validation annotations Size etc -->
     <dependency>
@@ -151,7 +151,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.7.2</version>
+      <version>42.5.1</version>
       <optional>true</optional>
     </dependency>
 
@@ -159,21 +159,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.2</version>
+      <version>13.21.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -184,6 +184,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;
 
-import io.ebean.DatabaseBuilder;
+import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.server.type.GeoTypeBinder;
 
 /**
@@ -11,5 +11,5 @@ public interface GeoTypeProvider {
   /**
    * Create a binder for binding geometry types.
    */
-  GeoTypeBinder createBinder(DatabaseBuilder.Settings config);
+  GeoTypeBinder createBinder(DatabaseConfig config);
 }

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

@@ -111,7 +111,7 @@ public final class LoadBeanRequest extends LoadRequest {
   }
 
   private String mode() {
-    return lazy ? "lazy" : loadBuffer.isCache() ? "cache" : "query";
+    return lazy ? "+lazy" : loadBuffer.isCache() ? "+cache" : "+query";
   }
 
   /**

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

@@ -3,7 +3,6 @@ package io.ebeaninternal.api;
 import io.ebean.CacheMode;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
-import io.ebean.bean.PersistenceContext;
 import io.ebeaninternal.server.core.BindPadding;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -58,22 +57,17 @@ public final class LoadManyRequest extends LoadRequest {
     return loadContext.fullPath();
   }
 
-  private List<Object> parentIdList(SpiEbeanServer server, BeanPropertyAssocMany<?> many, PersistenceContext pc) {
-    final var idList = new ArrayList<>(loadContext.size());
-    final var descriptor = many.descriptor();
+  private List<Object> parentIdList(SpiEbeanServer server) {
+    List<Object> idList = new ArrayList<>();
+    BeanPropertyAssocMany<?> many = many();
     for (int i = 0; i < loadContext.size(); i++) {
-      final BeanCollection<?> bc = loadContext.get(i);
+      BeanCollection<?> bc = loadContext.get(i);
       if (bc != null) {
-        final var parent = bc.owner();
-        final var parentId = descriptor.getId(parent);
-        idList.add(parentId);
-        bc.setLoader(server); // don't use the load buffer again
-        if (lazy) {
-          descriptor.contextPutIfAbsent(pc, parentId, parent);
-          if (!originIncluded && bc == originCollection) {
-            originIncluded = true;
-          }
+        if (lazy && !originIncluded && bc == originCollection) {
+          originIncluded = true;
         }
+        idList.add(many.parentId(bc.owner()));
+        bc.setLoader(server); // don't use the load buffer again
       }
     }
     if (originCollection != null && !originIncluded) {
@@ -81,7 +75,7 @@ public final class LoadManyRequest extends LoadRequest {
       idList.add(many.parentId(originCollection.owner()));
       originCollection.setLoader(server); // don't use the load buffer again
     }
-    if (descriptor.isPadInExpression()) {
+    if (many.targetDescriptor().isPadInExpression()) {
       BindPadding.padIds(idList);
     }
     return idList;
@@ -105,10 +99,9 @@ public final class LoadManyRequest extends LoadRequest {
       query.where().raw(extraWhere.replace("${ta}", "t0").replace("${mta}", "int_"));
     }
     query.setLazyLoadForParents(many);
-    final var pc = loadContext.persistenceContext();
-    many.addWhereParentIdIn(query, parentIdList(server, many, pc), loadContext.isUseDocStore());
-    query.setPersistenceContext(pc);
-    query.setLoadDescription(lazy ? "lazy" : "query", description());
+    many.addWhereParentIdIn(query, parentIdList(server), loadContext.isUseDocStore());
+    query.setPersistenceContext(loadContext.persistenceContext());
+    query.setLoadDescription(lazy ? "+lazy" : "+query", description());
     if (lazy) {
       query.setLazyLoadBatchSize(loadContext.batchSize());
     } else {
@@ -118,12 +111,7 @@ public final class LoadManyRequest extends LoadRequest {
     loadContext.configureQuery(query);
     if (onlyIds) {
       // lazy loading invoked via clear() and removeAll()
-      String mapKey = many.mapKey();
-      if (mapKey != null) {
-        query.select(mapKey);
-      } else {
-        query.select(many.targetIdProperty());
-      }
+      query.select(many.targetIdProperty());
     }
     return query;
   }

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,7 +2,8 @@ package io.ebeaninternal.api;
 
 import io.ebeaninternal.server.transaction.TransactionScopeManager;
 import io.ebeaninternal.server.util.ArrayStack;
-import jakarta.persistence.PersistenceException;
+
+import javax.persistence.PersistenceException;
 
 /**
  * Manage scoped (typically thread local) transactions.
@@ -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/SpiCancelableQuery.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 
 import io.ebean.CancelableQuery;
 

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

@@ -86,11 +86,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/SpiExpressionRequest.java

@@ -3,14 +3,13 @@ package io.ebeaninternal.api;
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
-import io.ebeaninternal.server.expression.platform.DbExpressionRequest;
 
 import java.util.List;
 
 /**
  * Request object used for gathering expression sql and bind values.
  */
-public interface SpiExpressionRequest extends DbExpressionRequest {
+public interface SpiExpressionRequest {
 
   /**
    * Return the DB specific handler for JSON and ARRAY expressions.
@@ -35,13 +34,11 @@ public interface SpiExpressionRequest extends DbExpressionRequest {
   /**
    * Append to the expression sql without any parsing.
    */
-  @Override
   SpiExpressionRequest append(String expression);
 
   /**
    * Append to the expression sql without any parsing.
    */
-  @Override
   SpiExpressionRequest append(char c);
 
   /**
@@ -50,7 +47,6 @@ public interface SpiExpressionRequest extends DbExpressionRequest {
    * This is a fast path case when expression is a bean property path and falls back to using parse()
    * when that isn't the case.
    */
-  @Override
   SpiExpressionRequest property(String expression);
 
   /**

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;
@@ -226,11 +225,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
    */
   ProfileLocation profileLocation();
 
-  /**
-   * Return the SQL hint to include in the query.
-   */
-  String hint();
-
   /**
    * Return the label set on the query.
    */
@@ -345,7 +339,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.
@@ -659,16 +653,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/api/SpiTransaction.java

@@ -11,7 +11,7 @@ import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.transaction.ProfileStream;
 import io.ebeanservice.docstore.api.DocStoreTransaction;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 import java.sql.Connection;
 import java.sql.SQLException;
 

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

@@ -11,7 +11,7 @@ import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.transaction.ProfileStream;
 import io.ebeanservice.docstore.api.DocStoreTransaction;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 import java.sql.Connection;
 import java.sql.SQLException;
 

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

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

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

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

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

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

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

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

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

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

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

@@ -48,7 +48,7 @@ public abstract class BeanRequest {
    */
   public void commitTransIfRequired() {
     if (createdTransaction) {
-      transaction.commit();
+      server.commitTransaction();
     }
   }
 

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

@@ -7,7 +7,7 @@ import io.ebean.util.IOUtils;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.util.UrlHelper;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 import java.io.*;
 import java.net.URL;
 import java.nio.file.Path;

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

@@ -1,12 +1,12 @@
 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;
 import io.ebeaninternal.api.DbOffline;
 
-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -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

@@ -13,7 +13,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
 
-import jakarta.persistence.EntityNotFoundException;
+import javax.persistence.EntityNotFoundException;
 import java.util.List;
 
 import static java.lang.System.Logger.Level.DEBUG;
@@ -63,8 +63,8 @@ final class DefaultBeanLoader {
     Object parentId = parentDesc.getId(parentBean);
     if (pc == null) {
       pc = new DefaultPersistenceContext();
+      parentDesc.contextPut(pc, parentId, parentBean);
     }
-    parentDesc.contextPutIfAbsent(pc, parentId, parentBean);
     boolean useManyIdCache = beanCollection != null && parentDesc.isManyPropCaching() && many.isUseCache();
     if (useManyIdCache) {
       Boolean readOnly = null;
@@ -82,9 +82,9 @@ final class DefaultBeanLoader {
       // populate a new collection
       BeanCollection<?> emptyCollection = many.createEmpty(parentBean);
       many.setValue(parentBean, emptyCollection);
-      query.setLoadDescription("refresh", null);
+      query.setLoadDescription("+refresh", null);
     } else {
-      query.setLoadDescription("lazy", null);
+      query.setLoadDescription("+lazy", null);
     }
 
     query.select(parentDesc.idBinder().idSelect());

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

@@ -1,7 +1,5 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.Database;
-import io.ebean.DatabaseBuilder;
 import io.ebean.config.*;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.event.ShutdownManager;
@@ -14,13 +12,11 @@ import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.bootup.BootupClassPathSearch;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.executor.DefaultBackgroundExecutor;
-import jakarta.persistence.PersistenceException;
 
+import javax.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);
@@ -93,7 +79,7 @@ public final class DefaultContainer implements SpiContainer {
 
       boolean online = true;
       if (config.isDocStoreOnly()) {
-        config.databasePlatform(new DatabasePlatform());
+        config.setDatabasePlatform(new DatabasePlatform());
       } else {
         TenantMode tenantMode = config.getTenantMode();
         if (TenantMode.DB != tenantMode) {
@@ -129,7 +115,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);
@@ -137,10 +123,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();
       }
     }
@@ -170,7 +158,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);
@@ -188,7 +176,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
@@ -200,16 +188,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()) {
@@ -217,7 +205,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());
   }
@@ -225,7 +213,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 {
@@ -233,7 +221,7 @@ public final class DefaultContainer implements SpiContainer {
     }
   }
 
-  private boolean isOfflineMode(DatabaseBuilder.Settings config) {
+  private boolean isOfflineMode(DatabaseConfig config) {
     return config.isDbOffline() || DbOffline.isSet();
   }
 
@@ -241,11 +229,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

@@ -45,10 +45,10 @@ import io.ebeaninternal.util.ParamTypeHelper;
 import io.ebeaninternal.util.ParamTypeHelper.TypeInfo;
 import io.ebeanservice.docstore.api.DocStoreIntegration;
 
-import jakarta.persistence.EntityNotFoundException;
-import jakarta.persistence.NonUniqueResultException;
-import jakarta.persistence.OptimisticLockException;
-import jakarta.persistence.PersistenceException;
+import javax.persistence.EntityNotFoundException;
+import javax.persistence.NonUniqueResultException;
+import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -76,7 +76,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;
@@ -170,7 +170,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();
@@ -224,7 +224,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public DatabaseBuilder.Settings config() {
+  public DatabaseConfig config() {
     return config;
   }
 
@@ -756,6 +756,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();
@@ -951,7 +961,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
     if (!query.isRawSql()) {
       query.setDefaultRawSqlIfRequired();
-      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();
@@ -1263,7 +1273,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) {
@@ -1282,7 +1291,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public <T> FutureIds<T> findFutureIds(SpiQuery<T> query) {
     SpiQuery<T> copy = query.copy();
-    copy.usingFuture();
     boolean createdTransaction = false;
     SpiTransaction transaction = query.transaction();
     if (transaction == null) {
@@ -1301,7 +1309,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public <T> FutureList<T> findFutureList(SpiQuery<T> query) {
     SpiQuery<T> spiQuery = query.copy();
-    spiQuery.usingFuture();
     // FutureList query always run in it's own persistence content
     spiQuery.setPersistenceContext(new DefaultPersistenceContext());
     if (!spiQuery.isDisableReadAudit()) {
@@ -1644,50 +1651,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,10 +1,13 @@
 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.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;
@@ -69,7 +71,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 DeployInherit deployInherit;
@@ -98,12 +100,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.docStoreFactory = initDocStoreFactory(service(DocStoreFactory.class));
@@ -173,7 +175,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);
   }
@@ -331,7 +333,7 @@ public final class InternalConfiguration {
     return config.getDatabasePlatform();
   }
 
-  public DatabaseBuilder.Settings getConfig() {
+  public DatabaseConfig getConfig() {
     return config;
   }
 
@@ -588,16 +590,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();
     }
   }