#3121 BindMaxLength validation

At deploy time derive a BindMaxLength property to use per BeanProperty
Merge branch 'string-length-validation' of github.com:FOCONIS/ebean into FOCONIS-string-length-validation
2024-04-21 10:51:47 +00:00 · 2023-06-26 21:16:32 +12:00 · 2023-06-23 16:51:34 +12:00 · 2023-06-20 14:47:20 +02:00 · 2023-06-20 13:03:04 +02:00 · 2023-06-19 13:48:00 +02:00
1787 changed files with 8456 additions and 17229 deletions
@@ -1,10 +1,7 @@

 name: Build

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

 jobs:
  build:
@@ -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

@@ -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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -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>
@@ -1,7 +0,0 @@
-package io.ebean.postgis.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -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;
-
-}
@@ -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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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.20.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.20.1-SNAPSHOT</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>13.20.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>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>13.20.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>

@@ -1,6 +1,6 @@
 package io.ebean;

-import jakarta.persistence.PessimisticLockException;
+import javax.persistence.PessimisticLockException;

 /**
 * Thrown when failing to acquire a pessimistic lock.
@@ -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.
   */
@@ -1,49 +0,0 @@
-package io.ebean;
-
-import io.ebean.service.SpiInTuples;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Default implementation of SpiInTuples.
- */
-final class DInTuples implements SpiInTuples {
-
-  private final String[] properties;
-  private final int propertyCount;
-  private final List<Object[]> entries = new ArrayList<>();
-
-
-  DInTuples(String[] properties) {
-    this.properties = properties;
-    this.propertyCount = properties.length;
-  }
-
-  @Override
-  public InTuples add(Object... values) {
-    if (values.length != propertyCount) {
-      throw new IllegalArgumentException("Require " + propertyCount + " values but got " + values.length);
-    }
-    entries.add(values);
-    return this;
-  }
-
-  /**
-   * Return the first property name.
-   */
-  @Override
-  public String[] properties() {
-    return properties;
-  }
-
-  /**
-   * Return all the value pairs.
-   */
-  @Override
-  public List<Object[]> entries() {
-    return Collections.unmodifiableList(entries);
-  }
-
-}
@@ -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;
-    }
-  }
-}
@@ -1,6 +1,6 @@
 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.
@@ -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.
   */
@@ -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);
@@ -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;
@@ -38,15 +38,12 @@ final class DbContext {
        }
      }
    } catch (BeanNotEnhancedException e) {
-      String msg = "Bean is not enhanced? See https://ebean.io/docs/trouble-shooting#not-enhanced";
-      log.log(ERROR, msg, e);
      throw e;

    } catch (DataSourceConfigurationException e) {
      String msg = "Configuration error creating DataSource for the default Database." +
        " This typically means a missing application-test.yaml or missing ebean-test dependency." +
        " See https://ebean.io/docs/trouble-shooting#datasource";
-      log.log(ERROR, msg, e);
      throw new DataSourceConfigurationException(msg, e);

    } catch (Throwable e) {
@@ -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();
    }
@@ -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;
@@ -207,21 +205,4 @@ public interface DtoQuery<T> extends CancelableQuery {
   * Use the explicit transaction to execute the query.
   */
  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
-   * 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
-   * against the master data source.
-   */
-  DtoQuery<T> usingMaster();
 }
