#3393 Fix for 12.x to support "NoTimeZone" to bypass MySQL JDBC use of Timezone Calendar

[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release ebean-parent-12.16.2
2024-04-21 10:51:47 +00:00 · 2024-04-17 22:57:55 +12:00 · 2023-09-07 14:50:26 +12:00 · 2023-09-07 14:50:18 +12:00 · 2023-09-07 14:45:59 +12:00 · 2023-09-07 14:44:17 +12:00
2867 changed files with 54890 additions and 39636 deletions
@@ -13,18 +13,18 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [11]
+        java_version: [8]
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'zulu'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      env:
        cache-name: maven-cache
      with:
@@ -36,5 +36,5 @@ jobs:
 #    - name: Maven single test
 #      run: mvn --batch-mode clean verify -Dtest="io.ebeaninternal.server.core.DefaultServer_getReferenceTest" -DfailIfNoTests=false
    - name: Build with Maven
-      run: mvn -T 8 clean test
+      run: mvn clean package

@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      env:
        cache-name: maven-cache
      with:
@@ -35,4 +35,4 @@ jobs:
          ~/.m2
        key: build-${{ env.cache-name }}
    - name: db2
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-db2.properties
+      run: mvn clean test -Dprops.file=testconfig/ebean-db2.properties
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'zulu'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      env:
        cache-name: maven-cache
      with:
@@ -37,5 +37,5 @@ jobs:
    - name: Maven version
      run: mvn --version
    - name: H2Database
-      run: mvn -T 8 clean package
+      run: mvn clean package

@@ -0,0 +1,39 @@
+
+name: JDK 18-ea
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '30 6 * * 1,3,5'
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      fail-fast: false
+      matrix:
+        java_version: [18-ea]
+        os: [ubuntu-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Java
+      uses: actions/setup-java@v2
+      with:
+        java-version: ${{ matrix.java_version }}
+        distribution: 'zulu'
+    - name: Maven cache
+      uses: actions/cache@v2
+      env:
+        cache-name: maven-cache
+      with:
+        path:
+          ~/.m2
+        key: build-${{ env.cache-name }}
+    - name: Build with Maven
+      run: mvn package
+
@@ -16,26 +16,24 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [GA,EA]
+        java_version: [17,18,19,loom,valhalla,metropolis,panama]
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Set up Java
      uses: oracle-actions/setup-java@v1
      with:
        website: jdk.java.net
        release: ${{ matrix.java_version }}
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      env:
        cache-name: maven-cache
      with:
        path:
          ~/.m2
        key: build-${{ env.cache-name }}
-    - name: Maven version
-      run: mvn --version
    - name: Build with Maven
-      run: mvn -T 8 test
+      run: mvn package

@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      env:
        cache-name: maven-cache
      with:
@@ -35,4 +35,4 @@ jobs:
          ~/.m2
        key: build-${{ env.cache-name }}
    - name: mariadb 10.6
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-mariadb.properties
+      run: mvn clean test -Dprops.file=testconfig/ebean-mariadb.properties
@@ -17,14 +17,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      env:
        cache-name: maven-cache
      with:
@@ -16,18 +16,18 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [11, 17, 21]
+        java_version: [8.0.192, 8, 11.0.3, 11, 17]
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'zulu'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      env:
        cache-name: maven-cache
      with:
@@ -35,4 +35,4 @@ jobs:
          ~/.m2
        key: build-${{ env.cache-name }}
    - name: mysql
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-mysql.properties
+      run: mvn clean test -Dprops.file=testconfig/ebean-mysql.properties
@@ -1,5 +1,5 @@

-name: Oracle
+name: Oracle18

 on:
  workflow_dispatch:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'zulu'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      env:
        cache-name: maven-cache
      with:
@@ -35,4 +35,4 @@ jobs:
          ~/.m2
        key: build-${{ env.cache-name }}
    - name: oracle
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-oracle.properties
+      run: mvn clean test -Dprops.file=testconfig/ebean-oracle.properties
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      env:
        cache-name: maven-cache
      with:
@@ -35,4 +35,4 @@ jobs:
          ~/.m2
        key: build-${{ env.cache-name }}
    - name: postgres
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-postgres.properties
+      run: mvn clean test -Dprops.file=testconfig/ebean-postgres.properties
@@ -17,14 +17,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      env:
        cache-name: maven-cache
      with:
@@ -35,4 +35,4 @@ jobs:
          ~/.m2
        key: build-${{ env.cache-name }}
    - name: sqlserver 2017
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-sqlserver17.properties
+      run: mvn clean test -Dprops.file=testconfig/ebean-sqlserver17.properties
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      env:
        cache-name: maven-cache
      with:
@@ -11,7 +11,6 @@ ebean-profiling*.xml
 /db
 /mydb.db
 profiling/
-.DS_Store

 # Intellij project files
 *.iml
@@ -4,13 +4,13 @@ Overview of ebean.properties file

 ### DbMigration options

-You can set individual values for different platforms when generating migrations.
+You can set individual values for different platforms when generating migrations

 `dbmigration.platform.<PLATFORM>.databaseSequenceBatchSize`
 For DB's using sequences this is the number of sequence values prefetched.
 
 `dbmigration.platform.<PLATFORM>.dbuuid`
-Control, how UUID generation should work - it affects which column type is generated in DDL. Possible values:
+Control, how UUID generation should work - it affects DDL which column type is generated. Possible values:
 - BINARY enforces binary UUID 
 - VARCHAR enforces varchar UUID
 - BINARY_OPTIMIZED enforces binary-optimized UUID (makes sense only with Type1 ID)
@@ -19,7 +19,7 @@ Control, how UUID generation should work - it affects which column type is gener
 - AUTO_VARCHAR (default) use varchar when platform does not support UUID 

 `dbmigration.platform.<PLATFORM>.uuidStoreAsBinary`
-Same as setting dbuuid to BINARY.
+Same as setting dbuuid to BINARY

 `dbmigration.platform.<PLATFORM>.geometrySRID`
 The Geometry SRID value (default 4326).
@@ -30,6 +30,7 @@ The ID type (IDENTITY, SEQUENCE, GENERATOR, EXTERNAL)
 `dbmigration.platform.<PLATFORM>.mapping`
 Adjust the mapping. For example `BOOLEAN=integer(32);BIT=tinyint(3)`

+
 `ebean.migration.applyPrefix`
 Set this to "V" to be compatible with FlywayDB.

@@ -49,7 +50,7 @@ Set to true if the DB migration should be generated on server start.
 The version of a pending drop that should be generated as the next migration.

 `ebean.migration.includeGeneratedFileComment`
-Adds the header about the migration files being generated when true. Reading 'THIS IS A GENERATED FILE - DO NOT MODIFY'
+TODO

 `ebean.migration.metaTable`
 For running migration the DB table that holds migration execution status. Default 'db_migration'
@@ -64,17 +65,17 @@ Subdirectory the model xml files go into. Default 'model'
 Suffix. Default '.model.xml' 

 `ebean.migration.name`
-Description text that can be appended to the version to become the ddl script file name.
+Description text that can be appended to the version to become the ddl script file name
 
 `ebean.migration.patchInsertOn`
-Migration versions that should be added to history without running.
+migration versions that should be added to history without running.

 `ebean.migration.patchResetChecksumOn`
 migration versions that should have their checksum reset and not run.
 Use this if you get a 'Checksum mismatch' error.

 `ebean.migration.placeholders`
-A comma and equals delimited map of placeholders that are substituted in SQL scripts when running migration (used by DB Migration runner only).
+A comma and equals delimited placeholders that are substituted in SQL scripts when running migration (used by DB Migration runner only).

 `ebean.migration.platform`
 The database platform to generate migration DDL for.
@@ -89,7 +90,7 @@ The migration version name (typically FlywayDb compatible). Example: 1.1.1_2
 ### Ebean UUID options

 `ebean.uuidVersion`
-Controls how the UUIDs are generated. Possible values:
+Controls, how the UUIDs are generated. Possible values
 - VERSION4 (default) generate random V4 UUIDs,
 - VERSION1 generate rfc4122 compliant Type 1 UUIDs (requires a state file)
 - VERSION1RND generate fake Type 1 UUIDs
@@ -97,7 +98,7 @@ Controls how the UUIDs are generated. Possible values:
 Note, that V1 UUIDs in conjunction with AUTO_BINARY_OPTIMIZED will give you the best index performance, but you MUST understand how this works to avoid collisions.

 `ebean.uuidStateFile`
-The state file that is required to generate V1 UUIDs.
+The state file that is Required to generate V1 UUIDs


 ### DocStoreConfig
@@ -106,7 +107,7 @@ The state file that is required to generate V1 UUIDs.
 True when the Document store integration is active/on.

 `ebean.docstore.allowAllCertificates`
-Set to true such that the client allows connections to invalid/self-signed SSL certificates.
+Set to true such that the client allows connections to invalid/self signed SSL certificates.

 `ebean.docstore.bulkBatchSize`
 The default batch size to use for the Bulk API calls.
@@ -191,7 +192,7 @@ Suffix appended to the base table to derive the view that contains the union of
 Set to true if the DataSource uses autoCommit. Indicates that Ebean should use autoCommit friendly Transactions and TransactionManager.

 `ebean.autoReadOnlyDataSource`
-When true create a read only DataSource using readOnlyDataSourceConfig defaulting values from dataSourceConfig.
+When true create a read only DataSource using readOnlyDataSourceConfig defaulting values from dataSourceConfig

 `ebean.autostart`
 Should the server start all
@@ -1,55 +1,25 @@
-
 [![Build](https://github.com/ebean-orm/ebean/actions/workflows/build.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/build.yml)
 [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/ebean-orm/ebean/blob/master/LICENSE)
 [![Multi-JDK Build](https://github.com/ebean-orm/ebean/actions/workflows/multi-jdk-build.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/multi-jdk-build.yml)
+[![JDK 18-ea](https://github.com/ebean-orm/ebean/actions/workflows/jdk-18-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/jdk-18-ea.yml)

-##### Build with database platforms
 [![H2Database](https://github.com/ebean-orm/ebean/actions/workflows/h2database.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/h2database.yml)
 [![Postgres](https://github.com/ebean-orm/ebean/actions/workflows/postgres.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/postgres.yml)
 [![MySql](https://github.com/ebean-orm/ebean/actions/workflows/mysql.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/mysql.yml)
 [![MariaDB](https://github.com/ebean-orm/ebean/actions/workflows/mariadb.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/mariadb.yml)
-[![Oracle](https://github.com/ebean-orm/ebean/actions/workflows/oracle.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/oracle.yml)
 [![SqlServer](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver.yml)
-[![DB2 LUW](https://github.com/ebean-orm/ebean/actions/workflows/db2luw.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/db2luw.yml)
 [![Yugabyte](https://github.com/ebean-orm/ebean/actions/workflows/yugabyte.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/yugabyte.yml)

-##### Build with Java Early Access versions
+
+#### Builds against EA (Early Access) versions of Java (19, Loom, panama etc)
+
 [![ebean EA](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml)
 [![datasource EA](https://github.com/ebean-orm/ebean-datasource/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-datasource/actions/workflows/jdk-ea.yml)
 [![migration EA](https://github.com/ebean-orm/ebean-migration/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-migration/actions/workflows/jdk-ea.yml)
 [![test-docker EA](https://github.com/ebean-orm/ebean-test-docker/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-test-docker/actions/workflows/jdk-ea.yml)
-[![ebean-agent EA](https://github.com/ebean-orm/ebean-agent/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-agent/actions/workflows/jdk-ea.yml)
-
----------------------
-
-# Ebean ORM for Java & Kotlin
-
-**Multiple abstraction levels**: Ebean provides multiple levels of query abstraction [ORM Queries, mixed with SQL](https://ebean.io/docs/intro/queries/orm-query), [DTO Queries](https://ebean.io/docs/intro/queries/dto-query), [SqlQuery and JDBC](https://ebean.io/docs/intro/queries/sql-query).
-Work at the highest level of abstraction and drop down levels as needed.
-
-**Database migrations**: Built in [DB migration](https://ebean.io/docs/db-migrations/) generation and running. Support for "rebase" migrations as well as repeatable, init and 'normal' migrations.
-
-**Awesome SQL**: Ebean produces SQL that you would hand craft yourself. Use great SQL, never generate SQL cartesian product, always honor relational limit/offset.
-
-**Automated query tuning**: For ORM queries Ebean can profile the object graph being used and either [automatically tune the query](https://ebean.io/docs/query/background/autotune).
-
-**Docker test containers**: [Docker test containers](https://ebean.io/docs/testing/) for all the supported databases. Get 100% test coverage on all the features of the database we use.
-
-**Type safe queries**: We can build queries using type safe [query beans](https://ebean.io/docs/query/query-beans). IDE auto-complete when writing queries, compile time checking and it's FUN.
-
-**Performance isn't optional**: Optimise queries to only fetch what we need (partial objects). Automatically avoid N+1 via a smart load context.
-
-#### Benefits of ORM
-
-* Automatically avoid N+1
-* L2 caching to reduce database load
-* Queries mixing database and L2 cache
-* Automatically tune ORM queries
-* Elasticsearch for search or L3 cache


----------------------
 # Sponsors
 <table>
  <tbody>
@@ -79,45 +49,14 @@ Work at the highest level of abstraction and drop down levels as needed.
 </table>

 ## Need help?
-Post questions or issues to the [Ebean google group](https://groups.google.com/forum/#!forum/ebean)
-or [github discussions](https://github.com/ebean-orm/ebean/discussions)
+Post questions or issues to the Ebean google group - https://groups.google.com/forum/#!forum/ebean

 ## Documentation
 Goto [https://ebean.io/docs/](https://ebean.io/docs/)

+
 ## Maven central
-[Maven central - g:io.ebean](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.ebean%22%20)
-
-## Building Ebean from source
-
- JDK 11 or higher installed
- Maven installed
- `git clone git@github.com:ebean-orm/ebean.git`
- `mvn clean install`
-
-Ebean 13 uses Java modules with module-info. This means that there are stricter compilation
-rules in place now than when building with classpath pre version 13.
-
-For Maven Surefire testing we use `<surefire.useModulePath>false</surefire.useModulePath>` such
-that tests run using classpath and not module-path. We are doing this until all the tooling
-(Maven, IDE) improves in the area of testing with module-info.
-
-#### Eclipse IDE
-
-Right now we can't use Eclipse IDE to build Ebean and run its tests due to its poor support
-for java modules. See [ebean/issues/2653](https://github.com/ebean-orm/ebean/issues/2653)
-
-The current recommendation is to use IntelliJ IDEA as the IDE to build and hack Ebean.
+[Maven central - io.ebean](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.ebean%22%20)


-#### IntelliJ IDEA

-We want to get IntelliJ to run tests using classpath similar to Maven Surefire. To do this set:
-`JUnit -> modify options -> Do not use module-path option`
-
-To set this option as the global default for IntelliJ use:
-
-`Run - Edit Configurations -> Edit configuration templates -> JUnit -> modify options - Do not use module-path option`
-
-
-end
@@ -1,55 +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>13.23.0-jakarta</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-clickhouse</name>
-  <description>ebean-clickhouse composite</description>
-  <artifactId>ebean-clickhouse</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.23.0-jakarta</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>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.clickhouse.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.clickhouse {
-
-  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.clickhouse;
-
-}
@@ -1,7 +0,0 @@
-package io.ebean.cockroach.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.cockroach {
-
-  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;
-
-}
@@ -1,55 +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>13.23.0-jakarta</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-db2</name>
-  <description>ebean-db2 composite</description>
-  <artifactId>ebean-db2</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.23.0-jakarta</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>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-db2</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.db2.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.db2 {
-
-  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.db2;
-
-}
@@ -1,55 +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>13.23.0-jakarta</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-h2</name>
-  <description>ebean-h2 composite</description>
-  <artifactId>ebean-h2</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.23.0-jakarta</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>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.h2.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.h2 {
-
-  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.h2;
-
-}
@@ -1,55 +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>13.23.0-jakarta</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-hana</name>
-  <description>ebean-hana composite</description>
-  <artifactId>ebean-hana</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.23.0-jakarta</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>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-hana</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.hana.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.hana {
-
-  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.hana;
-
-}
@@ -1,55 +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>13.23.0-jakarta</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-mariadb</name>
-  <description>ebean-mariadb composite</description>
-  <artifactId>ebean-mariadb</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.23.0-jakarta</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>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.mariadb.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.mariadb {
-
-  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.mariadb;
-
-}
@@ -1,55 +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>13.23.0-jakarta</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-mysql</name>
-  <description>ebean-mysql composite</description>
-  <artifactId>ebean-mysql</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.23.0-jakarta</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>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.mysql.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.mysql {
-
-  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.mysql;
-
-}
@@ -1,55 +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>13.23.0-jakarta</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-nuodb</name>
-  <description>ebean-nuodb composite</description>
-  <artifactId>ebean-nuodb</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.23.0-jakarta</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>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.nuodb.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.nuodb {
-
-  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.nuodb;
-
-}
@@ -1,55 +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>13.23.0-jakarta</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-oracle</name>
-  <description>ebean-oracle composite</description>
-  <artifactId>ebean-oracle</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.23.0-jakarta</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>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.oracle.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.oracle {
-
-  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.oracle;
-
-}
@@ -1,79 +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>13.23.0-jakarta</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.6.0</postgres.jdbc.version>
-  </properties>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.23.0-jakarta</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>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.23.0-jakarta</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;
-
-}
@@ -1,55 +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>13.23.0-jakarta</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-postgres</name>
-  <description>ebean-postgres composite</description>
-  <artifactId>ebean-postgres</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.23.0-jakarta</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>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.postgres.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.postgres {
-
-  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;
-
-}
@@ -1,55 +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>13.23.0-jakarta</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-sqlite</name>
-  <description>ebean-sqlite composite</description>
-  <artifactId>ebean-sqlite</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.23.0-jakarta</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>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.sqlite.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.sqlite {
-
-  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.sqlite;
-
-}
@@ -1,55 +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>13.23.0-jakarta</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-sqlserver</name>
-  <description>ebean-sqlserver composite</description>
-  <artifactId>ebean-sqlserver</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.23.0-jakarta</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>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.sqlserver.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.sqlserver {
-
-  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.sqlserver;
-
-}
@@ -1,55 +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>13.23.0-jakarta</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-yugabyte</name>
-  <description>ebean-yugabyte composite</description>
-  <artifactId>ebean-yugabyte</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.23.0-jakarta</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>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.yugabyte.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.yugabyte {
-
-  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;
-
-}
@@ -1,73 +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>13.23.0-jakarta</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean (all platforms)</name>
-  <description>composite of common runtime dependencies for all platforms</description>
-  <artifactId>ebean</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-joda-time</artifactId>
-      <version>13.18.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.18.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.23.0-jakarta</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>13.23.0-jakarta</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-all</artifactId>
-      <version>13.23.0-jakarta</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,33 +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>13.23.0-jakarta</version>
-  </parent>
-
-  <artifactId>composites</artifactId>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>ebean</module>
-    <module>ebean-clickhouse</module>
-    <module>ebean-cockroach</module>
-    <module>ebean-db2</module>
-    <module>ebean-h2</module>
-    <module>ebean-hana</module>
-<!--    <module>hsqldb</module>-->
-    <module>ebean-mariadb</module>
-    <module>ebean-mysql</module>
-    <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>
-    <module>ebean-yugabyte</module>
-  </modules>
-
-</project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.23.0-jakarta</version>
+    <version>12.16.3-SNAPSHOT</version>
  </parent>

  <name>ebean api</name>
@@ -13,17 +13,21 @@

  <dependencies>

+    <!--
+    Projects are expected to explicit depend on version
+    of slf4j that they want to use
+    -->
    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-applog</artifactId>
-      <version>1.0</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>provided</scope>
    </dependency>

-    <!-- exclude avaje-applog-slf4j to direct logging to something else -->
    <dependency>
      <groupId>io.avaje</groupId>
-      <artifactId>avaje-applog-slf4j</artifactId>
-      <version>1.0</version>
+      <artifactId>avaje-config</artifactId>
+      <version>1.7</version>
    </dependency>

    <!--
@@ -33,31 +37,25 @@
    <dependency>
      <groupId>io.avaje</groupId>
      <artifactId>avaje-lang</artifactId>
-      <version>1.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-config</artifactId>
-      <version>3.8</version>
+      <version>1.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
-      <artifactId>jakarta-persistence-api</artifactId>
-      <version>${ebean-persistence-api.version}</version>
+      <artifactId>persistence-api</artifactId>
+      <version>2.2.5</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-annotation</artifactId>
-      <version>${ebean-annotation.version}</version>
+      <version>7.7</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-types</artifactId>
-      <version>${ebean-types.version}</version>
+      <version>2.2</version>
    </dependency>

    <dependency>
@@ -66,14 +64,6 @@
      <version>${ebean-datasource.version}</version>
    </dependency>

-    <!-- Support MdcBackgroundExecutorWrapper -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.36</version>
-      <optional>true</optional>
-    </dependency>
-
    <!-- Jackson core used internally by Ebean -->
    <dependency>
      <groupId>com.fasterxml.jackson.core</groupId>
@@ -90,22 +80,28 @@
      <optional>true</optional>
    </dependency>

-    <!-- JAVAX-DEPENDENCY-START ___
+    <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
+     and not require a separate module for it -->
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>${h2database.version}</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.transaction</groupId>
+      <artifactId>jta</artifactId>
+      <version>1.1</version>
+      <optional>true</optional>
+    </dependency>
+
    <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 -->
-    <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
-      <version>6.0.0</version>
-      <optional>true</optional>
-    </dependency>
-    <!-- JAKARTA-DEPENDENCY-END -->

    <dependency>
      <groupId>io.avaje</groupId>
@@ -117,22 +113,18 @@
  </dependencies>

  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>**/ebean-maven-version.txt</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>false</filtering>
-        <excludes>
-          <exclude>**/ebean-maven-version.txt</exclude>
-        </excludes>
-      </resource>
-    </resources>
+    <plugins>
+      <plugin>
+        <groupId>io.repaint.maven</groupId>
+        <artifactId>tiles-maven-plugin</artifactId>
+        <version>2.24</version>
+        <extensions>true</extensions>
+        <configuration>
+          <tiles>
+            <tile>io.avaje.tile:moditech-module:1.0</tile>
+          </tiles>
+        </configuration>
+      </plugin>
+    </plugins>
  </build>
-
 </project>
@@ -1,6 +1,6 @@
 package io.ebean;

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

 /**
 * Thrown when failing to acquire a pessimistic lock.
@@ -39,6 +39,26 @@ public interface BackgroundExecutor {
   */
  void execute(Runnable task);

+  /**
+   * Deprecated - migrate to scheduleWithFixedDelay().
+   * Execute a task periodically with a fixed delay between each execution.
+   * <p>
+   * For example, execute a runnable every minute.
+   * <p>
+   * The delay is the time between executions no matter how long the task took.
+   * That is, this method has the same behaviour characteristics as
+   * {@link ScheduledExecutorService#scheduleWithFixedDelay(Runnable, long, long, TimeUnit)}
+   */
+  @Deprecated
+  void executePeriodically(Runnable task, long delay, TimeUnit unit);
+
+  /**
+   * Deprecated - migrate to scheduleWithFixedDelay().
+   * Execute a task periodically additionally with an initial delay different from delay.
+   */
+  @Deprecated
+  void executePeriodically(Runnable task, long initialDelay, long delay, TimeUnit unit);
+
  /**
   * Execute a task periodically with a given delay.
   *
@@ -12,7 +12,6 @@ import java.util.Optional;
 * </p>
 * <pre>{@code
 *
- * @Component
 * public class CustomerFinder extends BeanFinder<Long,Customer> {
 *
 *   @Inject
@@ -27,31 +26,29 @@ import java.util.Optional;
 *
 * @param <I> The ID type
 * @param <T> The Bean type
- *
- * @see BeanRepository
 */
@NonNullApi
 public abstract class BeanFinder<I,T> {

-  protected final Database database;
+  protected final Database server;
  protected final Class<T> type;

  /**
   * Create with the given bean type and Database instance.
   *
   * @param type The bean type
-   * @param database The Database instance typically created via Spring factory or equivalent.
+   * @param server The Database instance typically created via Spring factory or equivalent.
   */
-  protected BeanFinder(Class<T> type, Database database) {
+  protected BeanFinder(Class<T> type, Database server) {
    this.type = type;
-    this.database = database;
+    this.server = server;
  }

  /**
   * Return the Database to use.
   */
  public Database db() {
-    return database;
+    return server;
  }

  /**
@@ -73,10 +70,10 @@ public abstract class BeanFinder<I,T> {
   * <p>
   * This is equivalent to {@link DB#byName(String)}
   *
-   * @param name The name of the Database. If this is null then the default Database is returned.
+   * @param server The name of the Database. If this is null then the default Database is returned.
   */
-  public Database db(String name) {
-    return DB.byName(name);
+  public Database db(String server) {
+    return DB.byName(server);
  }

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

+  /**
+   * Creates a query using the ORM query language.
+   */
+  protected Query<T> query(String ormQuery) {
+    return db().createQuery(type, ormQuery);
+  }
 }
@@ -6,15 +6,11 @@ import io.ebean.bean.EntityBean;
 import java.util.Collection;

 /**
- * Provides find and persist functionality for use with "Dependency Injection style" use of Ebean.
+ * Provides finder functionality for use with "Dependency Injection style" use of Ebean.
 * <p>
- * Extend the BeanRepository with additional finder and persisting methods as needed by the
- * application. The intention is to keep all the related logic together, for example, all the
- * persisting and finding logic for Customer would be in CustomerRepository.
- *
 * <pre>{@code
 *
- * @Component
+ * @Repository
 * public class CustomerRepository extends BeanRepository<Long,Customer> {
 *
 *   @Inject
@@ -54,10 +50,10 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
   * }</pre>
   *
   * @param type   The bean type
-   * @param database The Database instance typically created via Spring factory or equivalent
+   * @param server The Database instance typically created via Spring factory or equivalent
   */
-  protected BeanRepository(Class<T> type, Database database) {
-    super(type, database);
+  protected BeanRepository(Class<T> type, Database server) {
+    super(type, server);
  }

  /**
@@ -126,8 +122,8 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
  /**
   * Save all the beans in the collection.
   */
-  public int saveAll(Collection<T> beans) {
-    return db().saveAll(beans);
+  public int saveAll(Collection<T> bean) {
+    return db().saveAll(bean);
  }

  /**
@@ -74,16 +74,40 @@ public interface BeanState {
   */
  Set<String> loadedProps();

+  /**
+   * Deprecated migrate to loadedProps().
+   */
+  @Deprecated
+  default Set<String> getLoadedProps() {
+    return loadedProps();
+  }
+
  /**
   * Return the set of changed properties.
   */
  Set<String> changedProps();

+  /**
+   * Deprecated migrate to changedProps().
+   */
+  @Deprecated
+  default Set<String> getChangedProps() {
+    return changedProps();
+  }
+
  /**
   * Return a map of the updated properties and their new and old values.
   */
  Map<String, ValuePair> dirtyValues();

+  /**
+   * Deprecated migrate to dirtyValues().
+   */
+  @Deprecated
+  default Map<String, ValuePair> getDirtyValues() {
+    return dirtyValues();
+  }
+
  /**
   * Return true if the bean is readOnly.
   * <p>
@@ -115,9 +139,24 @@ public interface BeanState {
   */
  Map<String, Exception> loadErrors();

+  /**
+   * Deprecated migrate to loadErrors().
+   */
+  @Deprecated
+  default Map<String, Exception> getLoadErrors() {
+    return loadErrors();
+  }
+
  /**
   * Return the sort order value for an order column.
   */
  int sortOrder();

+  /**
+   * Deprecated migrate to sortOrder().
+   */
+  @Deprecated
+  default int getSortOrder() {
+    return sortOrder();
+  }
 }
@@ -5,10 +5,11 @@ import io.avaje.lang.Nullable;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.plugin.Property;
+import io.ebean.text.csv.CsvReader;
 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;
@@ -21,9 +22,10 @@ import java.util.concurrent.Callable;
 * DB additionally provides a convenient way to use the 'default' Database.
 * <p>
 * <h3>Default database</h3>
+ * <p>
 * One of the Database instances can be registered as the "default database"
 * and can be obtained using <code>DB.getDefault()</code>
- *
+ * </p>
 * <pre>{@code
 *
 * Database database = DB.getDefault();
@@ -34,7 +36,7 @@ import java.util.concurrent.Callable;
 * <p>
 * Multiple database instances can be registered with DB and we can obtain them
 * using <code>DB.byName()</code>
- *
+ * </p>
 * <pre>{@code
 *
 * Database hrDatabase = DB.byName("hr");
@@ -45,6 +47,7 @@ import java.util.concurrent.Callable;
 * <p>
 * DB has methods like {@link #find(Class)} and {@link #save(Object)} which are
 * just convenience for using the default database.
+ * </p>
 *
 * <pre>{@code
 *
@@ -114,26 +117,39 @@ public final class DB {
   * build the WHERE and HAVING clauses. Alternatively you can use the
   * ExpressionFactory directly to create expressions to add to the query where
   * clause.
+   * </p>
   * <p>
   * Alternatively you can use the {@link Expr} as a shortcut to the
   * ExpressionFactory of the 'Default' database.
+   * </p>
   * <p>
   * You generally need to the an ExpressionFactory (or {@link Expr}) to build
   * an expression that uses OR like Expression e = Expr.or(..., ...);
+   * </p>
   */
  public static ExpressionFactory expressionFactory() {
    return getDefault().expressionFactory();
  }

+  /**
+   * Deprecated migrate to expressionFactory().
+   */
+  @Deprecated
+  public static ExpressionFactory getExpressionFactory() {
+    return expressionFactory();
+  }
+
  /**
   * Return the next identity value for a given bean type.
   * <p>
   * This will only work when a IdGenerator is on this bean type such as a DB
   * sequence or UUID.
+   * </p>
   * <p>
   * For DB's supporting getGeneratedKeys and sequences such as Oracle10 you do
   * not need to use this method generally. It is made available for more
   * complex cases where it is useful to get an ID prior to some processing.
+   * </p>
   */
  public static Object nextId(Class<?> beanType) {
    return getDefault().nextId(beanType);
@@ -143,14 +159,17 @@ public final class DB {
   * Start a transaction with 'REQUIRED' semantics.
   * <p>
   * With REQUIRED semantics if an active transaction already exists that transaction will be used.
+   * </p>
   * <p>
   * The transaction is stored in a ThreadLocal variable and typically you only
   * need to use the returned Transaction <em>IF</em> you wish to do things like
   * use batch mode, change the transaction isolation level, use savepoints or
   * log comments to the transaction log.
+   * </p>
   * <p>
-   * Example of using a transaction to span multiple calls to find(), save() etc.
-   *
+   * Example of using a transaction to span multiple calls to find(), save()
+   * etc.
+   * </p>
   * <pre>{@code
   *
   *   try (Transaction transaction = DB.beginTransaction()) {
@@ -168,6 +187,7 @@ public final class DB {
   * With Database we can pass the transaction to the various find(), save() and execute()
   * methods. This gives us the ability to create the transactions externally from Ebean
   * and use the transaction explicitly via the various methods available on Database.
+   * </p>
   */
  public static Transaction beginTransaction() {
    return getDefault().beginTransaction();
@@ -179,6 +199,7 @@ public final class DB {
   * You will want to do this if you want multiple Transactions in a single
   * thread or generally use transactions outside of the TransactionThreadLocal
   * management.
+   * </p>
   */
  public static Transaction createTransaction() {
    return getDefault().createTransaction();
@@ -198,6 +219,7 @@ public final class DB {
   * <p>
   * Note that this provides an try finally alternative to using {@link #executeCall(TxScope, Callable)} or
   * {@link #execute(TxScope, Runnable)}.
+   * </p>
   * <p>
   * <h3>REQUIRES_NEW example:</h3>
   * <pre>{@code
@@ -237,7 +259,7 @@ public final class DB {
  }

  /**
-   * The batch will be flushing automatically but, you can use this to explicitly
+   * The batch will be flushing automatically but you can use this to explicitly
   * flush the batch if you like.
   * <p>
   * Flushing occurs automatically when:
@@ -256,7 +278,7 @@ public final class DB {

  /**
   * Register a TransactionCallback on the currently active transaction.
-   * <p>
+   * <p/>
   * If there is no currently active transaction then a PersistenceException is thrown.
   *
   * @param transactionCallback the transaction callback to be registered with the current transaction
@@ -267,21 +289,15 @@ public final class DB {
  }

  /**
-   * Deprecated for removal migrate using try-with-resources and commit on the transaction itself.
-   * <p>
   * Commit the current transaction.
   */
-  @Deprecated(forRemoval = true)
  public static void commitTransaction() {
    getDefault().commitTransaction();
  }

  /**
-   * Deprecated for removal migrate to using try-with-resources and rollback on the transaction itself.
-   * <p>
   * Rollback the current transaction.
   */
-  @Deprecated(forRemoval = true)
  public static void rollbackTransaction() {
    getDefault().rollbackTransaction();
  }
@@ -291,12 +307,14 @@ public final class DB {
   * rollback the transaction.
   * <p>
   * It is preferable to use <em>try with resources</em> rather than this.
+   * </p>
   * <p>
   * Useful to put in a finally block to ensure the transaction is ended, rather
   * than a rollbackTransaction() in each catch block.
+   * </p>
   * <p>
   * Code example:
-   *
+   * </p>
   * <pre>{@code
   *   DB.beginTransaction();
   *   try {
@@ -327,6 +345,7 @@ public final class DB {
   * <p>
   * When null is passed in for b, then the 'OldValues' of a is used for the
   * difference comparison.
+   * </p>
   */
  public static Map<String, ValuePair> diff(Object a, Object b) {
    return getDefault().diff(a, b);
@@ -337,15 +356,18 @@ public final class DB {
   * <p>
   * If there is no current transaction one will be created and committed for
   * you automatically.
+   * </p>
   * <p>
   * Save can cascade along relationships. For this to happen you need to
   * specify a cascade of CascadeType.ALL or CascadeType.PERSIST on the
   * OneToMany, OneToOne or ManyToMany annotation.
+   * </p>
   * <p>
   * When a save cascades via a OneToMany or ManyToMany Ebean will automatically
   * set the 'parent' object to the 'detail' object. In the example below in
   * saving the order and cascade saving the order details the 'parent' order
   * will be set against each order detail when it is saved.
+   * </p>
   */
  public static void save(Object bean) throws OptimisticLockException {
    getDefault().save(bean);
@@ -396,9 +418,11 @@ public final class DB {
   * <b>Stateless updates:</b> Note that the bean does not have to be previously fetched to call
   * update().You can create a new instance and set some of its properties programmatically for via
   * JSON/XML marshalling etc. This is described as a 'stateless update'.
+   * </p>
   * <p>
   * <b>Optimistic Locking: </b> Note that if the version property is not set when update() is
   * called then no optimistic locking is performed (internally ConcurrencyMode.NONE is used).
+   * </p>
   * <p>
   * <pre>{@code
   *
@@ -515,16 +539,20 @@ public final class DB {
   * Delete the bean.
   * <p>
   * This will return true if the bean was deleted successfully or JDBC batch is being used.
+   * </p>
   * <p>
   * If there is no current transaction one will be created and committed for
   * you automatically.
+   * </p>
   * <p>
   * If the bean is configured with <code>@SoftDelete</code> then this will perform a soft
   * delete rather than a hard/permanent delete.
+   * </p>
   * <p>
   * If the Bean does not have a version property (or loaded version property) and
   * the bean does not exist then this returns false indicating that nothing was
   * deleted. Note that, if JDBC batch mode is used then this always returns true.
+   * </p>
   */
  public static boolean delete(Object bean) throws OptimisticLockException {
    return getDefault().delete(bean);
@@ -584,6 +612,7 @@ public final class DB {
   * <p>
   * Note that this resets OneToMany and ManyToMany properties so that if they
   * are accessed a lazy load will refresh the many property.
+   * </p>
   */
  public static void refresh(Object bean) {
    getDefault().refresh(bean);
@@ -591,7 +620,6 @@ public final class DB {

  /**
   * Refresh a 'many' property of a bean.
-   *
   * <pre>{@code
   *
   *   Order order = ...;
@@ -612,7 +640,7 @@ public final class DB {
   * Get a reference object.
   * <p>
   * This is sometimes described as a proxy (with lazy loading).
-   *
+   * </p>
   * <pre>{@code
   *
   *   Product product = DB.getReference(Product.class, 1);
@@ -633,6 +661,14 @@ public final class DB {
    return getDefault().reference(beanType, id);
  }

+  /**
+   * Deprecated migrate to beanId().
+   */
+  @Deprecated
+  public static <T> T getReference(Class<T> beanType, Object id) {
+    return reference(beanType, id);
+  }
+
  /**
   * Sort the list using the sortByClause which can contain a comma delimited
   * list of property names and keywords asc, desc, nullsHigh and nullsLow.
@@ -648,7 +684,7 @@ public final class DB {
   * <p>
   * Note that the sorting uses a Comparator and Collections.sort(); and does
   * not invoke a DB query.
-   *
+   * </p>
   * <pre>{@code
   *
   *   // find orders and their customers
@@ -683,8 +719,9 @@ public final class DB {
   *
   * }</pre>
   * <p>
-   * If you want more control over the query then you can use createQuery() and Query.findOne();
-   *
+   * If you want more control over the query then you can use createQuery() and
+   * Query.findOne();
+   * </p>
   * <pre>{@code
   *
   *   // ... additionally fetching customer, customer shipping address,
@@ -724,25 +761,40 @@ public final class DB {
  }

  /**
-   * Look to execute a native sql query that does not return beans but instead
-   * returns SqlRow or uses {@link RowMapper}.
+   * Look to execute a native sql query that does not returns beans but instead
+   * returns SqlRow or direct access to ResultSet (see {@link SqlQuery#findList(RowMapper)}.
+   *
   * <p>
   * Refer to {@link DtoQuery} for native sql queries returning DTO beans.
+   * </p>
   * <p>
   * Refer to {@link #findNative(Class, String)} for native sql queries returning entity beans.
+   * </p>
   */
  public static SqlQuery sqlQuery(String sql) {
    return getDefault().sqlQuery(sql);
  }

+  /**
+   * Deprecated - migrate to sqlQuery().
+   * <p>
+   * This is an alias for {@link #sqlQuery(String)}.
+   */
+  @Deprecated
+  public static SqlQuery createSqlQuery(String sql) {
+    return sqlQuery(sql);
+  }
+
  /**
   * Look to execute a native sql insert update or delete statement.
   * <p>
   * Use this to execute a Insert Update or Delete statement. The statement will
   * be native to the database and contain database table and column names.
+   * </p>
   *
   * <p>
   * See {@link SqlUpdate} for example usage.
+   * </p>
   *
   * @return The SqlUpdate instance to set parameters and execute
   */
@@ -750,6 +802,16 @@ public final class DB {
    return getDefault().sqlUpdate(sql);
  }

+  /**
+   * Deprecated - migrate to sqlUpdate().
+   * <p>
+   * This is an alias for {@link #sqlUpdate(String)}.
+   */
+  @Deprecated
+  public static SqlUpdate createSqlUpdate(String sql) {
+    return sqlUpdate(sql);
+  }
+
  /**
   * Create a CallableSql to execute a given stored procedure.
   *
@@ -766,9 +828,10 @@ public final class DB {
   * <p>
   * The orm update differs from the sql update in that it you can use the bean
   * name and bean property names rather than table and column names.
+   * </p>
   * <p>
   * An example:
-   *
+   * </p>
   * <pre>{@code
   *
   *   // The bean name and properties - "topic","postCount" and "id"
@@ -790,17 +853,42 @@ public final class DB {
    return getDefault().createUpdate(beanType, ormUpdate);
  }

+  /**
+   * Create a CsvReader for a given beanType.
+   */
+  public static <T> CsvReader<T> createCsvReader(Class<T> beanType) {
+    return getDefault().createCsvReader(beanType);
+  }
+
+  /**
+   * Create a named query.
+   * <p>
+   * For RawSql the named query is expected to be in ebean.xml.
+   * </p>
+   *
+   * @param beanType   The type of entity bean
+   * @param namedQuery The name of the query
+   * @param <T>        The type of entity bean
+   * @return The query
+   */
+  public static <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery) {
+    return getDefault().createNamedQuery(beanType, namedQuery);
+  }
+
  /**
   * Create a query for a type of entity bean.
   * <p>
   * You can use the methods on the Query object to specify fetch paths,
   * predicates, order by, limits etc.
+   * </p>
   * <p>
   * You then use findList(), findSet(), findMap() and findOne() to execute
   * the query and return the collection or bean.
+   * </p>
   * <p>
   * Note that a query executed by {@link Query#findList()} etc will execute against
   * the same database from which is was created.
+   * </p>
   *
   * @param beanType the class of entity to be fetched
   * @return A ORM Query for this beanType
@@ -809,12 +897,50 @@ public final class DB {
    return getDefault().createQuery(beanType);
  }

+  /**
+   * Parse the Ebean query language statement returning the query which can then
+   * be modified (add expressions, change order by clause, change maxRows, change
+   * fetch and select paths etc).
+   * <p>
+   * <h3>Example</h3>
+   * <pre>{@code
+   *
+   *   // Find order additionally fetching the customer, details and details.product name.
+   *
+   *   String eql = "fetch customer fetch details fetch details.product (name) where id = :orderId ";
+   *
+   *   Query<Order> query = DB.createQuery(Order.class, eql);
+   *   query.setParameter("orderId", 2);
+   *
+   *   Order order = query.findOne();
+   *
+   *   // This is the same as:
+   *
+   *   Order order = DB.find(Order.class)
+   *     .fetch("customer")
+   *     .fetch("details")
+   *     .fetch("detail.product", "name")
+   *     .setId(2)
+   *     .findOne();
+   *
+   * }</pre>
+   *
+   * @param beanType The type of bean to fetch
+   * @param eql      The Ebean query
+   * @param <T>      The type of the entity bean
+   * @return The query with expressions defined as per the parsed query statement
+   */
+  public static <T> Query<T> createQuery(Class<T> beanType, String eql) {
+    return getDefault().createQuery(beanType, eql);
+  }
+
  /**
   * Create a query for a type of entity bean.
   * <p>
   * This is actually the same as {@link #createQuery(Class)}. The reason it
   * exists is that people used to JPA will probably be looking for a
   * createQuery method (the same as entityManager).
+   * </p>
   *
   * @param beanType the type of entity bean to find
   * @return A ORM Query object for this beanType
@@ -827,7 +953,7 @@ public final class DB {
   * Create a query using native SQL.
   * <p>
   * The native SQL can contain named parameters or positioned parameters.
-   *
+   * </p>
   * <pre>{@code
   *
   *   String sql = "select c.id, c.name from customer c where c.name like ? order by c.name";
@@ -852,6 +978,7 @@ public final class DB {
   * <p>
   * DTO beans are just normal bean like classes with public constructor(s) and setters.
   * They do not need to be registered with Ebean before use.
+   * </p>
   *
   * @param dtoType The type of the DTO bean the rows will be mapped into.
   * @param sql     The SQL query to execute.
@@ -888,8 +1015,10 @@ public final class DB {
   * going back to the database.
   * <p>
   * This produces and returns a new list with the sort and filters applied.
+   * </p>
   * <p>
   * Refer to {@link Filter} for an example of its use.
+   * </p>
   */
  public static <T> Filter<T> filter(Class<T> beanType) {
    return getDefault().filter(beanType);
@@ -900,7 +1029,7 @@ public final class DB {
   * <p>
   * The scope can control the transaction type, isolation and rollback
   * semantics.
-   *
+   * </p>
   * <pre>{@code
   *
   * // set specific transactional scope settings
@@ -908,7 +1037,7 @@ public final class DB {
   *
   * DB.execute(scope, new TxRunnable() {
   *   public void run() {
-   *     User u1 = DB.find(User.class, 1);
+   * 	   User u1 = DB.find(User.class, 1);
   *     ...
   *   }
   * });
@@ -924,7 +1053,7 @@ public final class DB {
   * <p>
   * The default scope runs with REQUIRED and by default will rollback on any
   * exception (checked or runtime).
-   *
+   * </p>
   * <pre>{@code
   *
   * DB.execute(() -> {
@@ -949,7 +1078,7 @@ public final class DB {
   * <p>
   * The scope can control the transaction type, isolation and rollback
   * semantics.
-   *
+   * </p>
   * <pre>{@code
   *
   * // set specific transactional scope settings
@@ -957,9 +1086,9 @@ public final class DB {
   *
   * DB.executeCall(scope, new Callable<String>() {
   *   public String call() {
-   *     User u1 = DB.find(User.class, 1);
-   *     ...
-   *     return u1.getEmail();
+   * 	   User u1 = DB.find(User.class, 1);
+   * 		 ...
+   * 		 return u1.getEmail();
   *   }
   * });
   * }</pre>
@@ -973,10 +1102,11 @@ public final class DB {
   * <p>
   * The default scope runs with REQUIRED and by default will rollback on any
   * exception (checked or runtime).
+   * </p>
   * <p>
   * This is basically the same as TxRunnable except that it returns an Object
   * (and you specify the return type via generics).
-   *
+   * </p>
   * <pre>{@code
   *
   * DB.executeCall(() -> {
@@ -1005,19 +1135,23 @@ public final class DB {
   * <p>
   * If you use DB.execute(UpdateSql) then the table modification information
   * is automatically deduced and you do not need to call this method yourself.
+   * </p>
   * <p>
   * This information is used to invalidate objects out of the cache and
   * potentially text indexes. This information is also automatically broadcast
   * across the cluster.
+   * </p>
   * <p>
   * If there is a transaction then this information is placed into the current
   * transactions event information. When the transaction is committed this
   * information is registered (with the transaction manager). If this
   * transaction is rolled back then none of the transaction event information
   * registers including the information you put in via this method.
+   * </p>
   * <p>
   * If there is NO current transaction when you call this method then this
   * information is registered immediately (with the transaction manager).
+   * </p>
   *
   * @param tableName the name of the table that was modified
   * @param inserts   true if rows where inserted into the table
@@ -1032,11 +1166,20 @@ public final class DB {
   * Return the BeanState for a given entity bean.
   * <p>
   * This will return null if the bean is not an enhanced entity bean.
+   * </p>
   */
  public static BeanState beanState(Object bean) {
    return getDefault().beanState(bean);
  }

+  /**
+   * Deprecated migrate to beanState().
+   */
+  @Deprecated
+  public static BeanState getBeanState(Object bean) {
+    return beanState(bean);
+  }
+
  /**
   * Return the value of the Id property for a given bean.
   */
@@ -1044,6 +1187,14 @@ public final class DB {
    return getDefault().beanId(bean);
  }

+  /**
+   * Deprecated migrate to beanId().
+   */
+  @Deprecated
+  public static Object getBeanId(Object bean) {
+    return beanId(bean);
+  }
+
  /**
   * Load and lock the bean using {@code select for update}.
   * <p>
@@ -1059,6 +1210,14 @@ public final class DB {
    getDefault().lock(bean);
  }

+  /**
+   * Deprecated migrate to cacheManager().
+   */
+  @Deprecated
+  public static ServerCacheManager getServerCacheManager() {
+    return getDefault().cacheManager();
+  }
+
  /**
   * Return the manager of the level 2 cache ("L2" cache).
   */
@@ -1074,6 +1233,14 @@ public final class DB {
    return getDefault().backgroundExecutor();
  }

+  /**
+   * Deprecated migrate to backgroundExecutor().
+   */
+  @Deprecated
+  public static BackgroundExecutor getBackgroundExecutor() {
+    return backgroundExecutor();
+  }
+
  /**
   * Return the JsonContext for reading/writing JSON.
   */
@@ -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,6 +1,6 @@
 package io.ebean;

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

 /**
 * Thrown when a foreign key constraint is enforced.
@@ -5,7 +5,7 @@ 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;
@@ -26,7 +26,7 @@ import java.util.concurrent.locks.ReentrantLock;
 * methods on the DB singleton such as {@link DB#find(Class)} are just a
 * convenient way of using the 'default/primary' Database.
 */
-public final class DatabaseFactory {
+public class DatabaseFactory {

  private static final ReentrantLock lock = new ReentrantLock();
  private static SpiContainer container;
@@ -2,20 +2,20 @@ package io.ebean;

 import io.ebean.config.BeanNotEnhancedException;
 import io.ebean.datasource.DataSourceConfigurationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

-import jakarta.persistence.PersistenceException;
+import javax.persistence.PersistenceException;
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;

-import static java.lang.System.Logger.Level.ERROR;
-
 /**
 * Holds Database instances.
 */
 final class DbContext {

-  private static final System.Logger log = EbeanVersion.log;
+  private static final Logger log = LoggerFactory.getLogger("io.ebean");
  static {
    EbeanVersion.getVersion();
  }
@@ -23,9 +23,14 @@ final class DbContext {
  private static final DbContext INSTANCE = new DbContext();

  private final ConcurrentHashMap<String, Database> concMap = new ConcurrentHashMap<>();
+
  private final HashMap<String, Database> syncMap = new HashMap<>();
+
  private final ReentrantLock lock = new ReentrantLock();

+  /**
+   * The 'default' Database.
+   */
  private Database defaultDatabase;

  private DbContext() {
@@ -38,19 +43,16 @@ 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) {
-      log.log(ERROR, "Error trying to create the default Database", e);
+      log.error("Error trying to create the default Database", e);
      throw new RuntimeException(e);
    }
  }
@@ -67,9 +69,9 @@ final class DbContext {
   */
  Database getDefault() {
    if (defaultDatabase == null) {
-      String msg = "The default Database has not been defined?"
-        + " This is normally set via the ebean.datasource.default property."
-        + " Otherwise it should be registered programmatically via registerServer()";
+      String msg = "The default Database has not been defined?";
+      msg += " This is normally set via the ebean.datasource.default property.";
+      msg += " Otherwise it should be registered programmatically via registerServer()";
      throw new PersistenceException(msg);
    }
    return defaultDatabase;
@@ -10,7 +10,7 @@ import java.util.concurrent.locks.ReentrantLock;
 * <p/>
 * Intended for internal use as part of bootup, construction, registration of the default database.
 */
-final class DbPrimary {
+class DbPrimary {

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

-  /**
-   * Bind the named parameter to SQL NULL.
-   */
-  DtoQuery<T> setNullParameter(String name, int jdbcType);
-
  /**
   * Bind the named multi-value array parameter which we would use with Postgres ANY.
   * <p>
@@ -146,11 +141,6 @@ public interface DtoQuery<T> extends CancelableQuery {
   */
  DtoQuery<T> setParameter(int position, Object value);

-  /**
-   * Set a positioned parameter to SQL NULL.
-   */
-  DtoQuery<T> setNullParameter(int position, int jdbcType);
-
  /**
   * Set the index of the first row of the results to return.
   */
@@ -205,16 +195,4 @@ public interface DtoQuery<T> extends CancelableQuery {
   * Use the explicit transaction to execute the query.
   */
  DtoQuery<T> usingTransaction(Transaction transaction);
-
-  /**
-   * Ensure that the master DataSource is used if there is a read only data source
-   * being used (that is using a read replica database potentially with replication lag).
-   * <p>
-   * When the database is configured with a read-only DataSource via
-   * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
-   * by default when a query is run without an active transaction, it uses the read-only data
-   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
-   * against the master data source.
-   */
-  DtoQuery<T> usingMaster();
 }
@@ -2,28 +2,6 @@ package io.ebean;

 /**
 * Thrown when a duplicate is attempted on a unique constraint.
- * <p>
- * In terms of catching this exception with the view of continuing processing
- * using the same transaction look to use {@link Transaction#rollbackAndContinue()}.
- *
- * <pre>{@code
- *
- *   try (Transaction txn = database.beginTransaction()) {
- *
- *     try {
- *       ...
- *       database.save(bean);
- *       database.flush();
- *     } catch (DuplicateKeyException e) {
- *       // carry on processing using the transaction
- *       txn.rollbackAndContinue();
- *       ...
- *     }
- *
- *     txn.commit();
- *   }
- *
- * }</pre>
 */
 public class DuplicateKeyException extends DataIntegrityException {
  private static final long serialVersionUID = -4771932723285724817L;
@@ -0,0 +1,15 @@
+package io.ebean;
+
+/**
+ * Deprecated - please migrate to <code>io.ebean.Database</code>.
+ * Provides the API for fetching and saving beans to a particular Database.
+ * <p>
+ * Effectively this is an alias for {@link Database} which is now the new
+ * and improved name for EbeanServer.
+ * <p>
+ * The preference is to use DB and Database rather than Ebean and EbeanServer.
+ */
+@Deprecated
+public interface EbeanServer extends Database {
+
+}
@@ -0,0 +1,70 @@
+package io.ebean;
+
+import io.ebean.config.ContainerConfig;
+import io.ebean.config.ServerConfig;
+
+/**
+ * Deprecated - please migrate to DatabaseFactory.
+ * <p>
+ * Creates EbeanServer instances.
+ * <p>
+ * This uses either a ServerConfig or properties in the ebean.properties file to
+ * configure and create a EbeanServer instance.
+ * </p>
+ * <p>
+ * The EbeanServer instance can either be registered with the Ebean singleton or
+ * not. The Ebean singleton effectively holds a map of EbeanServers by a name.
+ * If the EbeanServer is registered with the Ebean singleton you can retrieve it
+ * later via {@link Ebean#getServer(String)}.
+ * </p>
+ * <p>
+ * One EbeanServer can be nominated as the 'default/primary' EbeanServer. Many
+ * methods on the Ebean singleton such as {@link Ebean#find(Class)} are just a
+ * convenient way of using the 'default/primary' EbeanServer.
+ * </p>
+ */
+@Deprecated
+public class EbeanServerFactory {
+
+  /**
+   * Initialise the container with clustering configuration.
+   * <p>
+   * Call this prior to creating any EbeanServer instances or alternatively set the
+   * ContainerConfig on the ServerConfig when creating the first EbeanServer instance.
+   */
+  public static void initialiseContainer(ContainerConfig containerConfig) {
+    DatabaseFactory.initialiseContainer(containerConfig);
+  }
+
+  /**
+   * Create using ebean.properties to configure the database.
+   */
+  public static EbeanServer create(String name) {
+    return (EbeanServer)DatabaseFactory.create(name);
+  }
+
+  /**
+   * Create using the ServerConfig object to configure the database.
+   */
+  public static EbeanServer create(ServerConfig config) {
+    return (EbeanServer)DatabaseFactory.create(config);
+  }
+
+  /**
+   * Create using the ServerConfig additionally specifying a classLoader to use as the context class loader.
+   */
+  public static EbeanServer createWithContextClassLoader(ServerConfig config, ClassLoader classLoader) {
+    return (EbeanServer)DatabaseFactory.createWithContextClassLoader(config, classLoader);
+  }
+
+  /**
+   * Shutdown gracefully all EbeanServers cleaning up any resources as required.
+   * <p>
+   * This is typically invoked via JVM shutdown hook and not explicitly called.
+   * </p>
+   */
+  public static void shutdown() {
+    DatabaseFactory.shutdown();
+  }
+
+}
@@ -1,23 +1,20 @@
 package io.ebean;

-import io.avaje.applog.AppLog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
 import java.util.Properties;

-import static java.lang.System.Logger.Level.*;
-
 /**
 * Class to determine the ebean version.
 *
 * @author Roland Praml, FOCONIS AG
 */
-public final class EbeanVersion {
+public class EbeanVersion {

-  public static final System.Logger log = AppLog.getLogger("io.ebean");
+  private static final Logger log = LoggerFactory.getLogger("io.ebean");

  /**
   * Maintain the minimum ebean-agent version manually based on required ebean-agent bug fixes.
@@ -25,7 +22,6 @@ public final class EbeanVersion {
  private static final int MIN_AGENT_MAJOR_VERSION = 12;
  private static final int MIN_AGENT_MINOR_VERSION = 12;
  private static String version = "unknown";
-
  static {
    readVersion();
    checkAgentVersion();
@@ -33,16 +29,14 @@ public final class EbeanVersion {

  private static void readVersion() {
    try {
-      try (InputStream in = ClassLoader.getSystemResourceAsStream("META-INF/ebean-maven-version.txt")) {
+      try (InputStream in = ClassLoader.getSystemResourceAsStream("META-INF/maven/io.ebean/ebean-api/pom.properties")) {
        if (in != null) {
-          try (LineNumberReader reader = new LineNumberReader(new InputStreamReader(in))) {
-            version = reader.readLine();
-            log.log(INFO, "ebean version: {0}", version);
-          }
+          version = readVersion(in);
        }
      }
+      log.info("ebean version: {}", version);
    } catch (IOException e) {
-      log.log(WARNING, "Could not determine ebean version: {0}", e.getMessage());
+      log.warn("Could not determine ebean version: {}", e.getMessage());
    }
  }

@@ -54,13 +48,13 @@ public final class EbeanVersion {
          String agentVersion = readVersion(in);
          if (agentVersion != null) {
            if (checkMinAgentVersion(agentVersion)) {
-              log.log(ERROR, "Expected minimum ebean-agent version {0}.{1}.0 but we have {2}, please update the ebean-agent", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, agentVersion);
+              log.error("Expected minimum ebean-agent version {}.{}.0 but we have {}, please update the ebean-agent", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, agentVersion);
            }
          }
        }
      }
    } catch (IOException e) {
-      log.log(WARNING, "Could not check minimum ebean-agent version {0}.{1}.0 required due to - {2}", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, e.getMessage());
+      log.warn("Could not check minimum ebean-agent version {}.{}.0 required due to - {}", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, e.getMessage());
    }
  }

@@ -94,7 +88,7 @@ public final class EbeanVersion {
  }

  /**
-   * Returns the ebean version (read from META-INF/ebean-maven-version.txt)
+   * Returns the ebean version (read from /META-INF/maven/io.ebean/ebean/pom.properties)
   */
  public static String getVersion() {
    return version;
@@ -25,30 +25,23 @@ import java.util.Map;
 *
 * @see Query#where()
 */
-public final class Expr {
+public class Expr {

  private Expr() {
  }

-  /**
-   * Return the underlying expression factory.
-   */
-  public static ExpressionFactory factory() {
-    return DB.expressionFactory();
-  }
-
  /**
   * Equal To - property equal to the given value.
   */
  public static Expression eq(String propertyName, Object value) {
-    return factory().eq(propertyName, value);
+    return DB.expressionFactory().eq(propertyName, value);
  }

  /**
   * Not Equal To - property not equal to the given value.
   */
  public static Expression ne(String propertyName, Object value) {
-    return factory().ne(propertyName, value);
+    return DB.expressionFactory().ne(propertyName, value);
  }

  /**
@@ -56,7 +49,7 @@ public final class Expr {
   * using a lower() function to make it case insensitive).
   */
  public static Expression ieq(String propertyName, String value) {
-    return factory().ieq(propertyName, value);
+    return DB.expressionFactory().ieq(propertyName, value);
  }

  /**
@@ -66,28 +59,28 @@ public final class Expr {
   * </p>
   */
  public static Expression inRange(String propertyName, Object value1, Object value2) {
-    return factory().inRange(propertyName, value1, value2);
+    return DB.expressionFactory().inRange(propertyName, value1, value2);
  }

  /**
   * Between - property between the two given values.
   */
  public static Expression between(String propertyName, Object value1, Object value2) {
-    return factory().between(propertyName, value1, value2);
+    return DB.expressionFactory().between(propertyName, value1, value2);
  }

  /**
   * Between - value between two given properties.
   */
  public static Expression between(String lowProperty, String highProperty, Object value) {
-    return factory().betweenProperties(lowProperty, highProperty, value);
+    return DB.expressionFactory().betweenProperties(lowProperty, highProperty, value);
  }

  /**
   * Greater Than - property greater than the given value.
   */
  public static Expression gt(String propertyName, Object value) {
-    return factory().gt(propertyName, value);
+    return DB.expressionFactory().gt(propertyName, value);
  }

  /**
@@ -95,42 +88,42 @@ public final class Expr {
   * value.
   */
  public static Expression ge(String propertyName, Object value) {
-    return factory().ge(propertyName, value);
+    return DB.expressionFactory().ge(propertyName, value);
  }

  /**
   * Less Than - property less than the given value.
   */
  public static Expression lt(String propertyName, Object value) {
-    return factory().lt(propertyName, value);
+    return DB.expressionFactory().lt(propertyName, value);
  }

  /**
   * Less Than or Equal to - property less than or equal to the given value.
   */
  public static Expression le(String propertyName, Object value) {
-    return factory().le(propertyName, value);
+    return DB.expressionFactory().le(propertyName, value);
  }

  /**
   * Is Null - property is null.
   */
  public static Expression isNull(String propertyName) {
-    return factory().isNull(propertyName);
+    return DB.expressionFactory().isNull(propertyName);
  }

  /**
   * Is Not Null - property is not null.
   */
  public static Expression isNotNull(String propertyName) {
-    return factory().isNotNull(propertyName);
+    return DB.expressionFactory().isNotNull(propertyName);
  }

  /**
   * Case insensitive {@link #exampleLike(Object)}
   */
  public static ExampleExpression iexampleLike(Object example) {
-    return factory().iexampleLike(example);
+    return DB.expressionFactory().iexampleLike(example);
  }

  /**
@@ -138,14 +131,14 @@ public final class Expr {
   * LikeType.RAW (you need to add you own wildcards % and _).
   */
  public static ExampleExpression exampleLike(Object example) {
-    return factory().exampleLike(example);
+    return DB.expressionFactory().exampleLike(example);
  }

  /**
   * Create the query by Example expression specifying more options.
   */
  public static ExampleExpression exampleLike(Object example, boolean caseInsensitive, LikeType likeType) {
-    return factory().exampleLike(example, caseInsensitive, likeType);
+    return DB.expressionFactory().exampleLike(example, caseInsensitive, likeType);
  }

  /**
@@ -153,7 +146,7 @@ public final class Expr {
   * characters % (percentage) and _ (underscore).
   */
  public static Expression like(String propertyName, String value) {
-    return factory().like(propertyName, value);
+    return DB.expressionFactory().like(propertyName, value);
  }

  /**
@@ -162,14 +155,14 @@ public final class Expr {
   * a lower() function to make the expression case insensitive.
   */
  public static Expression ilike(String propertyName, String value) {
-    return factory().ilike(propertyName, value);
+    return DB.expressionFactory().ilike(propertyName, value);
  }

  /**
   * Starts With - property like value%.
   */
  public static Expression startsWith(String propertyName, String value) {
-    return factory().startsWith(propertyName, value);
+    return DB.expressionFactory().startsWith(propertyName, value);
  }

  /**
@@ -177,14 +170,14 @@ public final class Expr {
   * lower() function to make the expression case insensitive.
   */
  public static Expression istartsWith(String propertyName, String value) {
-    return factory().istartsWith(propertyName, value);
+    return DB.expressionFactory().istartsWith(propertyName, value);
  }

  /**
   * Ends With - property like %value.
   */
  public static Expression endsWith(String propertyName, String value) {
-    return factory().endsWith(propertyName, value);
+    return DB.expressionFactory().endsWith(propertyName, value);
  }

  /**
@@ -192,14 +185,14 @@ public final class Expr {
   * function to make the expression case insensitive.
   */
  public static Expression iendsWith(String propertyName, String value) {
-    return factory().iendsWith(propertyName, value);
+    return DB.expressionFactory().iendsWith(propertyName, value);
  }

  /**
   * Contains - property like %value%.
   */
  public static Expression contains(String propertyName, String value) {
-    return factory().contains(propertyName, value);
+    return DB.expressionFactory().contains(propertyName, value);
  }

  /**
@@ -207,42 +200,42 @@ public final class Expr {
   * function to make the expression case insensitive.
   */
  public static Expression icontains(String propertyName, String value) {
-    return factory().icontains(propertyName, value);
+    return DB.expressionFactory().icontains(propertyName, value);
  }

  /**
   * For collection properties that are empty (have not existing elements).
   */
  public static Expression isEmpty(String propertyName) {
-    return factory().isEmpty(propertyName);
+    return DB.expressionFactory().isEmpty(propertyName);
  }

  /**
   * For collection properties that are not empty (have existing elements).
   */
  public static Expression isNotEmpty(String propertyName) {
-    return factory().isNotEmpty(propertyName);
+    return DB.expressionFactory().isNotEmpty(propertyName);
  }

  /**
   * In - property has a value in the array of values.
   */
  public static Expression in(String propertyName, Object[] values) {
-    return factory().in(propertyName, values);
+    return DB.expressionFactory().in(propertyName, values);
  }

  /**
   * In - using a subQuery.
   */
  public static Expression in(String propertyName, Query<?> subQuery) {
-    return factory().in(propertyName, subQuery);
+    return DB.expressionFactory().in(propertyName, subQuery);
  }

  /**
   * In - property has a value in the collection of values.
   */
  public static Expression in(String propertyName, Collection<?> values) {
-    return factory().in(propertyName, values);
+    return DB.expressionFactory().in(propertyName, values);
  }

  /**
@@ -279,14 +272,14 @@ public final class Expr {
   * }</pre>
   */
  public static Expression inOrEmpty(String propertyName, Collection<?> values) {
-    return factory().inOrEmpty(propertyName, values);
+    return DB.expressionFactory().inOrEmpty(propertyName, values);
  }

  /**
   * Id Equal to - ID property is equal to the value.
   */
  public static Expression idEq(Object value) {
-    return factory().idEq(value);
+    return DB.expressionFactory().idEq(value);
  }

  /**
@@ -299,7 +292,7 @@ public final class Expr {
   * @param propertyMap a map keyed by property names.
   */
  public static Expression allEq(Map<String, Object> propertyMap) {
-    return factory().allEq(propertyMap);
+    return DB.expressionFactory().allEq(propertyMap);
  }

  /**
@@ -310,7 +303,7 @@ public final class Expr {
   * </p>
   */
  public static Expression raw(String raw, Object value) {
-    return factory().raw(raw, value);
+    return DB.expressionFactory().raw(raw, value);
  }

  /**
@@ -321,48 +314,48 @@ public final class Expr {
   * </p>
   */
  public static Expression raw(String raw, Object[] values) {
-    return factory().raw(raw, values);
+    return DB.expressionFactory().raw(raw, values);
  }

  /**
   * Add raw expression with no parameters.
   */
  public static Expression raw(String raw) {
-    return factory().raw(raw);
+    return DB.expressionFactory().raw(raw);
  }

  /**
   * And - join two expressions with a logical and.
   */
  public static Expression and(Expression expOne, Expression expTwo) {
-    return factory().and(expOne, expTwo);
+    return DB.expressionFactory().and(expOne, expTwo);
  }

  /**
   * Or - join two expressions with a logical or.
   */
  public static Expression or(Expression expOne, Expression expTwo) {
-    return factory().or(expOne, expTwo);
+    return DB.expressionFactory().or(expOne, expTwo);
  }

  /**
   * Negate the expression (prefix it with NOT).
   */
  public static Expression not(Expression exp) {
-    return factory().not(exp);
+    return DB.expressionFactory().not(exp);
  }

  /**
   * Return a list of expressions that will be joined by AND's.
   */
  public static <T> Junction<T> conjunction(Query<T> query) {
-    return factory().conjunction(query);
+    return DB.expressionFactory().conjunction(query);
  }

  /**
   * Return a list of expressions that will be joined by OR's.
   */
  public static <T> Junction<T> disjunction(Query<T> query) {
-    return factory().disjunction(query);
+    return DB.expressionFactory().disjunction(query);
  }
 }
@@ -1,5 +1,11 @@
 package io.ebean;

+import io.ebean.search.Match;
+import io.ebean.search.MultiMatch;
+import io.ebean.search.TextCommonTerms;
+import io.ebean.search.TextQueryString;
+import io.ebean.search.TextSimple;
+
 import java.util.Collection;
 import java.util.Map;

@@ -34,11 +40,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.
   */
@@ -116,11 +117,6 @@ public interface ExpressionFactory {
   */
  Expression arrayIsNotEmpty(String propertyName);

-  /**
-   * Equal To the result of a sub-query.
-   */
-  Expression eq(String propertyName, Query<?> subQuery);
-
  /**
   * Equal To - property equal to the given value.
   */
@@ -131,11 +127,6 @@ public interface ExpressionFactory {
   */
  Expression eqOrNull(String propertyName, Object value);

-  /**
-   * Not Equal To the result of a sub-query.
-   */
-  Expression ne(String propertyName, Query<?> subQuery);
-
  /**
   * Not Equal To - property not equal to the given value.
   */
@@ -190,23 +181,6 @@ public interface ExpressionFactory {
   */
  Expression inRangeWith(String lowProperty, String highProperty, Object value);

-  /**
-   * A Property is in Range between 2 properties.
-   *
-   * <pre>{@code
-   *
-   *    .orderDate.inRangeWith(QOrder.Alias.product.startDate, QOrder.Alias.product.endDate)
-   *
-   *    // which equates to
-   *    product.startDate <= orderDate and (orderDate < product.endDate or product.endDate is null)
-   *
-   * }</pre>
-   *
-   * <p>
-   * This is a convenience expression combining a number of simple expressions.
-   */
-  Expression inRangeWithProperties(String propertyName, String lowProperty, String highProperty);
-
  /**
   * Between - property between the two given values.
   */
@@ -233,21 +207,11 @@ public interface ExpressionFactory {
   */
  Expression geOrNull(String propertyName, Object value);

-  /**
-   * Greater Than the result of a sub-query.
-   */
-  Expression gt(String propertyName, Query<?> subQuery);
-
  /**
   * Greater Than - property greater than the given value.
   */
  Expression gt(String propertyName, Object value);

-  /**
-   * Greater Than or Equal to the result of a sub-query.
-   */
-  Expression ge(String propertyName, Query<?> subQuery);
-
  /**
   * Greater Than or Equal to - property greater than or equal to the given
   * value.
@@ -270,21 +234,11 @@ public interface ExpressionFactory {
   */
  Expression leOrNull(String propertyName, Object value);

-  /**
-   * Less Than the result of a sub-query.
-   */
-  Expression lt(String propertyName, Query<?> subQuery);
-
  /**
   * Less Than - property less than the given value.
   */
  Expression lt(String propertyName, Object value);

-  /**
-   * Less Than or Equal to the result of a sub-query.
-   */
-  Expression le(String propertyName, Query<?> subQuery);
-
  /**
   * Less Than or Equal to - property less than or equal to the given value.
   */
@@ -372,11 +326,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.
   */
@@ -427,94 +376,6 @@ public interface ExpressionFactory {
   */
  Expression inOrEmpty(String propertyName, Collection<?> values);

-  /**
-   * EXISTS a raw SQL SubQuery.
-   *
-   * @param sqlSubQuery The SQL SubQuery
-   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  Expression exists(String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Not EXISTS a raw SQL SubQuery.
-   *
-   * @param sqlSubQuery The SQL SubQuery
-   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  Expression notExists(String sqlSubQuery, Object... bindValues);
-
-  /**
-   * IN a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  Expression inSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Not IN a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  Expression notInSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Equal To a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  Expression eqSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Not Equal To a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  Expression neSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Greater Than or Equal To a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  Expression geSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Greater Than a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  Expression gtSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Less Than or Equal To a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  Expression leSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Less Than a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  Expression ltSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
  /**
   * Not In - property has a value in the array of values.
   */
@@ -623,6 +484,31 @@ public interface ExpressionFactory {
   */
  Expression raw(String raw);

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

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

 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.*;
@@ -53,12 +54,14 @@ public interface ExpressionList<T> {
  Query<T> orderById(boolean orderById);

  /**
-   * Deprecated migrate to {@link #orderBy(String)}
+   * Set the order by clause replacing the existing order by clause if there is
+   * one.
+   * <p>
+   * This follows SQL syntax using commas between each property with the
+   * optional asc and desc keywords representing ascending and descending order
+   * respectively.
   */
-  @Deprecated(since = "13.19", forRemoval = true)
-  default ExpressionList<T> order(String orderByClause) {
-    return orderBy(orderByClause);
-  }
+  ExpressionList<T> order(String orderByClause);

  /**
   * Set the order by clause replacing the existing order by clause if there is
@@ -71,12 +74,15 @@ public interface ExpressionList<T> {
  ExpressionList<T> orderBy(String orderBy);

  /**
-   * Deprecated migrate to orderBy().
+   * Return the OrderBy so that you can append an ascending or descending
+   * property to the order by clause.
+   * <p>
+   * This will never return a null. If no order by clause exists then an 'empty'
+   * OrderBy object is returned.
+   * <p>
+   * This is the same as <code>orderBy()</code>
   */
-  @Deprecated(forRemoval = true)
-  default OrderBy<T> order() {
-    return orderBy();
-  }
+  OrderBy<T> order();

  /**
   * Return the OrderBy so that you can append an ascending or descending
@@ -89,6 +95,12 @@ public interface ExpressionList<T> {
   */
  OrderBy<T> orderBy();

+  /**
+   * Deprecated migrate to {@link #orderBy(String)}
+   */
+  @Deprecated
+  Query<T> setOrderBy(String orderBy);
+
  /**
   * Apply the path properties to the query replacing the select and fetch clauses.
   */
@@ -105,6 +117,11 @@ public interface ExpressionList<T> {
   */
  Query<T> asOf(Timestamp asOf);

+  /**
+   * Execute the query against the draft set of tables.
+   */
+  Query<T> asDraft();
+
  /**
   * Convert the query to a DTO bean query.
   * <p>
@@ -366,15 +383,6 @@ public interface ExpressionList<T> {
   */
  <A> List<A> findSingleAttributeList();

-  /**
-   * Executes the query returning a set of values for a single property.
-   * <p>
-   * This can be used to cache sets.
-   *
-   * @return a HashSet of values for the selegted property
-   */
-  <A> Set<A> findSingleAttributeSet();
-
  /**
   * Execute a query returning a single value of a single property/column.
   * <pre>{@code
@@ -387,7 +395,6 @@ public interface ExpressionList<T> {
   *
   * }</pre>
   */
-  @Nullable
  default <A> A findSingleAttribute() {
    List<A> list = findSingleAttributeList();
    return !list.isEmpty() ? list.get(0) : null;
@@ -412,6 +419,42 @@ public interface ExpressionList<T> {
   */
  Optional<T> findOneOrEmpty();

+  /**
+   * Execute find row count query in a background thread.
+   * <p>
+   * This returns a Future object which can be used to cancel, check the
+   * execution status (isDone etc) and get the value (with or without a
+   * timeout).
+   * </p>
+   *
+   * @return a Future object for the row count query
+   */
+  FutureRowCount<T> findFutureCount();
+
+  /**
+   * Execute find Id's query in a background thread.
+   * <p>
+   * This returns a Future object which can be used to cancel, check the
+   * execution status (isDone etc) and get the value (with or without a
+   * timeout).
+   * </p>
+   *
+   * @return a Future object for the list of Id's
+   */
+  FutureIds<T> findFutureIds();
+
+  /**
+   * Execute find list query in a background thread.
+   * <p>
+   * This returns a Future object which can be used to cancel, check the
+   * execution status (isDone etc) and get the value (with or without a
+   * timeout).
+   * </p>
+   *
+   * @return a Future object for the list result of the query
+   */
+  FutureList<T> findFutureList();
+
  /**
   * Return a PagedList for this query using firstRow and maxRows.
   * <p>
@@ -466,24 +509,23 @@ public interface ExpressionList<T> {
  ExpressionList<T> filterMany(String manyProperty);

  /**
-   * 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.
+   * Add filter expressions to the many property.
   *
   * <pre>{@code
   *
-   *     new QCustomer()
-   *       .name.startsWith("Postgres")
-   *       .contacts.filterManyRaw("status = ? and firstName like ?", Contact.Status.NEW, "Rob%")
-   *       .findList();
+   *   DB.find(Customer.class)
+   *   .where()
+   *   .eq("name", "Rob")
+   *   .filterMany("orders", "status = ?", Status.NEW)
+   *   .findList();
   *
   * }</pre>
   *
-   * @param rawExpressions The raw expressions which can include ? and ?1 style bind parameter placeholders
-   * @param params The parameter values to bind
+   * @param manyProperty The many property
+   * @param expressions  Filter expressions with and, or and ? or ?1 type bind parameters
+   * @param params       Bind parameters used in the expressions
   */
-  ExpressionList<T> filterManyRaw(String manyProperty, String rawExpressions, Object... params);
+  ExpressionList<T> filterMany(String manyProperty, String expressions, Object... params);

  /**
   * Specify specific properties to fetch on the main/root bean (aka partial
@@ -516,6 +558,19 @@ public interface ExpressionList<T> {
   */
  Query<T> setDistinct(boolean distinct);

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

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

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

+  /**
+   * Add the expressions to this expression list.
+   *
+   * @param expressions The expressions that are parsed and added to this expression list
+   * @param params      Bind parameters to match ? or ?1 bind positions.
+   */
+  ExpressionList<T> where(String expressions, Object... params);
+
  /**
   * Path exists - for the given path in a JSON document.
   * <pre>{@code
@@ -740,40 +821,16 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> addAll(ExpressionList<T> exprList);

-  /**
-   * Equal To the result of a sub-query.
-   */
-  ExpressionList<T> eq(String propertyName, Query<?> subQuery);
-
  /**
   * Equal To - property is equal to a given value.
   */
  ExpressionList<T> eq(String propertyName, Object value);

-  /**
-   * Is EQUAL TO if value is non-null and otherwise no expression is added to the query.
-   * <p>
-   * This is the EQUAL TO equivalent to {@link #inOrEmpty(String, Collection)} where the expression/predicate
-   * is only added when the value is non-null.
-   * <p>
-   * This is effectively a helper method that allows a query to be built in fluid style where some predicates are
-   * effectively optional. We can use <code>eqIfPresent()</code> rather than having a separate if block.
-   * <p>
-   * Another option is to instead globally use {@link io.ebean.config.DatabaseConfig#setExpressionEqualsWithNullAsNoop(boolean)}
-   * but that is not always desirable.
-   */
-  ExpressionList<T> eqIfPresent(String propertyName, @Nullable Object value);
-
  /**
   * Equal To or Null - property is equal to a given value or null.
   */
  ExpressionList<T> eqOrNull(String propertyName, Object value);

-  /**
-   * Not Equal To the result of a sub-query.
-   */
-  ExpressionList<T> ne(String propertyName, Query<?> subQuery);
-
  /**
   * Not Equal To - property not equal to the given value.
   */
@@ -810,23 +867,6 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> inRangeWith(String lowProperty, String highProperty, Object value);

-  /**
-   * A Property is in Range between 2 properties.
-   *
-   * <pre>{@code
-   *
-   *    .orderDate.inRangeWith(QOrder.Alias.product.startDate, QOrder.Alias.product.endDate)
-   *
-   *    // which equates to
-   *    product.startDate <= orderDate and (orderDate < product.endDate or product.endDate is null)
-   *
-   * }</pre>
-   *
-   * <p>
-   * This is a convenience expression combining a number of simple expressions.
-   */
-  ExpressionList<T> inRangeWithProperties(String propertyName, String lowProperty, String highProperty);
-
  /**
   * In Range - {@code property >= value1 and property < value2}.
   * <p>
@@ -845,11 +885,6 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> betweenProperties(String lowProperty, String highProperty, Object value);

-  /**
-   * Greater Than the result of a sub-query.
-   */
-  ExpressionList<T> gt(String propertyName, Query<?> subQuery);
-
  /**
   * Greater Than - property greater than the given value.
   */
@@ -861,17 +896,9 @@ public interface ExpressionList<T> {
  ExpressionList<T> gtOrNull(String propertyName, Object value);

  /**
-   * Is GREATER THAN if value is non-null and otherwise no expression is added to the query.
-   * <p>
-   * This is effectively a helper method that allows a query to be built in fluid style where some predicates are
-   * effectively optional. We can use <code>gtIfPresent()</code> rather than having a separate if block.
+   * Greater Than or Equal to OR Null - ({@code >= or null }).
   */
-  ExpressionList<T> gtIfPresent(String propertyName, @Nullable Object value);
-
-  /**
-   * Greater Than or Equal to the result of a sub-query.
-   */
-  ExpressionList<T> ge(String propertyName, Query<?> subQuery);
+  ExpressionList<T> geOrNull(String propertyName, Object value);

  /**
   * Greater Than or Equal to - property greater than or equal to the given
@@ -879,25 +906,6 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> ge(String propertyName, Object value);

-  /**
-   * Greater Than or Equal to OR Null - ({@code >= or null }).
-   */
-  ExpressionList<T> geOrNull(String propertyName, Object value);
-
-
-  /**
-   * Is GREATER THAN OR EQUAL TO if value is non-null and otherwise no expression is added to the query.
-   * <p>
-   * This is effectively a helper method that allows a query to be built in fluid style where some predicates are
-   * effectively optional. We can use <code>geIfPresent()</code> rather than having a separate if block.
-   */
-  ExpressionList<T> geIfPresent(String propertyName, @Nullable Object value);
-
-  /**
-   * Less Than the result of a sub-query.
-   */
-  ExpressionList<T> lt(String propertyName, Query<?> subQuery);
-
  /**
   * Less Than - property less than the given value.
   */
@@ -908,36 +916,15 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> ltOrNull(String propertyName, Object value);

-  /**
-   * Is LESS THAN if value is non-null and otherwise no expression is added to the query.
-   * <p>
-   * This is effectively a helper method that allows a query to be built in fluid style where some predicates are
-   * effectively optional. We can use <code>ltIfPresent()</code> rather than having a separate if block.
-   */
-  ExpressionList<T> ltIfPresent(String propertyName, @Nullable Object value);
-
-  /**
-   * Less Than or Equal to the result of a sub-query.
-   */
-  ExpressionList<T> le(String propertyName, Query<?> subQuery);
-
-  /**
-   * Less Than or Equal to - property less than or equal to the given value.
-   */
-  ExpressionList<T> le(String propertyName, Object value);
-
  /**
   * Less Than or Equal to OR Null - ({@code <= or null }).
   */
  ExpressionList<T> leOrNull(String propertyName, Object value);

  /**
-   * Is LESS THAN OR EQUAL TO if value is non-null and otherwise no expression is added to the query.
-   * <p>
-   * This is effectively a helper method that allows a query to be built in fluid style where some predicates are
-   * effectively optional. We can use <code>leIfPresent()</code> rather than having a separate if block.
+   * Less Than or Equal to - property less than or equal to the given value.
   */
-  ExpressionList<T> leIfPresent(String propertyName, @Nullable Object value);
+  ExpressionList<T> le(String propertyName, Object value);

  /**
   * Is Null - property is null.
@@ -1051,99 +1038,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.
-   *
-   * @param sqlSubQuery The SQL SubQuery
-   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  ExpressionList<T> exists(String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Not EXISTS a raw SQL SubQuery.
-   *
-   * @param sqlSubQuery The SQL SubQuery
-   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  ExpressionList<T> notExists(String sqlSubQuery, Object... bindValues);
-
-  /**
-   * IN a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  ExpressionList<T> inSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Not IN a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  ExpressionList<T> notInSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Equal To a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  ExpressionList<T> eqSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Not Equal To a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  ExpressionList<T> neSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Greater Than a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  ExpressionList<T> gtSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Greater Than or Equal To a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  ExpressionList<T> geSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Less Than a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  ExpressionList<T> ltSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
-  /**
-   * Less Than or Equal To a raw SQL SubQuery.
-   *
-   * @param propertyName The bean property
-   * @param sqlSubQuery  The SQL SubQuery
-   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
-   */
-  ExpressionList<T> leSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
-
  /**
   * In - using a subQuery.
   */
@@ -1520,6 +1414,47 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> rawOrEmpty(String raw, Collection<?> values);

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

+  /**
+   * Start a list of expressions that will be joined by MUST.
+   * <p>
+   * This automatically makes the query a useDocStore(true) query that
+   * will execute against the document store (ElasticSearch etc).
+   * </p>
+   * <p>
+   * This is logically similar to and().
+   * </p>
+   */
+  Junction<T> must();
+
+  /**
+   * Start a list of expressions that will be joined by SHOULD.
+   * <p>
+   * This automatically makes the query a useDocStore(true) query that
+   * will execute against the document store (ElasticSearch etc).
+   * </p>
+   * <p>
+   * This is logically similar to or().
+   * </p>
+   */
+  Junction<T> should();
+
+  /**
+   * Start a list of expressions that will be joined by MUST NOT.
+   * <p>
+   * This automatically makes the query a useDocStore(true) query that
+   * will execute against the document store (ElasticSearch etc).
+   * </p>
+   * <p>
+   * This is logically similar to not().
+   * </p>
+   */
+  Junction<T> mustNot();
+
  /**
   * End a junction returning the parent expression list.
   * <p>
@@ -1689,8 +1660,4 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> endNot();

-  /**
-   * Clears the current expression list.
-   */
-  ExpressionList<T> clear();
 }
@@ -1,21 +1,493 @@
 package io.ebean;

+import io.avaje.lang.Nullable;
+
+import javax.persistence.NonUniqueResultException;
 import java.time.Clock;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Stream;

 /**
 * The extended API for Database.
+ * <p>
+ * This provides the finder methods that take an explicit transaction rather than obtaining
+ * the transaction from the usual mechanism (which is ThreadLocal based).
+ * </p>
+ * <p>
+ * In general we only want to use this ExtendedServer API when we want to avoid / bypass
+ * the use of the mechanism to get the current transaction and instead explicitly supply
+ * the transaction to use.
+ * </p>
+ * <p>
+ * Note that in all cases the transaction supplied can be null and in this case the Database
+ * will use the normal mechanism to obtain the transaction to use.
+ * </p>
 */
 public interface ExtendedServer {

  /**
-   * Deprecated but no yet determined suitable replacement (to support testing only change of clock).
-   * <p>
+   * Return the NOW time from the Clock.
+   */
+  long clockNow();
+
+  /**
   * Set the Clock to use for <code>@WhenCreated</code> and <code>@WhenModified</code>.
   * <p>
   * Note that we only expect to change the Clock for testing purposes.
   * </p>
   */
-  @Deprecated
  void setClock(Clock clock);

+  /**
+   * Execute the query returning true if a row is found.
+   * <p>
+   * The query is executed using max rows of 1 and will only select the id property.
+   * This method is really just a convenient way to optimise a query to perform a
+   * 'does a row exist in the db' check.
+   * </p>
+   *
+   * <h2>Example:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists = query().where().eq("email", "rob@foo.com").exists();
+   *
+   * }</pre>
+   *
+   * <h2>Example using a query bean:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists = new QContact().email.equalTo("rob@foo.com").exists();
+   *
+   * }</pre>
+   *
+   * @return True if the query finds a matching row in the database
+   */
+  <T> boolean exists(Query<T> ormQuery, Transaction transaction);
+
+  /**
+   * Return the number of 'top level' or 'root' entities this query should return.
+   *
+   * @see Query#findCount()
+   * @see Query#findFutureCount()
+   */
+  <T> int findCount(Query<T> query, Transaction transaction);
+
+  /**
+   * Return the Id values of the query as a List.
+   *
+   * @see Query#findIds()
+   */
+  <A, T> List<A> findIds(Query<T> query, Transaction transaction);
+
+  /**
+   * Return a QueryIterator for the query.
+   * <p>
+   * Generally using {@link #findEach(Query, Consumer, Transaction)} or
+   * {@link #findEachWhile(Query, Predicate, Transaction)} is preferred
+   * to findIterate(). The reason is that those methods automatically take care of
+   * closing the queryIterator (and the underlying jdbc statement and resultSet).
+   * <p>
+   * This is similar to findEach in that not all the result beans need to be held
+   * in memory at the same time and as such is good for processing large queries.
+   *
+   * @see Query#findIterate()
+   * @see Query#findEach(Consumer)
+   * @see Query#findEachWhile(Predicate)
+   */
+  <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the query returning the result as a Stream.
+   * <p>
+   * Note that this can support very large queries iterating any number of results.
+   * To do so internally it can use multiple persistence contexts.
+   * <p>
+   * Note that the stream needs to be closed so use with try with resources.
+   * </p>
+   */
+  <T> Stream<T> findStream(Query<T> query, Transaction transaction);
+
+  /**
+   * Deprecated - migrate to findStream().
+   * <p>
+   * Execute the query returning the result as a Stream.
+   * <p>
+   * Note that this can support very large queries iterating any number of results.
+   * To do so internally it can use multiple persistence contexts.
+   * <p>
+   * Note that the stream needs to be closed so use with try with resources.
+   */
+  @Deprecated
+  <T> Stream<T> findLargeStream(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the query visiting the each bean one at a time.
+   * <p>
+   * Unlike findList() this is suitable for processing a query that will return
+   * a very large resultSet. The reason is that not all the result beans need to be
+   * held in memory at the same time and instead processed one at a time.
+   * </p>
+   * <p>
+   * Internally this query using a PersistenceContext scoped to each bean (and the
+   * beans associated object graph).
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *     DB.find(Order.class)
+   *       .where().eq("status", Order.Status.NEW)
+   *       .order().asc("id")
+   *       .findEach((Order order) -> {
+   *
+   *         // do something with the order bean
+   *         System.out.println(" -- processing order ... " + order);
+   *       });
+   *
+   * }</pre>
+   *
+   * @see Query#findEach(Consumer)
+   * @see Query#findEachWhile(Predicate)
+   */
+  <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction);
+
+  /**
+   * Execute findEach with batch consumer.
+   *
+   * @see Query#findEach(int, Consumer)
+   */
+  <T> void findEach(Query<T> query, int batch, Consumer<List<T>> consumer, Transaction t);
+
+  /**
+   * Execute the query visiting the each bean one at a time.
+   * <p>
+   * Compared to findEach() this provides the ability to stop processing the query
+   * results early by returning false for the Predicate.
+   * </p>
+   * <p>
+   * Unlike findList() this is suitable for processing a query that will return
+   * a very large resultSet. The reason is that not all the result beans need to be
+   * held in memory at the same time and instead processed one at a time.
+   * </p>
+   * <p>
+   * Internally this query using a PersistenceContext scoped to each bean (and the
+   * beans associated object graph).
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *     DB.find(Order.class)
+   *       .where().eq("status", Order.Status.NEW)
+   *       .order().asc("id")
+   *       .findEachWhile((Order order) -> {
+   *
+   *         // do something with the order bean
+   *         System.out.println(" -- processing order ... " + order);
+   *
+   *         boolean carryOnProcessing = ...
+   *         return carryOnProcessing;
+   *       });
+   *
+   * }</pre>
+   *
+   * @see Query#findEach(Consumer)
+   * @see Query#findEachWhile(Predicate)
+   */
+  <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction);
+
+  /**
+   * Return versions of a @History entity bean.
+   * <p>
+   * Generally this query is expected to be a find by id or unique predicates query.
+   * It will execute the query against the history returning the versions of the bean.
+   * </p>
+   */
+  <T> List<Version<T>> findVersions(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute a query returning a list of beans.
+   * <p>
+   * Generally you are able to use {@link Query#findList()} rather than
+   * explicitly calling this method. You could use this method if you wish to
+   * explicitly control the transaction used for the query.
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   * List<Customer> customers = DB.find(Customer.class)
+   *     .where().ilike("name", "rob%")
+   *     .findList();
+   *
+   * }</pre>
+   *
+   * @param <T>         the type of entity bean to fetch.
+   * @param query       the query to execute.
+   * @param transaction the transaction to use (can be null).
+   * @return the list of fetched beans.
+   * @see Query#findList()
+   */
+  <T> List<T> findList(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute find row count query in a background thread.
+   * <p>
+   * This returns a Future object which can be used to cancel, check the
+   * execution status (isDone etc) and get the value (with or without a
+   * timeout).
+   * </p>
+   *
+   * @param query       the query to execute the row count on
+   * @param transaction the transaction (can be null).
+   * @return a Future object for the row count query
+   * @see Query#findFutureCount()
+   */
+  <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute find Id's query in a background thread.
+   * <p>
+   * This returns a Future object which can be used to cancel, check the
+   * execution status (isDone etc) and get the value (with or without a
+   * timeout).
+   * </p>
+   *
+   * @param query       the query to execute the fetch Id's on
+   * @param transaction the transaction (can be null).
+   * @return a Future object for the list of Id's
+   * @see Query#findFutureIds()
+   */
+  <T> FutureIds<T> findFutureIds(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute find list query in a background thread returning a FutureList object.
+   * <p>
+   * This returns a Future object which can be used to cancel, check the
+   * execution status (isDone etc) and get the value (with or without a timeout).
+   * <p>
+   * This query will execute in it's own PersistenceContext and using its own transaction.
+   * What that means is that it will not share any bean instances with other queries.
+   *
+   * @param query       the query to execute in the background
+   * @param transaction the transaction (can be null).
+   * @return a Future object for the list result of the query
+   * @see Query#findFutureList()
+   */
+  <T> FutureList<T> findFutureList(Query<T> query, Transaction transaction);
+
+  /**
+   * Return a PagedList for this query using firstRow and maxRows.
+   * <p>
+   * The benefit of using this over findList() is that it provides functionality to get the
+   * total row count etc.
+   * </p>
+   * <p>
+   * If maxRows is not set on the query prior to calling findPagedList() then a
+   * PersistenceException is thrown.
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   *  PagedList<Order> pagedList = DB.find(Order.class)
+   *       .setFirstRow(50)
+   *       .setMaxRows(20)
+   *       .findPagedList();
+   *
+   *       // fetch the total row count in the background
+   *       pagedList.loadRowCount();
+   *
+   *       List<Order> orders = pagedList.getList();
+   *       int totalRowCount = pagedList.getTotalRowCount();
+   *
+   * }</pre>
+   *
+   * @return The PagedList
+   * @see Query#findPagedList()
+   */
+  <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the query returning a set of entity beans.
+   * <p>
+   * Generally you are able to use {@link Query#findSet()} rather than
+   * explicitly calling this method. You could use this method if you wish to
+   * explicitly control the transaction used for the query.
+   * </p>
+   * <p>
+   * <pre>{@code
+   *
+   * Set<Customer> customers = DB.find(Customer.class)
+   *     .where().ilike("name", "rob%")
+   *     .findSet();
+   *
+   * }</pre>
+   *
+   * @param <T>         the type of entity bean to fetch.
+   * @param query       the query to execute
+   * @param transaction the transaction to use (can be null).
+   * @return the set of fetched beans.
+   * @see Query#findSet()
+   */
+  <T> Set<T> findSet(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the query returning the entity beans in a Map.
+   * <p>
+   * Generally you are able to use {@link Query#findMap()} rather than
+   * explicitly calling this method. You could use this method if you wish to
+   * explicitly control the transaction used for the query.
+   * </p>
+   *
+   * @param <T>         the type of entity bean to fetch.
+   * @param query       the query to execute.
+   * @param transaction the transaction to use (can be null).
+   * @return the map of fetched beans.
+   * @see Query#findMap()
+   */
+  <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the query returning a list of values for a single property.
+   * <p>
+   * <h3>Example 1:</h3>
+   * <pre>{@code
+   *
+   *  List<String> names =
+   *    DB.find(Customer.class)
+   *      .select("name")
+   *      .order().asc("name")
+   *      .findSingleAttributeList();
+   *
+   * }</pre>
+   * <h3>Example 2:</h3>
+   * <pre>{@code
+   *
+   *  List<String> names =
+   *    DB.find(Customer.class)
+   *      .setDistinct(true)
+   *      .select("name")
+   *      .where().eq("status", Customer.Status.NEW)
+   *      .order().asc("name")
+   *      .setMaxRows(100)
+   *      .findSingleAttributeList();
+   *
+   * }</pre>
+   *
+   * @return the list of values for the selected property
+   * @see Query#findSingleAttributeList()
+   */
+  <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the query returning at most one entity bean or null (if no matching
+   * bean is found).
+   * <p>
+   * This will throw a NonUniqueResultException if the query finds more than one result.
+   * </p>
+   * <p>
+   * Generally you are able to use {@link Query#findOne()} rather than
+   * explicitly calling this method. You could use this method if you wish to
+   * explicitly control the transaction used for the query.
+   * </p>
+   *
+   * @param <T>         the type of entity bean to fetch.
+   * @param query       the query to execute.
+   * @param transaction the transaction to use (can be null).
+   * @return the list of fetched beans.
+   * @throws NonUniqueResultException if more than one result was found
+   * @see Query#findOne()
+   */
+  @Nullable
+  <T> T findOne(Query<T> query, Transaction transaction);
+
+  /**
+   * Similar to findOne() but returns an Optional (rather than nullable).
+   */
+  <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute as a delete query deleting the 'root level' beans that match the predicates
+   * in the query.
+   * <p>
+   * Note that if the query includes joins then the generated delete statement may not be
+   * optimal depending on the database platform.
+   * </p>
+   *
+   * @param query       the query used for the delete
+   * @param transaction the transaction to use (can be null)
+   * @param <T>         the type of entity bean to fetch.
+   * @return the number of beans/rows that were deleted
+   */
+  <T> int delete(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the update query returning the number of rows updated.
+   * <p>
+   * The update query must be created using {@link Database#update(Class)}.
+   * </p>
+   *
+   * @param query       the update query to execute
+   * @param transaction the optional transaction to use for the update (can be null)
+   * @param <T>         the type of entity bean
+   * @return The number of rows updated
+   */
+  <T> int update(Query<T> query, Transaction transaction);
+
+  /**
+   * Execute the sql query returning a list of MapBean.
+   * <p>
+   * Generally you are able to use {@link SqlQuery#findList()} rather than
+   * explicitly calling this method. You could use this method if you wish to
+   * explicitly control the transaction used for the query.
+   * </p>
+   *
+   * @param query       the query to execute.
+   * @param transaction the transaction to use (can be null).
+   * @return the list of fetched MapBean.
+   * @see SqlQuery#findList()
+   */
+  List<SqlRow> findList(SqlQuery query, Transaction transaction);
+
+  /**
+   * Execute the SqlQuery iterating a row at a time.
+   * <p>
+   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
+   * </p>
+   */
+  void findEach(SqlQuery query, Consumer<SqlRow> consumer, Transaction transaction);
+
+  /**
+   * Execute the SqlQuery iterating a row at a time with the ability to stop consuming part way through.
+   * <p>
+   * Returning false after processing a row stops the iteration through the query results.
+   * </p>
+   * <p>
+   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
+   * </p>
+   */
+  void findEachWhile(SqlQuery query, Predicate<SqlRow> consumer, Transaction transaction);
+
+  /**
+   * Execute the sql query returning a single MapBean or null.
+   * <p>
+   * This will throw a PersistenceException if the query found more than one
+   * result.
+   * </p>
+   * <p>
+   * Generally you are able to use {@link SqlQuery#findOne()} rather than
+   * explicitly calling this method. You could use this method if you wish to
+   * explicitly control the transaction used for the query.
+   * </p>
+   *
+   * @param query       the query to execute.
+   * @param transaction the transaction to use (can be null).
+   * @return the fetched MapBean or null if none was found.
+   * @see SqlQuery#findOne()
+   */
+  @Nullable
+  SqlRow findOne(SqlQuery query, Transaction transaction);
+
 }
@@ -13,7 +13,8 @@ import java.io.Serializable;
 * }</pre>
 * <p>
 * Example: Using a "query join" instead of a "fetch join" we instead use 2 SQL queries
- *
+ * </p>
+ * <p>
 * <pre>{@code
 *
 * // This will use 2 SQL queries to build this object graph
@@ -26,8 +27,11 @@ import java.io.Serializable;
 * // query 2) find orderDetails where order.id in (?,?...) // first 100 order id's
 *
 * }</pre>
+ *
+ * @author mario
+ * @author rbygrave
 */
-public final class FetchConfig implements Serializable {
+public class FetchConfig implements Serializable {

  private static final long serialVersionUID = 1L;

@@ -36,9 +40,21 @@ public final class FetchConfig implements Serializable {
  private static final int LAZY_MODE = 2;
  private static final int CACHE_MODE = 3;

-  private final int mode;
-  private final int batchSize;
-  private final int hashCode;
+  private int mode;
+  private int batchSize;
+  private int hashCode;
+
+  /**
+   * Deprecated - migrate to one of the static factory methods like {@link FetchConfig#ofQuery()}
+   * <p>
+   * Construct using default JOIN mode.
+   */
+  @Deprecated
+  public FetchConfig() {
+    //this.mode = JOIN_MODE;
+    this.batchSize = 100;
+    this.hashCode = 1000;
+  }

  private FetchConfig(int mode, int batchSize) {
    this.mode = mode;
@@ -90,6 +106,94 @@ public final class FetchConfig implements Serializable {
    return new FetchConfig(JOIN_MODE, 100);
  }

+  /**
+   * We want to migrate away from mutating FetchConfig to a fully immutable FetchConfig.
+   */
+  private FetchConfig mutate(int mode, int batchSize) {
+    if (batchSize < 0) {
+      throw new IllegalArgumentException("batch size " + batchSize + " must be > 0");
+    }
+    this.mode = mode;
+    this.batchSize = batchSize;
+    this.hashCode = mode + 10 * batchSize;
+    return this;
+  }
+
+  /**
+   * Deprecated - migrate to FetchConfig.ofLazy().
+   */
+  @Deprecated
+  public FetchConfig lazy() {
+    return mutate(LAZY_MODE, 0);
+  }
+
+  /**
+   * Deprecated - migrate to FetchConfig.ofLazy(batchSize).
+   */
+  @Deprecated
+  public FetchConfig lazy(int batchSize) {
+    return mutate(LAZY_MODE, batchSize);
+  }
+
+  /**
+   * Deprecated - migrate to FetchConfig.ofQuery().
+   * <p>
+   * Eagerly fetch the beans in this path as a separate query (rather than as
+   * part of the main query).
+   * <p>
+   * This will use the default batch size for separate query which is 100.
+   */
+  @Deprecated
+  public FetchConfig query() {
+    return mutate(QUERY_MODE, 100);
+  }
+
+  /**
+   * Deprecated - migrate to FetchConfig.ofQuery(batchSize).
+   * <p>
+   * Eagerly fetch the beans in this path as a separate query (rather than as
+   * part of the main query).
+   * <p>
+   * The queryBatchSize is the number of parent id's that this separate query
+   * will load per batch.
+   * <p>
+   * This will load all beans on this path eagerly unless a {@link #lazy(int)}
+   * is also used.
+   *
+   * @param batchSize the batch size used to load beans on this path
+   */
+  @Deprecated
+  public FetchConfig query(int batchSize) {
+    return mutate(QUERY_MODE, batchSize);
+  }
+
+  /**
+   * Deprecated - migrate to FetchConfig.ofQuery(batchSize).
+   * <p>
+   * Eagerly fetch the first batch of beans on this path.
+   * This is similar to {@link #query(int)} but only fetches the first batch.
+   * <p>
+   * If there are more parent beans than the batch size then they will not be
+   * loaded eagerly but instead use lazy loading.
+   *
+   * @param batchSize the number of parent beans this path is populated for
+   */
+  @Deprecated
+  public FetchConfig queryFirst(int batchSize) {
+    return query(batchSize);
+  }
+
+  /**
+   * Deprecated - migrate to FetchConfig.ofCache().
+   * <p>
+   * Eagerly fetch the beans fetching the beans from the L2 bean cache
+   * and using the DB for beans not in the cache.
+   */
+  @Deprecated
+  public FetchConfig cache() {
+    return mutate(CACHE_MODE, 100);
+  }
+
  /**
   * Return the batch size for fetching.
   */
@@ -8,9 +8,6 @@ import java.util.List;
 * Intended to be used as a base class for 'Finder' implementations that can then
 * be injected or used as public static fields on the associated entity bean.
 * <p>
- * When using dependency injection {@link BeanRepository} and {@link BeanFinder}
- * are expected to be used rather than this Finder.
- * <p>
 * These 'finders' are a place to organise all the finder methods for that bean type
 * and specific finder methods are expected to be added (find by unique properties etc).
 * </p>
@@ -57,8 +54,6 @@ import java.util.List;
 *
 * }</pre>
 *
- * @see BeanRepository
- * @see BeanFinder
 */
@NonNullApi
 public class Finder<I, T> {
@@ -213,4 +208,11 @@ public class Finder<I, T> {
    return db().findNative(type, nativeSql);
  }

+  /**
+   * Creates a query using the ORM query language.
+   */
+  public Query<T> query(String ormQuery) {
+    return db().createQuery(type, ormQuery);
+  }
+
 }
@@ -0,0 +1,20 @@
+package io.ebean;
+
+import java.util.List;
+import java.util.concurrent.Future;
+
+/**
+ * FutureIds represents the result of a background query execution for the Id's.
+ * <p>
+ * It extends the java.util.concurrent.Future with the ability to get the Id's
+ * while the query is still executing in the background.
+ * </p>
+ */
+public interface FutureIds<T> extends Future<List<Object>> {
+
+  /**
+   * Returns the original query used to fetch the Id's.
+   */
+  Query<T> getQuery();
+
+}
@@ -1,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,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;
-  }
-}
@@ -231,6 +231,18 @@ public class OrderBy<T> implements Serializable {
    return this;
  }

+  /**
+   * Return true if this order by can be used in select clause.
+   */
+  public boolean supportsSelect() {
+    for (Property property : list) {
+      if (!property.supportsSelect()) {
+        return false;
+      }
+    }
+    return true;
+  }
+
  /**
   * A property and its ascending descending order.
   */
@@ -333,10 +345,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();
      }
@@ -391,6 +403,12 @@ public class OrderBy<T> implements Serializable {
      this.ascending = ascending;
    }

+    /**
+     * Support use in select clause if no collation or nulls ordering.
+     */
+    boolean supportsSelect() {
+      return nulls == null;
+    }
  }

  private void parse(String orderByClause) {
@@ -10,10 +10,11 @@ import java.util.Objects;
 * <p>
 * This feature is to enable use of L2 cache with complex natural keys with findList() queries in cases where the
 * IN clause is not a single property but instead a pair of properties.
+ * </p>
 * <p>
 * These queries can have predicates that can be translated into a list of complex natural keys such that the L2
 * cache can be hit with these keys to obtain some or all of the beans from L2 cache rather than the DB.
- *
+ * </p>
 * <pre>{@code
 *
 *   // where a bean is annotated with a complex
@@ -44,10 +45,11 @@ import java.util.Objects;
 * pairs are a unique key/index or part of a unique key/index and highly selective). Currently we know we can do this
 * on any DB that supports expression/formula based indexes.
 * using a DB string concatenation formula
+ * </p>
 * <p>
 * This means, the implementation converts the list of pairs into a list of strings via concatenation and we use a
 * DB concatenation formula to match. We see SQL like:
- *
+ * </p>
 * <pre>{@code sql
 *
 *   ...
@@ -58,7 +60,7 @@ import java.util.Objects;
 * }</pre>
 * <p>
 * We often create a DB expression index to match the DB concat formula like:
- *
+ * </p>
 * <pre>{@code sql
 *
 *   create index ix_name on table_name (sku || '-' || code);
@@ -142,6 +144,14 @@ public final class Pairs {
    return this;
  }

+  /**
+   * Deprecated migrate to concatSeparator()
+   */
+  @Deprecated
+  public Pairs setConcatSeparator(String concatSeparator) {
+    return concatSeparator(concatSeparator);
+  }
+
  /**
   * Return  a suffix used with DB varchar concatenation to combine the 2 values.
   */
@@ -157,6 +167,14 @@ public final class Pairs {
    return this;
  }

+  /**
+   * Deprecated migrate to concatSuffix()
+   */
+  @Deprecated
+  public Pairs setConcatSuffix(String concatSuffix) {
+    return concatSuffix(concatSuffix);
+  }
+
  @Override
  public String toString() {
    return "p0:" + property0 + " p1:" + property1 + " entries:" + entries;
@@ -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.
@@ -17,17 +17,17 @@ public interface ProfileLocation {
  }

  /**
-   * Create and return a new ProfileLocation with line number.
+   * Create and return a new ProfileLocation with a given lineNumber and label.
   */
-  static ProfileLocation createWithLine() {
-    return XServiceProvider.profileLocationFactory().createWithLine();
+  static ProfileLocation create(int lineNumber, String label) {
+    return XServiceProvider.profileLocationFactory().create(lineNumber, label);
  }

  /**
-   * Create and return a new ProfileLocation with a given lineNumber and label.
+   * Create and return a new ProfileLocation with a given location.
   */
-  static ProfileLocation create(String label) {
-    return XServiceProvider.profileLocationFactory().create(label);
+  static ProfileLocation createAt(String location) {
+    return XServiceProvider.profileLocationFactory().createAt(location);
  }

  /**
@@ -2,16 +2,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;
@@ -250,6 +247,11 @@ public interface Query<T> extends CancelableQuery {
   */
  Query<T> asOf(Timestamp asOf);

+  /**
+   * Execute the query against the draft set of tables.
+   */
+  Query<T> asDraft();
+
  /**
   * Convert the query to a DTO bean query.
   * <p>
@@ -316,6 +318,43 @@ public interface Query<T> extends CancelableQuery {
   */
  Query<T> setPersistenceContextScope(PersistenceContextScope scope);

+  /**
+   * Set the index(es) to search for a document store which uses partitions.
+   * <p>
+   * For example, when executing a query against ElasticSearch with daily indexes we can
+   * explicitly specify the indexes to search against.
+   * </p>
+   * <pre>{@code
+   *
+   *   // explicitly specify the indexes to search
+   *   query.setDocIndexName("logstash-2016.11.5,logstash-2016.11.6")
+   *
+   *   // search today's index
+   *   query.setDocIndexName("$today")
+   *
+   *   // search the last 3 days
+   *   query.setDocIndexName("$last-3")
+   *
+   * }</pre>
+   * <p>
+   * If the indexName is specified with ${daily} e.g. "logstash-${daily}" ... then we can use
+   * $today and $last-x as the search docIndexName like the examples below.
+   * </p>
+   * <pre>{@code
+   *
+   *   // search today's index
+   *   query.setDocIndexName("$today")
+   *
+   *   // search the last 3 days
+   *   query.setDocIndexName("$last-3")
+   *
+   * }</pre>
+   *
+   * @param indexName The index or indexes to search against
+   * @return This query
+   */
+  Query<T> setDocIndexName(String indexName);
+
  /**
   * Return the ExpressionFactory used by this query.
   */
@@ -382,6 +421,16 @@ public interface Query<T> extends CancelableQuery {
   */
  Query<T> setIncludeSoftDeletes();

+  /**
+   * Disable read auditing for this query.
+   * <p>
+   * This is intended to be used when the query is not a user initiated query and instead
+   * part of the internal processing in an application to load a cache or document store etc.
+   * In these cases we don't want the query to be part of read auditing.
+   * </p>
+   */
+  Query<T> setDisableReadAuditing();
+
  /**
   * Specify the properties to fetch on the root level entity bean in comma delimited format.
   * <p>
@@ -620,16 +669,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.
   */
@@ -645,18 +684,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.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
-   * by default when a query is run without an active transaction, it uses the read-only data
-   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
-   * against the master data source.
-   */
-  Query<T> usingMaster();
-
  /**
   * Execute the query returning the list of Id's.
   * <p>
@@ -723,6 +750,29 @@ public interface Query<T> extends CancelableQuery {
   */
  Stream<T> findStream();

+  /**
+   * Deprecated - migrate to findStream.
+   * <p>
+   * Execute the query returning the result as a Stream.
+   * <p>
+   * Note that this uses multiple persistence contexts such that we can use
+   * it with a large number of results.
+   * </p>
+   * <pre>{@code
+   *
+   *  // use try with resources to ensure Stream is closed
+   *
+   *  try (Stream<Customer> stream = query.findLargeStream()) {
+   *    stream
+   *    .map(...)
+   *    .collect(...);
+   *  }
+   *
+   * }</pre>
+   */
+  @Deprecated
+  Stream<T> findLargeStream();
+
  /**
   * Execute the query processing the beans one at a time.
   * <p>
@@ -898,12 +948,7 @@ public interface Query<T> extends CancelableQuery {
  <A> List<A> findSingleAttributeList();

  /**
-   * Execute the query returning a hashset of values for a single property.
-   */
-  <A> Set<A> findSingleAttributeSet();
-
-  /**
-   * Execute a query returning a single value or null for a single property/column.
+   * Execute a query returning a single value of a single property/column.
   * <p>
   * <pre>{@code
   *
@@ -915,7 +960,6 @@ public interface Query<T> extends CancelableQuery {
   *
   * }</pre>
   */
-  @Nullable
  <A> A findSingleAttribute();

  /**
@@ -1068,6 +1112,41 @@ public interface Query<T> extends CancelableQuery {
   */
  int findCount();

+  /**
+   * Execute find row count query in a background thread.
+   * <p>
+   * This returns a Future object which can be used to cancel, check the
+   * execution status (isDone etc) and get the value (with or without a
+   * timeout).
+   * </p>
+   *
+   * @return a Future object for the row count query
+   */
+  FutureRowCount<T> findFutureCount();
+
+  /**
+   * Execute find Id's query in a background thread.
+   * <p>
+   * This returns a Future object which can be used to cancel, check the
+   * execution status (isDone etc) and get the value (with or without a
+   * timeout).
+   * </p>
+   *
+   * @return a Future object for the list of Id's
+   */
+  FutureIds<T> findFutureIds();
+
+  /**
+   * Execute find list query in a background thread.
+   * <p>
+   * This query will execute in it's own PersistenceContext and using its own transaction.
+   * What that means is that it will not share any bean instances with other queries.
+   * </p>
+   *
+   * @return a Future object for the list result of the query
+   */
+  FutureList<T> findFutureList();
+
  /**
   * Return a PagedList for this query using firstRow and maxRows.
   * <p>
@@ -1216,6 +1295,27 @@ public interface Query<T> extends CancelableQuery {
   */
  ExpressionList<T> where();

+  /**
+   * Add Full text search expressions for Document store queries.
+   * <p>
+   * This is currently ElasticSearch only and provides the full text
+   * expressions such as Match and Multi-Match.
+   * </p>
+   * <p>
+   * This automatically makes this query a "Doc Store" query and will execute
+   * against the document store (ElasticSearch).
+   * </p>
+   * <p>
+   * Expressions added here are added to the "query" section of an ElasticSearch
+   * query rather than the "filter" section.
+   * </p>
+   * <p>
+   * Expressions added to the where() are added to the "filter" section of an
+   * ElasticSearch query.
+   * </p>
+   */
+  ExpressionList<T> text();
+
  /**
   * This applies a filter on the 'many' property list rather than the root
   * level objects.
@@ -1288,12 +1388,25 @@ public interface Query<T> extends CancelableQuery {
  Query<T> orderBy(String orderByClause);

  /**
-   * Deprecated migrate to orderBy().
+   * Set the order by clause replacing the existing order by clause if there is
+   * one.
+   * <p>
+   * This follows SQL syntax using commas between each property with the
+   * optional asc and desc keywords representing ascending and descending order
+   * respectively.
   */
-  @Deprecated(since = "13.19", forRemoval = true)
-  default Query<T> order(String orderByClause) {
-    return orderBy(orderByClause);
-  }
+  Query<T> order(String orderByClause);
+
+  /**
+   * Return the OrderBy so that you can append an ascending or descending
+   * property to the order by clause.
+   * <p>
+   * This will never return a null. If no order by clause exists then an 'empty'
+   * OrderBy object is returned.
+   * <p>
+   * This is the same as <code>orderBy()</code>
+   */
+  OrderBy<T> order();

  /**
   * Return the OrderBy so that you can append an ascending or descending
@@ -1307,26 +1420,15 @@ public interface Query<T> extends CancelableQuery {
  OrderBy<T> orderBy();

  /**
-   * Deprecated migrate to orderBy().
+   * Set an OrderBy object to replace any existing OrderBy clause.
   */
-  @Deprecated(since = "13.19", forRemoval = true)
-  default OrderBy<T> order() {
-    return orderBy();
-  }
+  Query<T> setOrder(OrderBy<T> orderBy);

  /**
   * Set an OrderBy object to replace any existing OrderBy clause.
   */
  Query<T> setOrderBy(OrderBy<T> orderBy);

-  /**
-   * Deprecated migrate to setOrderBy().
-   */
-  @Deprecated(since = "13.19", forRemoval = true)
-  default Query<T> setOrder(OrderBy<T> orderBy) {
-    return setOrderBy(orderBy);
-  }
-
  /**
   * Set whether this query uses DISTINCT.
   * <p>
@@ -1474,11 +1576,26 @@ public interface Query<T> extends CancelableQuery {
   */
  Query<T> setLabel(String label);

+  /**
+   * Set to true if this query should execute against the doc store.
+   * <p>
+   * When setting this you may also consider disabling lazy loading.
+   * </p>
+   */
+  Query<T> setUseDocStore(boolean useDocStore);
+
  /**
   * When set to true when you want the returned beans to be read only.
   */
  Query<T> setReadOnly(boolean readOnly);

+  /**
+   * Will be deprecated - migrate to use setBeanCacheMode(CacheMode.RECACHE).
+   * <p>
+   * When set to true all the beans from this query are loaded into the bean cache.
+   */
+  Query<T> setLoadBeanCache(boolean loadBeanCache);
+
  /**
   * Set a timeout on this query.
   * <p>
@@ -1608,6 +1725,28 @@ public interface Query<T> extends CancelableQuery {
   */
  Class<T> getBeanType();

+  /**
+   * Restrict the query to only return subtypes of the given inherit type.
+   *
+   * <pre>{@code
+   *
+   *   List<Animal> animals =
+   *     new QAnimal()
+   *       .name.startsWith("Fluffy")
+   *       .setInheritType(Cat.class)
+   *       .findList();
+   *
+   * }</pre>
+   *
+   * @param type An inheritance subtype of the
+   */
+  Query<T> setInheritType(Class<? extends T> type);
+
+  /**
+   * Returns the inherit type. This is normally the same as getBeanType() returns as long as no other type is set.
+   */
+  Class<? extends T> getInheritType();
+
  /**
   * Return the type of query being executed.
   */
@@ -1638,31 +1777,4 @@ public interface Query<T> extends CancelableQuery {
   */
  Query<T> orderById(boolean orderById);

-  /**
-   * Type safe query bean properties and expressions (marker interface).
-   * <p>
-   * Implemented by query bean properties and expressions based on those properties.
-   * <p>
-   * The base type determines which {@link StdOperators} can be used on the property.
-   *
-   * @param <T> The property type.
-   */
-  interface Property<T> {
-
-    /**
-     * Return a property given the expression.
-     */
-    static <T> Property<T> of(String expression) {
-      return new SimpleProperty<>(expression);
-    }
-
-    /**
-     * Return the property in string expression form.
-     * <p>
-     * This is a path to a database column (like "name" or "billingAddress.city") or a function
-     * wrapping a path (like <em>lower(name)</em>, <em>concat(name, '-', billingAddress.city)</em>
-     */
-    @Override
-    String toString();
-  }
 }
@@ -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.
@@ -1,15 +0,0 @@
-package io.ebean;
-
-final class SimpleProperty<T> implements Query.Property<T> {
-
-  private final String expression;
-
-  SimpleProperty(String expression) {
-    this.expression = expression;
-  }
-
-  @Override
-  public String toString() {
-    return expression;
-  }
-}
@@ -2,8 +2,8 @@ package io.ebean;

 import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;
-
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -40,23 +40,6 @@ import java.util.function.Predicate;
@NonNullApi
 public interface SqlQuery extends Serializable, CancelableQuery {

-  /**
-   * Execute the query using the given transaction.
-   */
-  SqlQuery usingTransaction(Transaction transaction);
-
-  /**
-   * Ensure that the master DataSource is used if there is a read only data source
-   * being used (that is using a read replica database potentially with replication lag).
-   * <p>
-   * When the database is configured with a read-only DataSource via
-   * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
-   * by default when a query is run without an active transaction, it uses the read-only data
-   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
-   * against the master data source.
-   */
-  SqlQuery usingMaster();
-
  /**
   * Execute the query returning a list.
   */
@@ -91,6 +74,18 @@ public interface SqlQuery extends Serializable, CancelableQuery {
  @Nullable
  SqlRow findOne();

+  /**
+   * Deprecated migrate to use {@link #mapTo(RowMapper)}
+   */
+  @Deprecated
+  <T> T findOne(RowMapper<T> mapper);
+
+  /**
+   * Deprecated migrate to use {@link #mapTo(RowMapper)}
+   */
+  @Deprecated
+  <T> List<T> findList(RowMapper<T> mapper);
+
  /**
   * Execute the query reading each row from ResultSet using the RowConsumer.
   * <p>
@@ -126,6 +121,50 @@ public interface SqlQuery extends Serializable, CancelableQuery {
   */
  Optional<SqlRow> findOneOrEmpty();

+  /**
+   * Deprecated - migrate to <code>.mapToScalar(attributeType).findOne()</code>.
+   * <pre>{@code
+   *
+   *    .mapToScalar(BigDecimal.class)
+   *    .findOne();
+   * }
+   */
+  @Deprecated
+  <T> T findSingleAttribute(Class<T> attributeType);
+
+  /**
+   * Deprecated - migrate to <code>.mapToScalar(BigDecimal.class).findOne()</code>.
+   * <pre>{@code
+   *
+   *    .mapToScalar(BigDecimal.class)
+   *    .findOne();
+   * }
+   */
+  @Deprecated
+  BigDecimal findSingleDecimal();
+
+  /**
+   * Deprecated - migrate to <code>.mapToScalar(Long.class).findOne()</code>.
+   * <pre>{@code
+   *
+   *    .mapToScalar(Long.class)
+   *    .findOne();
+   * }
+   */
+  @Deprecated
+  Long findSingleLong();
+
+  /**
+   * Deprecated - migrate to <code>.mapToScalar(Long.class).findList()</code>.
+   * <pre>{@code
+   *
+   *    .mapToScalar(Long.class)
+   *    .findList();
+   * }
+   */
+  @Deprecated
+  <T> List<T> findSingleAttributeList(Class<T> attributeType);
+
  /**
   * Set one of more positioned parameters.
   * <p>
@@ -155,6 +194,12 @@ public interface SqlQuery extends Serializable, CancelableQuery {
   */
  SqlQuery setParameters(Object... values);

+  /**
+   * Deprecated migrate to setParameters(Object... values)
+   */
+  @Deprecated
+  SqlQuery setParams(Object... values);
+
  /**
   * Set the next bind parameter by position.
   * <pre>{@code
@@ -315,11 +360,6 @@ public interface SqlQuery extends Serializable, CancelableQuery {
   */
  interface TypeQuery<T> {

-    /**
-     * Execute the query using the given transaction.
-     */
-    TypeQuery<T> usingTransaction(Transaction transaction);
-
    /**
     * Return the single value.
     */
@@ -287,6 +287,12 @@ public interface SqlUpdate {
   */
  SqlUpdate setParameters(Object... values);

+  /**
+   * Deprecated migrate to setParameters(Object... values).
+   */
+  @Deprecated
+  SqlUpdate setParams(Object... values);
+
  /**
   * Set the next bind parameter by position.
   *
@@ -294,6 +300,12 @@ public interface SqlUpdate {
   */
  SqlUpdate setParameter(Object value);

+  /**
+   * Deprecated migrate to setParameter(value).
+   */
+  @Deprecated
+  SqlUpdate setNextParameter(Object value);
+
  /**
   * Set a parameter via its index position.
   */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	6e163b9f5c	#3393 Fix for 12.x to support "NoTimeZone" to bypass MySQL JDBC use of Timezone Calendar	2024-04-17 22:57:55 +12:00
Rob Bygrave	63336bafe5	[maven-release-plugin] prepare for next development iteration	2023-09-07 14:50:26 +12:00
Rob Bygrave	97ca198b7c	[maven-release-plugin] prepare release ebean-parent-12.16.2	2023-09-07 14:50:18 +12:00
Rob BygraveandGitHub	88fd59e164	Merge pull request #3218 from ebean-orm/backport-12x/3173-BeanSet-init-loading [12x] Backport of fix for #3173 BeanSet init(), initClear() and BeanMap	2023-09-07 14:45:59 +12:00
Rob Bygrave	5b9ef2daec	[12x] Backport of fix for #3173 BeanSet init(), initClear() and BeanMap - BeanSet init() and initClear() load with onlyIds false because the expectation is that with BeanSet the equals/hashCode implementation can use a property - BeanMap lazy loading, include the mapKey if defined in the lazy loading query	2023-09-07 14:44:17 +12:00