@@ -36,11 +36,6 @@ import java.util.Map;
 */
 public interface ExpressionFactory {

-  /**
-   * Return a new ExpressionList.
-   */
-  <T> ExpressionList<T> expressionList();
-
  /**
   * Path exists - for the given path in a JSON document.
   */
@@ -374,11 +369,6 @@ public interface ExpressionFactory {
   */
  Expression inPairs(Pairs pairs);

-  /**
-   * In expression using multiple columns.
-   */
-  Expression inTuples(InTuples pairs);
-
  /**
   * In - property has a value in the array of values.
   */
@@ -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,8 +508,6 @@ public interface ExpressionList<T> {
  ExpressionList<T> filterMany(String manyProperty);

  /**
-   * @deprecated for removal - migrate to {@link #filterManyRaw(String, String, Object...)}.
-   * <p>
   * Add filter expressions to the many property.
   *
   * <pre>{@code
@@ -526,29 +524,8 @@ public interface ExpressionList<T> {
   * @param expressions  Filter expressions with and, or and ? or ?1 type bind parameters
   * @param params       Bind parameters used in the expressions
   */
-  @Deprecated(forRemoval = true)
  ExpressionList<T> filterMany(String manyProperty, String expressions, Object... params);

-  /**
-   * Add filter expressions for the many path. The expressions can include SQL functions if
-   * desired and the property names are translated to column names.
-   * <p>
-   * The expressions can contain placeholders for bind values using <code>?</code> or <code>?1</code> style.
-   *
-   * <pre>{@code
-   *
-   *     new QCustomer()
-   *       .name.startsWith("Postgres")
-   *       .contacts.filterManyRaw("status = ? and firstName like ?", Contact.Status.NEW, "Rob%")
-   *       .findList();
-   *
-   * }</pre>
-   *
-   * @param rawExpressions The raw expressions which can include ? and ?1 style bind parameter placeholders
-   * @param params The parameter values to bind
-   */
-  ExpressionList<T> filterManyRaw(String manyProperty, String rawExpressions, Object... params);
-
  /**
   * Specify specific properties to fetch on the main/root bean (aka partial
   * object).
@@ -1154,11 +1131,6 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> inPairs(Pairs pairs);

-  /**
-   * In expression using multiple columns.
-   */
-  ExpressionList<T> inTuples(InTuples pairs);
-
  /**
   * EXISTS a raw SQL SubQuery.
   *
@@ -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;
@@ -1,36 +0,0 @@
-package io.ebean;
-
-/**
- * IN expression using multiple columns.
- * <p>
- * Currently this is not supported with SQLServer or DB2.
- * <p>
- * Produces SQL expression in the form of (A,B,C) IN ((a0,b0,c0), (a1,b1,c1), ... )
- * where A,B,C are the properties in the tuples.
- */
-public interface InTuples {
-
-  /**
-   * Create given the properties in the tuples.
-   */
-  static InTuples of(String... properties) {
-    return new DInTuples(properties);
-  }
-
-  /**
-   * Create given the properties in the tuples.
-   */
-  static InTuples of(Query.Property<?>... properties) {
-    String[] props = new String[properties.length];
-    for (int i = 0; i < properties.length; i++) {
-      props[i] = properties[i].toString();
-    }
-    return new DInTuples(props);
-  }
-
-  /**
-   * Add a tuple entry. All values must be non-null.
-   */
-  InTuples add(Object... values);
-
-}
@@ -1,119 +0,0 @@
-package io.ebean;
-
-import io.avaje.lang.Nullable;
-
-/**
- * Options to be used with insert such as ON CONFLICT DO UPDATE | NOTHING.
- */
-public interface InsertOptions {
-
-  /**
-   * Use ON CONFLICT UPDATE with automatic determination of the unique columns to conflict on.
-   * <p>
-   * Uses mapping to determine the unique columns - {@code @Column(unique=true)} and {@code @Index(unique=true)} .
-   */
-  InsertOptions ON_CONFLICT_UPDATE = InsertOptions.builder()
-    .onConflictUpdate()
-    .build();
-
-  /**
-   * Use ON CONFLICT DO NOTHING with automatic determination of the unique columns to conflict on.
-   * <p>
-   * Uses mapping to determine the unique columns - {@code @Column(unique=true)} and {@code @Index(unique=true)} .
-   */
-  InsertOptions ON_CONFLICT_NOTHING = InsertOptions.builder()
-    .onConflictNothing()
-    .build();
-
-  /**
-   * Return a builder for InsertOptions.
-   */
-  static Builder builder() {
-    return new DInsertOptionsBuilder();
-  }
-
-  /**
-   * Return the constraint name that is used for ON CONFLICT.
-   */
-  @Nullable
-  String constraint();
-
-  /**
-   * Return the unique columns that is used for ON CONFLICT.
-   * <p>
-   * When not explicitly set will use mapping like {@code @Column(unique=true)} to determine the
-   * non-unique columns.
-   */
-  @Nullable
-  String uniqueColumns();
-
-  /**
-   * Return the ON CONFLICT UPDATE SET clause.
-   * <p>
-   * When not set will use the non-unique columns.
-   */
-  @Nullable
-  String updateSet();
-
-  /**
-   * Return if GetGeneratedKeys should be used to fetch the generated keys after insert.
-   */
-  @Nullable
-  Boolean getGetGeneratedKeys();
-
-  /**
-   * Return the key for these build options.
-   */
-  String key();
-
-  /**
-   * The builder for InsertOptions.
-   */
-  interface Builder {
-
-    /**
-     * Use a ON CONFLICT UPDATE automatically determining the unique columns.
-     */
-    Builder onConflictUpdate();
-
-    /**
-     * Use a ON CONFLICT DO NOTHING automatically determining the unique columns.
-     */
-    Builder onConflictNothing();
-
-    /**
-     * Specify an explicit conflict constraint name.
-     * <p>
-     * When this is used then unique columns will not be used.
-     */
-    Builder constraint(String constraint);
-
-    /**
-     * Specify the unique columns for the conflict target.
-     * <p>
-     * When not specified and constraint is also not specified then
-     * it will automatically determine the unique columns
-     * based on mapping like {@code @Column(unique=true)} and
-     * {@code @Index(unique=true)} .
-     */
-    Builder uniqueColumns(String uniqueColumns);
-
-    /**
-     * Specify the ON CONFLICT DO UPDATE SET clause.
-     * <p>
-     * When not specified ebean will include all the non-unique columns.
-     */
-    Builder updateSet(String updateSet);
-
-    /**
-     * Specify if GetGeneratedKeys should be used to return generated keys.
-     */
-    Builder getGeneratedKeys(boolean getGeneratedKeys);
-
-    /**
-     * Build and return the insert options.
-     */
-    InsertOptions build();
-
-  }
-}
@@ -1,42 +0,0 @@
-package io.ebean;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Helper methods for Lists.
- */
-public final class Lists {
-
-  private Lists() {
-  }
-
-  /**
-   * Partition the source List into sub-lists with a maximum size.
-   * <p>
-   * The sub-lists will all be the max size except for the last sub-list
-   * which can potentially be smaller.
-   *
-   * @param source The source list
-   * @param max    The max size of each partition
-   * @param <T>    The list element type
-   * @return List of sub-list partitions
-   */
-  public static <T> List<List<T>> partition(List<T> source, int max) {
-    final int totalCount = source.size();
-    if (totalCount == 0) {
-      return Collections.emptyList();
-    } else if (totalCount <= max) {
-      return List.of(source);
-    }
-    final int numOfPartitions = (totalCount + max - 1) / max;  // round up
-    final var dest = new ArrayList<List<T>>(numOfPartitions);
-    for (int i = 0; i < numOfPartitions; i++) {
-      final int from = i * max;
-      final int to = Math.min(from + max, totalCount);
-      dest.add(source.subList(from, to));
-    }
-    return dest;
-  }
-}
@@ -333,10 +333,10 @@ public class OrderBy<T> implements Serializable {
          sb.append(property);
        }
        if (!ascending) {
-          sb.append(' ').append("desc");
+          sb.append(" ").append("desc");
        }
        if (nulls != null) {
-          sb.append(' ').append(nulls).append(' ').append(highLow);
+          sb.append(" ").append(nulls).append(" ").append(highLow);
        }
        return sb.toString();
      }
@@ -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.
@@ -3,15 +3,13 @@ package io.ebean;
 import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;

-import jakarta.persistence.NonUniqueResultException;
-import javax.sql.DataSource;
+import javax.persistence.NonUniqueResultException;
 import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
@@ -672,16 +670,6 @@ public interface Query<T> extends CancelableQuery {
   */
  Query<T> apply(FetchPath fetchPath);

-  /**
-   * Apply changes to the query conditional on the supplied predicate.
-   * <p>
-   * Typically, the changes are extra predicates etc.
-   *
-   * @param predicate The predicate which when true the changes are applied
-   * @param apply The changes to apply to the query
-   */
-  Query<T> alsoIf(BooleanSupplier predicate, Consumer<Query<T>> apply);
-
  /**
   * Execute the query using the given transaction.
   */
@@ -697,18 +685,6 @@ public interface Query<T> extends CancelableQuery {
   */
  Query<T> usingDatabase(Database database);

-  /**
-   * Ensure that the master DataSource is used if there is a read only data source
-   * being used (that is using a read replica database potentially with replication lag).
-   * <p>
-   * When the database is configured with a read-only DataSource via
-   * say {@link io.ebean.DatabaseBuilder#readOnlyDataSource(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
-   * against the master data source.
-   */
-  Query<T> usingMaster();
-
  /**
   * Execute the query returning the list of Id's.
   * <p>
@@ -970,25 +946,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 +1372,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 +1391,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 +1404,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 +1558,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>
@@ -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.
@@ -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,23 +45,6 @@ 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
-   * 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
-   * against the master data source.
-   */
-  SqlQuery usingMaster();
-
  /**
   * Execute the query returning a list.
   */
@@ -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 ---- //
@@ -76,9 +77,9 @@ public final class StdOperators {
    StringBuilder expression = new StringBuilder(50);
    expression.append("concat(").append(property.toString());
    for (Object value : values) {
-      expression.append(',').append(sqlConcatString(value));
+      expression.append(",").append(sqlConcatString(value));
    }
-    expression.append(')');
+    expression.append(")");
    return Property.of(expression.toString());
  }

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

 /**
@@ -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;
@@ -45,7 +45,7 @@ public final class ToStringBuilder {
      id.putIfAbsent(bean, 0);
    }
    if (counter <= MAX) {
-      sb.append(bean.getClass().getSimpleName()).append('@').append(counter).append('(');
+      sb.append(bean.getClass().getSimpleName()).append("@").append(counter).append("(");
    }
  }

@@ -77,7 +77,7 @@ public final class ToStringBuilder {
   */
  public void end() {
    if (counter <= MAX) {
-      sb.append(')');
+      sb.append(")");
    }
  }

@@ -90,7 +90,7 @@ public final class ToStringBuilder {
    } else {
      sb.append(", ");
    }
-    sb.append(name).append(':');
+    sb.append(name).append(":");
  }

  private void value(Object value) {
@@ -125,20 +125,20 @@ public final class ToStringBuilder {
      sb.append("{}");
    } else {
      boolean firstElement = true;
-      sb.append('{');
+      sb.append("{");
      for (Map.Entry<?, ?> entry : map.entrySet()) {
        if (firstElement) {
          firstElement = false;
        } else {
          sb.append(", ");
        }
-        sb.append(entry.getKey()).append(':');
+        sb.append(entry.getKey()).append(":");
        value(entry.getValue());
        if (counter > MAX) {
          return;
        }
      }
-      sb.append('}');
+      sb.append("}");
    }
  }

@@ -151,7 +151,7 @@ public final class ToStringBuilder {
      return;
    }
    boolean firstElement = true;
-    sb.append('[');
+    sb.append("[");
    for (Object o : c) {
      if (firstElement) {
        firstElement = false;
@@ -163,7 +163,7 @@ public final class ToStringBuilder {
        return;
      }
    }
-    sb.append(']');
+    sb.append("]");
  }

  private boolean push(Object bean) {
@@ -178,7 +178,7 @@ public final class ToStringBuilder {
    Integer idx = id.putIfAbsent(bean, counter++);
    if (idx != null) {
      --counter;
-      sb.append(bean.getClass().getSimpleName()).append('@').append(idx);
+      sb.append(bean.getClass().getSimpleName()).append("@").append(idx);
      return false;
    }
    first = true;
@@ -1,6 +1,6 @@
 package io.ebean.cache;

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

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

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

 /**
 * The plugin interface that creates a ServerCacheFactory.
@@ -11,5 +11,5 @@ public interface ServerCachePlugin {
  /**
   * Create the ServerCacheFactory given the server config and background executor service.
   */
-  ServerCacheFactory create(DatabaseBuilder config, BackgroundExecutor executor);
+  ServerCacheFactory create(DatabaseConfig config, BackgroundExecutor executor);
 }
@@ -69,7 +69,7 @@ public class TenantAwareKey {
    public String toString() {
      StringBuilder sb = new StringBuilder(key.toString());
      if (tenantId != null) {
-        sb.append(':').append(tenantId);
+        sb.append(":").append(tenantId);
      }
      return sb.toString();
    }
@@ -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 {
@@ -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;

@@ -228,7 +228,7 @@ public abstract class AbstractNamingConvention implements NamingConvention {
  public TableName getM2MJoinTableName(TableName lhsTable, TableName rhsTable) {
    StringBuilder buffer = new StringBuilder();
    buffer.append(unQuote(lhsTable.getName()));
-    buffer.append('_');
+    buffer.append("_");

    String rhsTableName = unQuote(rhsTable.getName());
    if (rhsTableName.indexOf('_') < rhsPrefixLength) {
@@ -271,10 +271,10 @@ public abstract class AbstractNamingConvention implements NamingConvention {
  public String getTableName(String catalog, String schema, String name) {
    StringBuilder sb = new StringBuilder();
    if (!isNull(catalog)) {
-      sb.append(quoteIdentifiers(catalog)).append('.');
+      sb.append(quoteIdentifiers(catalog)).append(".");
    }
    if (!isNull(schema)) {
-      sb.append(quoteIdentifiers(schema)).append('.');
+      sb.append(quoteIdentifiers(schema)).append(".");
    }
    return sb.append(quoteIdentifiers(name)).toString();
  }
@@ -1,7 +1,5 @@
 package io.ebean.config;

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

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

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

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

-import io.ebean.DatabaseBuilder;
-
 /**
 * Provides a ServiceLoader based mechanism to configure a DatabaseConfig.
 * <p>
@@ -37,5 +35,5 @@ public interface DatabaseConfigProvider {
   * Typically we explicitly register entity bean classes and thus avoid classpath scanning.
   * </p>
   */
-  void apply(DatabaseBuilder config);
+  void apply(DatabaseConfig config);
 }
@@ -135,12 +135,12 @@ public class DbConstraintNaming {
   */
  protected String joinColumnNames(String[] columns) {
    if (columns.length == 1) {
-      return normaliseColumn(columns[0]).replace(" ", "_");
+      return normaliseColumn(columns[0]);
    }
    StringBuilder sb = new StringBuilder();
    for (int i = 0; i < columns.length; i++) {
      if (i > 0) {
-        sb.append('_');
+        sb.append("_");
      }
      sb.append(normaliseColumn(columns[i]));
    }
@@ -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.
@@ -117,12 +117,12 @@ public final class TableName {
    // Add schema
    if (schema != null) {
      if (buffer.length() > 0) {
-        buffer.append('.');
+        buffer.append(".");
      }
      buffer.append(schema);
    }
    if (buffer.length() > 0) {
-      buffer.append('.');
+      buffer.append(".");
    }
    return buffer.append(name).toString();
  }
@@ -23,11 +23,11 @@ public class BasicSqlLimitOffset implements BasicSqlLimiter {
    sb.append(dbSql);

    if (maxRows > 0) {
-      sb.append(' ').append(LIMIT);
-      sb.append(' ').append(maxRows);
+      sb.append(" ").append(LIMIT);
+      sb.append(" ").append(maxRows);
    }
    if (firstRow > 0) {
-      sb.append(' ').append(OFFSET).append(' ');
+      sb.append(" ").append(OFFSET).append(" ");
      sb.append(firstRow);
    }
    return sb.toString();
@@ -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 + " */ ";
-  }
 }
@@ -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;
@@ -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;
@@ -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;
@@ -1,6 +1,6 @@
 package io.ebean.config.dbplatform;

-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 import java.sql.SQLException;

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

 }
@@ -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.
@@ -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 {
@@ -118,28 +118,28 @@ final class MetricsAsJson implements ServerMetricsAsJson {

  private void objStart() throws IOException {
    objKeyCounter = 0;
-    writer.append('{');
+    writer.append("{");
  }

  private void objEnd() throws IOException {
-    writer.append('}');
+    writer.append("}");
  }

  private void listStart() throws IOException {
    listCounter = 0;
-    writer.append('[');
+    writer.append("[");
    writer.append(newLine);
  }

  private void listEnd() throws IOException {
-    writer.append(']');
+    writer.append("]");
  }

  private void key(String key) throws IOException {
    if (objKeyCounter++ > 0) {
      writer.append(", ");
    }
-    writer.append('"').append(key).append("\":");
+    writer.append("\"").append(key).append("\":");
  }

  private void val(long count) throws IOException {
@@ -147,12 +147,12 @@ final class MetricsAsJson implements ServerMetricsAsJson {
  }

  private void val(String val) throws IOException {
-    writer.append('"').append(val).append('"');
+    writer.append("\"").append(val).append("\"");
  }

  private void metricStart(MetaMetric metric) throws IOException {
    if (listCounter++ > 0) {
-      writer.append(',').append(newLine);
+      writer.append(",").append(newLine);
    }
    objStart();
    key("name");
@@ -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();
  }
@@ -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.
@@ -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.
@@ -1,22 +0,0 @@
-package io.ebean.service;
-
-import io.ebean.InTuples;
-
-import java.util.List;
-
-/**
- * Internal extension to InTuples.
- */
-public interface SpiInTuples extends InTuples {
-
-  /**
-   * Return the properties of the tuples.
-   */
-  String[] properties();
-
-  /**
-   * Return all the tuple entries.
-   */
-  List<Object[]> entries();
-
-}
@@ -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;
+}
+
@@ -205,7 +205,7 @@ public class PathProperties implements FetchPath {
        sb.append(it.next());
        hasNext = it.hasNext();
        if (hasNext) {
-          sb.append(',');
+          sb.append(",");
        }
      }
      return sb.toString();
@@ -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.
   */
@@ -25,14 +25,14 @@ public final class CamelCaseHelper {
        lastUpper = i;
      } else if (Character.isDigit(c)) {
        if (i > lastUpper + 1 && !digitsCompressed) {
-          sb.append('_');
+          sb.append("_");
          lastUpper = i;
        }
        sb.append(c);

      } else if (Character.isUpperCase(c)) {
        if (i > lastUpper + 1) {
-          sb.append('_');
+          sb.append("_");
        }
        sb.append(Character.toLowerCase(c));
        lastUpper = i;
@@ -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;
@@ -21,4 +21,9 @@ class DbPrimaryTest {
    assertEquals("h2", DbPrimary.getDefaultServerName());
  }

+  @Test
+  void testLoadProperties() {
+    Properties properties = DbPrimary.getProperties();
+    assertFalse(properties.isEmpty());
+  }
 }
@@ -1,82 +0,0 @@
-package io.ebean;
-
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class ListsTest {
-
-  @Test
-  void partition_empty() {
-    List<List<Integer>> partitions = Lists.partition(List.of(), 5);
-    assertThat(partitions).isEmpty();
-  }
-
-  @Test
-  void partition_lt() {
-    List<List<Integer>> partitions = Lists.partition(List.of(1, 2, 3, 4), 5);
-    assertThat(partitions).hasSize(1);
-    assertThat(partitions.get(0)).hasSize(4);
-  }
-
-  @Test
-  void partition_eq() {
-    List<List<Integer>> partitions = Lists.partition(List.of(1, 2, 3, 4, 5), 5);
-    assertThat(partitions).hasSize(1);
-    assertThat(partitions.get(0)).hasSize(5);
-  }
-
-  @Test
-  void partition_gt() {
-    List<List<Integer>> partitions = Lists.partition(List.of(1, 2, 3, 4, 5, 6), 5);
-    assertThat(partitions).hasSize(2);
-    assertThat(partitions.get(0)).hasSize(5);
-    assertThat(partitions.get(1)).hasSize(1);
-    assertThat(partitions.get(0)).containsExactly(1, 2, 3, 4, 5);
-    assertThat(partitions.get(1)).containsExactly(6);
-  }
-
-  @Test
-  void partition_gt1_letters() {
-    var partitions = Lists.partition(List.of("a", "b", "c", "d"), 3);
-    assertThat(partitions).hasSize(2);
-    assertThat(partitions.get(0)).hasSize(3);
-    assertThat(partitions.get(1)).hasSize(1);
-    assertThat(partitions.get(0)).containsExactly("a", "b", "c");
-    assertThat(partitions.get(1)).containsExactly("d");
-  }
-
-  @Test
-  void partition_gt1a_letters() {
-    var partitions = Lists.partition(List.of("a", "b", "c", "d", "e"), 3);
-    assertThat(partitions).hasSize(2);
-    assertThat(partitions.get(0)).hasSize(3);
-    assertThat(partitions.get(1)).hasSize(2);
-    assertThat(partitions.get(0)).containsExactly("a", "b", "c");
-    assertThat(partitions.get(1)).containsExactly("d", "e");
-  }
-
-  @Test
-  void partition_eq2_letters() {
-    var partitions = Lists.partition(List.of("a", "b", "c", "d", "e", "f"), 3);
-    assertThat(partitions).hasSize(2);
-    assertThat(partitions.get(0)).hasSize(3);
-    assertThat(partitions.get(1)).hasSize(3);
-    assertThat(partitions.get(0)).containsExactly("a", "b", "c");
-    assertThat(partitions.get(1)).containsExactly("d", "e", "f");
-  }
-
-  @Test
-  void partition_gt2_letters() {
-    var partitions = Lists.partition(List.of("a", "b", "c", "d", "e", "f", "g"), 3);
-    assertThat(partitions).hasSize(3);
-    assertThat(partitions.get(0)).hasSize(3);
-    assertThat(partitions.get(1)).hasSize(3);
-    assertThat(partitions.get(2)).hasSize(1);
-    assertThat(partitions.get(0)).containsExactly("a", "b", "c");
-    assertThat(partitions.get(1)).containsExactly("d", "e", "f");
-    assertThat(partitions.get(2)).containsExactly("g");
-  }
-}
@@ -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);
@@ -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");
-  }
-}
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>13.20.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.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.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.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.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.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.1-SNAPSHOT</version>
+        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.1-SNAPSHOT</version>
+        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.1-SNAPSHOT</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-postgis</artifactId>
+        <version>13.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.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.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.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.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.1-SNAPSHOT</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>14.0.2</version>
+        <version>13.20.1-SNAPSHOT</version>
      </dependency>

    </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>13.20.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.20.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>
@@ -1,6 +1,6 @@
 package io.ebean.core.type;

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

 import java.util.List;

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

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

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

 }
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>13.20.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.20.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.20.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.20.1-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.1-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.2</version>
+      <version>13.20.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>
@@ -73,13 +73,13 @@ public final class BindParams implements Serializable {
    for (Param param : positionedParameters) {
      tempBindCount = param.queryBindCount();
      bc += tempBindCount;
-      builder.append('p').append(bc).append(" ?:").append(tempBindCount).append(',');
+      builder.append("p").append(bc).append(" ?:").append(tempBindCount).append(",");
    }

    for (Map.Entry<String, Param> entry : namedParameters.entrySet()) {
      tempBindCount = entry.getValue().queryBindCount();
      bc += tempBindCount;
-      builder.append('n').append(bc).append(" k:").append(entry.getKey()).append(" ?:").append(tempBindCount).append(',');
+      builder.append("n").append(bc).append(" k:").append(entry.getKey()).append(" ?:").append(tempBindCount).append(",");
    }
  }

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

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

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

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

  /**
@@ -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;
  }
@@ -3,8 +3,6 @@ package io.ebeaninternal.api;
 import io.ebean.TxScope;

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

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

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

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

-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;

 import io.ebean.CancelableQuery;

@@ -61,4 +61,9 @@ public interface SpiDtoQuery<T> extends DtoQuery<T>, SpiSqlBinding {
   */
  SpiQuery<?> ormQuery();

+  /**
+   * Return the explicit transaction used to execute the query.
+   */
+  Transaction transaction();
+
 }
@@ -66,11 +66,6 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  CallOrigin createCallOrigin();

-  /**
-   * Override in order to return SpiQuery
-   */
-  <T> SpiQuery<T> createQuery(Class<T> beanType);
-
  /**
   * Return the PersistenceContextScope to use defined at query or server level.
   */
@@ -86,11 +81,6 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  SpiTransactionManager transactionManager();

-  /**
-   * End the current transaction if it is active.
-   */
-  void endTransaction();
-
  /**
   * Return all the descriptors.
   */
@@ -145,9 +135,8 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   * Create a ServerTransaction for query purposes.
   *
   * @param tenantId For multi-tenant lazy loading provide the tenantId to use.
-   * @param useMaster Set to true when the query should use the master data source.
   */
-  SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMaster);
+  SpiTransaction createReadOnlyTransaction(Object tenantId);

  /**
   * An event from another server in the cluster used to notify local
@@ -158,7 +147,7 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
  /**
   * Compile a query.
   */
-  <T> CQuery<T> compileQuery(Type type, SpiQuery<T> query, Transaction transaction);
+  <T> CQuery<T> compileQuery(Type type, Query<T> query, Transaction transaction);

  /**
   * Execute the findId's query but without copying the query.
@@ -167,12 +156,12 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   * the query has finished (if executing in a background thread).
   * </p>
   */
-  <A, T> List<A> findIdsWithCopy(SpiQuery<T> query);
+  <A, T> List<A> findIdsWithCopy(Query<T> query, Transaction transaction);

  /**
   * Execute the findCount query but without copying the query.
   */
-  <T> int findCountWithCopy(SpiQuery<T> query);
+  <T> int findCountWithCopy(Query<T> query, Transaction transaction);

  /**
   * Load a batch of Associated One Beans.
@@ -300,7 +289,7 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
  /**
   * Execute the underlying ORM query returning as a JDBC ResultSet to map to DTO beans.
   */
-  SpiResultSet findResultSet(SpiQuery<?> ormQuery);
+  SpiResultSet findResultSet(SpiQuery<?> ormQuery, SpiTransaction transaction);

  /**
   * Visit all the metrics (typically reporting them).
@@ -332,57 +321,136 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  SpiQueryBindCapture createQueryBindCapture(SpiQueryPlan queryPlan);

-  <T> boolean exists(SpiQuery<T> ormQuery);

-  <T> int findCount(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> boolean exists(Query<T> ormQuery, Transaction transaction);

-  <A, T> List<A> findIds(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> int findCount(Query<T> query, Transaction transaction);

-  <T> QueryIterator<T> findIterate(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <A, T> List<A> findIds(Query<T> query, Transaction transaction);

-  <T> Stream<T> findStream(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction);

-  <T> void findEach(SpiQuery<T> query, Consumer<T> consumer);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> Stream<T> findStream(Query<T> query, Transaction transaction);

-  <T> void findEach(SpiQuery<T> query, int batch, Consumer<List<T>> consumer);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction);

-  <T> void findEachWhile(SpiQuery<T> query, Predicate<T> consumer);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> void findEach(Query<T> query, int batch, Consumer<List<T>> consumer, Transaction t);

-  <T> List<Version<T>> findVersions(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction);

-  <T> List<T> findList(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> List<Version<T>> findVersions(Query<T> query, Transaction transaction);

-  <T> FutureRowCount<T> findFutureCount(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> List<T> findList(Query<T> query, Transaction transaction);

-  <T> FutureIds<T> findFutureIds(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction);

-  <T> FutureList<T> findFutureList(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> FutureIds<T> findFutureIds(Query<T> query, Transaction transaction);

-  <T> PagedList<T> findPagedList(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> FutureList<T> findFutureList(Query<T> query, Transaction transaction);

-  <T> Set<T> findSet(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction);

-  <K, T> Map<K, T> findMap(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> Set<T> findSet(Query<T> query, Transaction transaction);

-  <A, T> List<A> findSingleAttributeList(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction);

-  <A, T> Set<A> findSingleAttributeSet(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction);

+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <A, T> Set<A> findSingleAttributeSet(Query<T> query, Transaction transaction);
+
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
  @Nullable
-  <T> T findOne(SpiQuery<T> query);
+  <T> T findOne(Query<T> query, Transaction transaction);

-  <T> Optional<T> findOneOrEmpty(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction);

-  <T> int delete(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> int delete(Query<T> query, Transaction transaction);

-  <T> int update(SpiQuery<T> query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  <T> int update(Query<T> query, Transaction transaction);

-  List<SqlRow> findList(SpiSqlQuery query);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  List<SqlRow> findList(SqlQuery query, Transaction transaction);

-  void findEach(SpiSqlQuery query, Consumer<SqlRow> consumer);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  void findEach(SqlQuery query, Consumer<SqlRow> consumer, Transaction transaction);

-  void findEachWhile(SpiSqlQuery query, Predicate<SqlRow> consumer);
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  void findEachWhile(SqlQuery query, Predicate<SqlRow> consumer, Transaction transaction);

+  /**
+   * Deprecated migrate to using {@link SqlQuery#usingTransaction(Transaction)}.
+   */
  @Nullable
-  SqlRow findOne(SpiSqlQuery query);
+  SqlRow findOne(SqlQuery query, Transaction transaction);
 }
@@ -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,22 +34,14 @@ 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);
-
  /**
   * Append to the expression sql with logical property parsing to db columns with logical path prefix.
   * <p>
   * 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);

  /**
@@ -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.
   */
@@ -241,16 +235,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  String planLabel();

-  /**
-   * Return the transaction explicitly assigned or null.
-   */
-  SpiTransaction transaction();
-
-  /**
-   * Return true if this query should not use the read only data source.
-   */
-  boolean isUseMaster();
-
  /**
   * Return true if this is a "find by id" query. This includes a check for a single "equal to" expression for the Id.
   */
@@ -345,7 +329,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 +643,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>
@@ -893,6 +867,17 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  boolean isDisableReadAudit();

+  /**
+   * Return true if this is a query executing in the background.
+   */
+  boolean isFutureFetch();
+
+  /**
+   * Set to true to indicate the query is executing in a background thread
+   * asynchronously.
+   */
+  void setFutureFetch(boolean futureFetch);
+
  /**
   * Set the readEvent for future queries (as prepared in foreground thread).
   */
@@ -1,23 +1,10 @@
 package io.ebeaninternal.api;

-import io.avaje.lang.Nullable;
-
 /**
 * SQL query binding (for SqlQuery and DtoQuery).
 */
 public interface SpiSqlBinding extends SpiCancelableQuery {

-  /**
-   * Return the transaction explicitly associated to the query.
-   */
-  @Nullable
-  SpiTransaction transaction();
-
-  /**
-   * Return true if this query should not use the read only data source.
-   */
-  boolean isUseMaster();
-
  /**
   * Return the named or positioned parameters.
   */
@@ -1,10 +1,17 @@
 package io.ebeaninternal.api;

+import io.avaje.lang.Nullable;
 import io.ebean.SqlQuery;
+import io.ebean.Transaction;

 /**
 * SQL query - Internal extension to SqlQuery.
 */
 public interface SpiSqlQuery extends SqlQuery, SpiSqlBinding {

+  /**
+   * Return the transaction explicitly associated to the query.
+   */
+  @Nullable
+  Transaction transaction();
 }
@@ -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;

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	df7b04877d	#3121 BindMaxLength validation At deploy time derive a BindMaxLength property to use per BeanProperty	2023-06-26 21:16:32 +12:00
Rob Bygrave	4683877e0b	Merge branch 'string-length-validation' of github.com:FOCONIS/ebean into FOCONIS-string-length-validation	2023-06-23 16:51:34 +12:00
Roland Praml	d0020ab8ce	Length validation less invasive	2023-06-20 14:47:20 +02:00
Roland Praml	9b3b8ad46a	extended DataBind, so that it could return the last bound object	2023-06-20 13:03:04 +02:00
Roland Praml	ca3c02bc1c	Failing test for SqlServer	2023-06-19 13:48:00 +02:00