Merge pull request #2984 from ebean-orm/feature/jakarta-javax-sed-conversion

Javax to Jakarta (+ reverse) conversion via sed
2024-04-21 10:51:47 +00:00 · 2023-02-23 12:28:40 +13:00 · 2023-02-23 01:28:50 +13:00 · 2023-02-22 23:38:08 +13:00 · 2023-02-22 23:35:42 +13:00 · 2023-02-22 23:19:15 +13:00
1398 changed files with 24080 additions and 15967 deletions
@@ -13,7 +13,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [8]
+        java_version: [11]
        os: [ubuntu-latest]

    steps:
@@ -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 clean package
+      run: mvn -T 8 clean test

@@ -35,4 +35,4 @@ jobs:
          ~/.m2
        key: build-${{ env.cache-name }}
    - name: db2
-      run: mvn clean test -Dprops.file=testconfig/ebean-db2.properties
+      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-db2.properties
@@ -37,5 +37,5 @@ jobs:
    - name: Maven version
      run: mvn --version
    - name: H2Database
-      run: mvn clean package
+      run: mvn -T 8 clean package

@@ -1,39 +0,0 @@
-
-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,7 +16,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [17,18,19,loom,valhalla,metropolis,panama]
+        java_version: [GA,EA]
        os: [ubuntu-latest]

    steps:
@@ -34,6 +34,8 @@ jobs:
        path:
          ~/.m2
        key: build-${{ env.cache-name }}
+    - name: Maven version
+      run: mvn --version
    - name: Build with Maven
-      run: mvn package
+      run: mvn -T 8 test

@@ -35,4 +35,4 @@ jobs:
          ~/.m2
        key: build-${{ env.cache-name }}
    - name: mariadb 10.6
-      run: mvn clean test -Dprops.file=testconfig/ebean-mariadb.properties
+      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-mariadb.properties
@@ -16,7 +16,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [8.0.192, 8, 11.0.3, 11, 17]
+        java_version: [11, 17]
        os: [ubuntu-latest]

    steps:
@@ -35,4 +35,4 @@ jobs:
          ~/.m2
        key: build-${{ env.cache-name }}
    - name: mysql
-      run: mvn clean test -Dprops.file=testconfig/ebean-mysql.properties
+      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-mysql.properties
@@ -1,5 +1,5 @@

-name: Oracle18
+name: Oracle

 on:
  workflow_dispatch:
@@ -35,4 +35,4 @@ jobs:
          ~/.m2
        key: build-${{ env.cache-name }}
    - name: oracle
-      run: mvn clean test -Dprops.file=testconfig/ebean-oracle.properties
+      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-oracle.properties
@@ -35,4 +35,4 @@ jobs:
          ~/.m2
        key: build-${{ env.cache-name }}
    - name: postgres
-      run: mvn clean test -Dprops.file=testconfig/ebean-postgres.properties
+      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-postgres.properties
@@ -35,4 +35,4 @@ jobs:
          ~/.m2
        key: build-${{ env.cache-name }}
    - name: sqlserver 2017
-      run: mvn clean test -Dprops.file=testconfig/ebean-sqlserver17.properties
+      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-sqlserver17.properties
@@ -1,25 +1,55 @@
+
 [![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)

-
-#### Builds against EA (Early Access) versions of Java (19, Loom, panama etc)
-
+##### Build with Java Early Access versions
 [![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>
@@ -49,14 +79,44 @@
 </table>

 ## Need help?
-Post questions or issues to the Ebean google group - https://groups.google.com/forum/#!forum/ebean
+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)

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

-
 ## Maven central
-[Maven central - io.ebean](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.ebean%22%20)
+[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.


+#### 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`
+

@@ -0,0 +1,48 @@
+<?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>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.13.1</version>
+  </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.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-clickhouse</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.clickhouse.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+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;
+
+}
@@ -0,0 +1,48 @@
+<?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>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.13.1</version>
+  </parent>
+
+  <name>ebean-cockroach</name>
+  <description>ebean-cockroach composite</description>
+  <artifactId>ebean-cockroach</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-postgres</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.cockroach.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+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;
+
+}
@@ -0,0 +1,48 @@
+<?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>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.13.1</version>
+  </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.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-db2</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.db2.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+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;
+
+}
@@ -0,0 +1,48 @@
+<?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>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.13.1</version>
+  </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.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-h2</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.h2.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+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;
+
+}
@@ -0,0 +1,48 @@
+<?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>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.13.1</version>
+  </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.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-hana</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.hana.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+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;
+
+}
@@ -0,0 +1,48 @@
+<?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>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.13.1</version>
+  </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.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-mariadb</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.mariadb.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+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;
+
+}
@@ -0,0 +1,48 @@
+<?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>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.13.1</version>
+  </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.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-mysql</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.mysql.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+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;
+
+}
@@ -0,0 +1,48 @@
+<?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>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.13.1</version>
+  </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.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-nuodb</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.nuodb.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+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;
+
+}
@@ -0,0 +1,48 @@
+<?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>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.13.1</version>
+  </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.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-oracle</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.oracle.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+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;
+
+}
@@ -0,0 +1,48 @@
+<?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>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.13.1</version>
+  </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.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-postgres</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.postgres.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+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;
+
+}
@@ -0,0 +1,48 @@
+<?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>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.13.1</version>
+  </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.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-sqlite</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.sqlite.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+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;
+
+}
@@ -0,0 +1,48 @@
+<?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>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.13.1</version>
+  </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.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-sqlserver</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.sqlserver.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+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;
+
+}
@@ -0,0 +1,48 @@
+<?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>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.13.1</version>
+  </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.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-postgres</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.yugabyte.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+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;
+
+}
@@ -0,0 +1,66 @@
+<?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>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.13.1</version>
+  </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.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-joda-time</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-jackson-jsonnode</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-jackson-mapper</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-all</artifactId>
+      <version>13.13.1</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -2,6 +2,7 @@ module io.ebean {

  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.all;
 }
@@ -0,0 +1,32 @@
+<?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.13.1</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>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>12.16.3-SNAPSHOT</version>
+    <version>13.13.1</version>
  </parent>

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

  <dependencies>

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

    <dependency>
      <groupId>io.avaje</groupId>
      <artifactId>avaje-config</artifactId>
-      <version>1.7</version>
+      <version>2.4</version>
    </dependency>

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

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

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

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

    <dependency>
@@ -64,6 +66,14 @@
      <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>
@@ -80,28 +90,22 @@
      <optional>true</optional>
    </dependency>

-    <!-- 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>
-
+    <!-- JAVAX-DEPENDENCY-START -->
    <dependency>
      <groupId>javax.servlet</groupId>
      <artifactId>javax.servlet-api</artifactId>
      <version>3.1.0</version>
      <optional>true</optional>
    </dependency>
+    <!-- JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START ___
+    <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>
@@ -113,18 +117,22 @@
  </dependencies>

  <build>
-    <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>
+    <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>
  </build>
+
 </project>
@@ -39,26 +39,6 @@ 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,6 +12,7 @@ import java.util.Optional;
 * </p>
 * <pre>{@code
 *
+ * @Component
 * public class CustomerFinder extends BeanFinder<Long,Customer> {
 *
 *   @Inject
@@ -26,29 +27,37 @@ import java.util.Optional;
 *
 * @param <I> The ID type
 * @param <T> The Bean type
+ *
+ * @see BeanRepository
 */
@NonNullApi
 public abstract class BeanFinder<I,T> {

+  /**
+   * Migrate to using database rather than server.
+   */
+  @Deprecated
  protected final Database server;
+  protected final Database database;
  protected final Class<T> type;

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

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

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

  /**
@@ -6,11 +6,15 @@ import io.ebean.bean.EntityBean;
 import java.util.Collection;

 /**
- * Provides finder functionality for use with "Dependency Injection style" use of Ebean.
+ * Provides find and persist 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
 *
- * @Repository
+ * @Component
 * public class CustomerRepository extends BeanRepository<Long,Customer> {
 *
 *   @Inject
@@ -50,10 +54,10 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
   * }</pre>
   *
   * @param type   The bean type
-   * @param server The Database instance typically created via Spring factory or equivalent
+   * @param database The Database instance typically created via Spring factory or equivalent
   */
-  protected BeanRepository(Class<T> type, Database server) {
-    super(type, server);
+  protected BeanRepository(Class<T> type, Database database) {
+    super(type, database);
  }

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

  /**
@@ -74,40 +74,16 @@ 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>
@@ -139,24 +115,9 @@ 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,7 +5,6 @@ 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 javax.persistence.OptimisticLockException;
@@ -22,10 +21,9 @@ 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();
@@ -36,7 +34,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");
@@ -47,7 +45,6 @@ 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
 *
@@ -117,39 +114,26 @@ 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);
@@ -159,17 +143,14 @@ 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.
-   * </p>
+   * Example of using a transaction to span multiple calls to find(), save() etc.
+   *
   * <pre>{@code
   *
   *   try (Transaction transaction = DB.beginTransaction()) {
@@ -187,7 +168,6 @@ 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();
@@ -199,7 +179,6 @@ 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();
@@ -219,7 +198,6 @@ 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
@@ -259,7 +237,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:
@@ -278,7 +256,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
@@ -307,14 +285,12 @@ 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 {
@@ -345,7 +321,6 @@ 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);
@@ -356,18 +331,15 @@ 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);
@@ -418,11 +390,9 @@ 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
   *
@@ -539,20 +509,16 @@ 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);
@@ -612,7 +578,6 @@ 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);
@@ -620,6 +585,7 @@ public final class DB {

  /**
   * Refresh a 'many' property of a bean.
+   *
   * <pre>{@code
   *
   *   Order order = ...;
@@ -640,7 +606,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);
@@ -661,14 +627,6 @@ 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.
@@ -684,7 +642,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
@@ -719,9 +677,8 @@ public final class DB {
   *
   * }</pre>
   * <p>
-   * If you want more control over the query then you can use createQuery() and
-   * Query.findOne();
-   * </p>
+   * If you want more control over the query then you can use createQuery() and Query.findOne();
+   *
   * <pre>{@code
   *
   *   // ... additionally fetching customer, customer shipping address,
@@ -761,40 +718,25 @@ public final class DB {
  }

  /**
-   * 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)}.
-   *
+   * Look to execute a native sql query that does not return beans but instead
+   * returns SqlRow or uses {@link 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
   */
@@ -802,16 +744,6 @@ 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.
   *
@@ -828,10 +760,9 @@ 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"
@@ -853,18 +784,11 @@ 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
@@ -880,15 +804,12 @@ public final class DB {
   * <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
@@ -940,7 +861,6 @@ public final class DB {
   * 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
@@ -953,7 +873,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";
@@ -978,7 +898,6 @@ 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.
@@ -1015,10 +934,8 @@ 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);
@@ -1029,7 +946,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
@@ -1037,7 +954,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);
   *     ...
   *   }
   * });
@@ -1053,7 +970,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(() -> {
@@ -1078,7 +995,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
@@ -1086,9 +1003,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>
@@ -1102,11 +1019,10 @@ 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(() -> {
@@ -1135,23 +1051,19 @@ 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
@@ -1166,20 +1078,11 @@ 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.
   */
@@ -1187,14 +1090,6 @@ 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>
@@ -1210,14 +1105,6 @@ 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).
   */
@@ -1233,14 +1120,6 @@ 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.
   */
@@ -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 class DatabaseFactory {
+public final 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 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 Logger log = LoggerFactory.getLogger("io.ebean");
+  private static final System.Logger log = EbeanVersion.log;
  static {
    EbeanVersion.getVersion();
  }
@@ -23,14 +23,9 @@ 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() {
@@ -52,7 +47,7 @@ final class DbContext {
      throw new DataSourceConfigurationException(msg, e);

    } catch (Throwable e) {
-      log.error("Error trying to create the default Database", e);
+      log.log(ERROR, "Error trying to create the default Database", e);
      throw new RuntimeException(e);
    }
  }
@@ -69,9 +64,9 @@ final class DbContext {
   */
  Database getDefault() {
    if (defaultDatabase == null) {
-      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()";
+      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()";
      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.
 */
-class DbPrimary {
+final class DbPrimary {

  private static final ReentrantLock lock = new ReentrantLock();
  private static String defaultServerName;
@@ -76,9 +76,9 @@ class DbPrimary {
    defaultServerName = System.getProperty("db", defaultServerName);
    defaultServerName = System.getProperty("ebean_db", defaultServerName);
    if (isEmpty(defaultServerName)) {
-      defaultServerName = Config.get("datasource.default", null);
+      defaultServerName = Config.getOptional("datasource.default").orElse(null);
      if (isEmpty(defaultServerName)) {
-        defaultServerName = Config.get("ebean.default.datasource", null);
+        defaultServerName = Config.getOptional("ebean.default.datasource").orElse(null);
      }
    }
    if (defaultServerName == null) {
@@ -129,6 +129,11 @@ 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>
@@ -141,6 +146,11 @@ 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.
   */
@@ -2,6 +2,28 @@ 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;
@@ -1,15 +0,0 @@
-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 {
-
-}
@@ -1,70 +0,0 @@
-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,20 +1,23 @@
 package io.ebean;

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

 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 class EbeanVersion {
+public final class EbeanVersion {

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

  /**
   * Maintain the minimum ebean-agent version manually based on required ebean-agent bug fixes.
@@ -22,6 +25,7 @@ public 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();
@@ -29,14 +33,16 @@ public class EbeanVersion {

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

@@ -48,13 +54,13 @@ public class EbeanVersion {
          String agentVersion = readVersion(in);
          if (agentVersion != null) {
            if (checkMinAgentVersion(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);
+              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);
            }
          }
        }
      }
    } catch (IOException e) {
-      log.warn("Could not check minimum ebean-agent version {}.{}.0 required due to - {}", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, e.getMessage());
+      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());
    }
  }

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

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

  private Expr() {
  }

+  /**
+   * Return the underlying expression factory.
+   */
+  public static ExpressionFactory factory() {
+    return DB.expressionFactory();
+  }
+
  /**
   * Equal To - property equal to the given value.
   */
@@ -117,6 +117,11 @@ 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.
   */
@@ -127,6 +132,11 @@ 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.
   */
@@ -181,6 +191,23 @@ 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.
   */
@@ -207,11 +234,21 @@ 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.
@@ -234,11 +271,21 @@ 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.
   */
@@ -383,6 +383,15 @@ 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
@@ -821,16 +830,40 @@ 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.
   */
@@ -867,6 +900,23 @@ 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>
@@ -885,6 +935,11 @@ 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.
   */
@@ -896,9 +951,17 @@ public interface ExpressionList<T> {
  ExpressionList<T> gtOrNull(String propertyName, Object value);

  /**
-   * Greater Than or Equal to OR Null - ({@code >= or null }).
+   * 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.
   */
-  ExpressionList<T> geOrNull(String propertyName, Object value);
+  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);

  /**
   * Greater Than or Equal to - property greater than or equal to the given
@@ -906,6 +969,25 @@ 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.
   */
@@ -917,15 +999,36 @@ public interface ExpressionList<T> {
  ExpressionList<T> ltOrNull(String propertyName, Object value);

  /**
-   * Less Than or Equal to OR Null - ({@code <= or null }).
+   * 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> leOrNull(String propertyName, Object value);
+  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.
+   */
+  ExpressionList<T> leIfPresent(String propertyName, @Nullable Object value);
+
  /**
   * Is Null - property is null.
   */
@@ -1660,4 +1763,8 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> endNot();

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

 import io.avaje.lang.Nullable;

-import javax.persistence.NonUniqueResultException;
 import java.time.Clock;
 import java.util.List;
 import java.util.Map;
@@ -15,478 +14,182 @@ import java.util.stream.Stream;
 /**
 * The extended API for Database.
 * <p>
+ * Deprecated in favour of using {@link Query#usingTransaction(Transaction)} instead.
+ * <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 {

  /**
-   * Return the NOW time from the Clock.
-   */
-  long clockNow();
-
-  /**
+   * Deprecated but no yet determined suitable replacement (to support testing only change of clock).
+   * <p>
   * 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
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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()
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <T> int findCount(Query<T> query, Transaction transaction);

  /**
-   * Return the Id values of the query as a List.
-   *
-   * @see Query#findIds()
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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)
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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>
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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 migrate to using {@link Query#usingTransaction(Transaction)}.
   */
  @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)
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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)
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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>
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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()
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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()
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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()
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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()
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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()
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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()
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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()
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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()
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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()
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
+  <A, T> Set<A> findSingleAttributeSet(Query<T> query, Transaction transaction);
+
+  /**
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
+   */
+  @Deprecated
  @Nullable
  <T> T findOne(Query<T> query, Transaction transaction);

  /**
-   * Similar to findOne() but returns an Optional (rather than nullable).
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  <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()
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  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>
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  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>
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
   */
+  @Deprecated
  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()
+   * Deprecated migrate to using {@link SqlQuery#usingTransaction(Transaction)}.
   */
+  @Deprecated
  @Nullable
  SqlRow findOne(SqlQuery query, Transaction transaction);

@@ -13,8 +13,7 @@ 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
@@ -27,11 +26,8 @@ import java.io.Serializable;
 * // query 2) find orderDetails where order.id in (?,?...) // first 100 order id's
 *
 * }</pre>
- *
- * @author mario
- * @author rbygrave
 */
-public class FetchConfig implements Serializable {
+public final class FetchConfig implements Serializable {

  private static final long serialVersionUID = 1L;

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

-  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 final int mode;
+  private final int batchSize;
+  private final int hashCode;

  private FetchConfig(int mode, int batchSize) {
    this.mode = mode;
@@ -106,94 +90,6 @@ public 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,6 +8,9 @@ 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>
@@ -54,6 +57,8 @@ import java.util.List;
 *
 * }</pre>
 *
+ * @see BeanRepository
+ * @see BeanFinder
 */
@NonNullApi
 public class Finder<I, T> {
@@ -231,18 +231,6 @@ 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.
   */
@@ -403,12 +391,6 @@ 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,11 +10,10 @@ 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
@@ -45,11 +44,10 @@ 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
 *
 *   ...
@@ -60,7 +58,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);
@@ -144,14 +142,6 @@ 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.
   */
@@ -167,14 +157,6 @@ 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;
@@ -17,15 +17,32 @@ public interface ProfileLocation {
  }

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

  /**
+   * Create and return a new ProfileLocation with a given lineNumber and label.
+   */
+  static ProfileLocation create(String label) {
+    return XServiceProvider.profileLocationFactory().create(label);
+  }
+
+  /**
+   * Deprecated in favor of {@link #create(String)}.
+   */
+  @Deprecated
+  static ProfileLocation create(int lineNumber, String label) {
+    return create(label);
+  }
+
+  /**
+   * Deprecated for removal - not used.
   * Create and return a new ProfileLocation with a given location.
   */
+  @Deprecated
  static ProfileLocation createAt(String location) {
    return XServiceProvider.profileLocationFactory().createAt(location);
  }
@@ -2,6 +2,7 @@ package io.ebean;

 import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;
+
 import javax.persistence.NonUniqueResultException;
 import java.sql.Connection;
 import java.sql.Timestamp;
@@ -750,29 +751,6 @@ 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>
@@ -948,7 +926,12 @@ public interface Query<T> extends CancelableQuery {
  <A> List<A> findSingleAttributeList();

  /**
-   * Execute a query returning a single value of a single property/column.
+   * 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.
   * <p>
   * <pre>{@code
   *
@@ -960,6 +943,7 @@ public interface Query<T> extends CancelableQuery {
   *
   * }</pre>
   */
+  @Nullable
  <A> A findSingleAttribute();

  /**
@@ -1395,18 +1379,9 @@ public interface Query<T> extends CancelableQuery {
   * optional asc and desc keywords representing ascending and descending order
   * respectively.
   */
-  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();
+  default Query<T> order(String orderByClause) {
+    return orderBy(orderByClause);
+  }

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

  /**
-   * Set an OrderBy object to replace any existing OrderBy clause.
+   * 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>
   */
-  Query<T> setOrder(OrderBy<T> orderBy);
+  default OrderBy<T> order() {
+    return orderBy();
+  }

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

+  /**
+   * Set an OrderBy object to replace any existing OrderBy clause.
+   */
+  default Query<T> setOrder(OrderBy<T> orderBy) {
+    return setOrderBy(orderBy);
+  }
+
  /**
   * Set whether this query uses DISTINCT.
   * <p>
@@ -1590,10 +1580,11 @@ public interface Query<T> extends CancelableQuery {
  Query<T> setReadOnly(boolean readOnly);

  /**
-   * Will be deprecated - migrate to use setBeanCacheMode(CacheMode.RECACHE).
+   * Deprecated - migrate to use setBeanCacheMode(CacheMode.PUT) or other CacheMode.
   * <p>
   * When set to true all the beans from this query are loaded into the bean cache.
   */
+  @Deprecated
  Query<T> setLoadBeanCache(boolean loadBeanCache);

  /**
@@ -1777,4 +1768,31 @@ 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();
+  }
 }
@@ -0,0 +1,15 @@
+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,6 +40,11 @@ import java.util.function.Predicate;
@NonNullApi
 public interface SqlQuery extends Serializable, CancelableQuery {

+  /**
+   * Execute the query using the given transaction.
+   */
+  SqlQuery usingTransaction(Transaction transaction);
+
  /**
   * Execute the query returning a list.
   */
@@ -74,18 +79,6 @@ 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>
@@ -121,50 +114,6 @@ 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>
@@ -194,12 +143,6 @@ 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
@@ -360,6 +303,11 @@ 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,12 +287,6 @@ 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.
   *
@@ -300,12 +294,6 @@ public interface SqlUpdate {
   */
  SqlUpdate setParameter(Object value);

-  /**
-   * Deprecated migrate to setParameter(value).
-   */
-  @Deprecated
-  SqlUpdate setNextParameter(Object value);
-
  /**
   * Set a parameter via its index position.
   */
@@ -0,0 +1,332 @@
+package io.ebean;
+
+import io.ebean.Query.Property;
+
+import java.util.Collection;
+
+/**
+ * Standard Operators for use with strongly typed query construction.
+ * <p>
+ * This is currently deemed to be experimental and subject to change.
+ */
+@Deprecated(since = "experimental")
+public final class StdOperators {
+
+  // ---- Functions ---- //
+
+  /**
+   * Sum of the given property.
+   */
+  public static Property<Number> sum(Property<? extends Number> property) {
+    return Property.of("sum(" + property + ")");
+  }
+
+  /**
+   * Count of the given property.
+   */
+  public static Property<Number> count(Property<?> property) {
+    return Property.of("count(" + property + ")");
+  }
+
+  /**
+   * Average of the given property.
+   */
+  public static <T> Property<T> avg(Property<T> property) {
+    return Property.of("avg(" + property + ")");
+  }
+
+  /**
+   * Max of the given property.
+   */
+  public static <T> Property<T> max(Property<T> property) {
+    return Property.of("max(" + property + ")");
+  }
+
+  /**
+   * Min of the given property.
+   */
+  public static <T> Property<T> min(Property<T> property) {
+    return Property.of("min(" + property + ")");
+  }
+
+  /**
+   * Coalesce of the property and value.
+   */
+  public static <T> Property<T> coalesce(Property<T> property, Object value) {
+    return Property.of("coalesce(" + property.toString() + "," + sqlValue(value) + ")");
+  }
+
+  /**
+   * Lower of the given property.
+   */
+  public static Property<String> lower(Property<String> property) {
+    return Property.of("lower(" + property + ")");
+  }
+
+  /**
+   * Upper of the given property.
+   */
+  public static Property<String> upper(Property<String> property) {
+    return Property.of("upper(" + property + ")");
+  }
+
+  /**
+   * Concat of the given property and values or other properties.
+   */
+  public static Property<String> concat(Property<?> property, Object... values) {
+    StringBuilder expression = new StringBuilder(50);
+    expression.append("concat(").append(property.toString());
+    for (Object value : values) {
+      expression.append(",").append(sqlConcatString(value));
+    }
+    expression.append(")");
+    return Property.of(expression.toString());
+  }
+
+  private static String sqlConcatString(Object value) {
+    if (value instanceof Property) {
+      return value.toString();
+    } else {
+      return sqlQuote(value);
+    }
+  }
+
+  /**
+   * Allows numbers to be unquoted.
+   */
+  private static String sqlValue(Object value) {
+    if (value instanceof Property || value instanceof Number) {
+      return value.toString();
+    } else {
+      return sqlQuote(value);
+    }
+  }
+
+  /**
+   * SQL quoted escaping single quotes.
+   */
+  private static String sqlQuote(Object value) {
+    return "'" + String.valueOf(value).replace("'", "''") + "'";
+  }
+
+  // ---- Operators ---- //
+
+  /**
+   * Equal to - for a property and value.
+   */
+  public static <T> Expression eq(Property<T> property, T value) {
+    return Expr.eq(property.toString(), value);
+  }
+
+  /**
+   * Equal to - for a property and sub-query.
+   */
+  public static <T> Expression eq(Property<T> property, Query<?> subQuery) {
+    return Expr.in(property.toString(), subQuery);
+  }
+
+  /**
+   * Equal to or null - for a property and value.
+   */
+  public static <T> Expression eqOrNull(Property<T> property, T value) {
+    return Expr.factory().eqOrNull(property.toString(), value);
+  }
+
+  /**
+   * Not equal to - for a property and value.
+   */
+  public static <T> Expression ne(Property<T> property, T value) {
+    return Expr.ne(property.toString(), value);
+  }
+
+  /**
+   * Not equal to - for a property and sub-query.
+   */
+  public static <T> Expression ne(Property<T> property, Query<?> subQuery) {
+    return Expr.ne(property.toString(), subQuery);
+  }
+
+  /**
+   * Greater than - for a property and value.
+   */
+  public static <T> Expression gt(Property<T> property, T value) {
+    return Expr.gt(property.toString(), value);
+  }
+
+  /**
+   * Greater than - for a property and sub-query.
+   */
+  public static <T> Expression gt(Property<T> property, Query<?> subQuery) {
+    return Expr.gt(property.toString(), subQuery);
+  }
+
+  /**
+   * Greater than or null - for a property and value.
+   */
+  public static <T> Expression gtOrNull(Property<T> property, T value) {
+    return Expr.factory().gtOrNull(property.toString(), value);
+  }
+
+  /**
+   * Greater than or equal to - for a property and value.
+   */
+  public static <T> Expression ge(Property<T> property, T value) {
+    return Expr.ge(property.toString(), value);
+  }
+
+  /**
+   * Greater than or equal to - for a property and sub-query.
+   */
+  public static <T> Expression ge(Property<T> property, Query<?> subQuery) {
+    return Expr.ge(property.toString(), subQuery);
+  }
+
+  /**
+   * Greater than or null - for a property and value.
+   */
+  public static <T> Expression geOrNull(Property<T> property, T value) {
+    return Expr.factory().geOrNull(property.toString(), value);
+  }
+
+  /**
+   * Less than - for a property and value.
+   */
+  public static <T> Expression lt(Property<T> property, T value) {
+    return Expr.lt(property.toString(), value);
+  }
+
+  /**
+   * Less than - for a property and sub-query.
+   */
+  public static <T> Expression lt(Property<T> property, Query<?> subQuery) {
+    return Expr.lt(property.toString(), subQuery);
+  }
+
+  /**
+   * Less than or null - for a property and value.
+   */
+  public static <T> Expression ltOrNull(Property<T> property, T value) {
+    return Expr.factory().ltOrNull(property.toString(), value);
+  }
+
+  /**
+   * Greater than or equal to - for a property and value.
+   */
+  public static <T> Expression le(Property<T> property, T value) {
+    return Expr.le(property.toString(), value);
+  }
+
+  /**
+   * Greater than or equal to - for a property and sub-query.
+   */
+  public static <T> Expression le(Property<T> property, Query<?> subQuery) {
+    return Expr.le(property.toString(), subQuery);
+  }
+
+  /**
+   * Greater than or equal to or null - for a property and value.
+   */
+  public static <T> Expression leOrNull(Property<T> property, T value) {
+    return Expr.factory().leOrNull(property.toString(), value);
+  }
+
+  /**
+   * In range - for a property and values.
+   */
+  public static <T> Expression inRange(Property<T> property, T lowValue, T highValue) {
+    return Expr.factory().inRange(property.toString(), lowValue, highValue);
+  }
+
+  /**
+   * In range - for properties and a value.
+   */
+  public static <T> Expression inRange(Property<T> lowProperty, Property<T> highProperty, T value) {
+    return Expr.factory().inRangeWith(lowProperty.toString(), highProperty.toString(), value);
+  }
+
+  /**
+   * In range - for properties.
+   */
+  public static <T> Expression inRange(Property<T> lowProperty, Property<T> property, Property<T> highProperty) {
+    return Expr.factory().inRangeWithProperties(lowProperty.toString(), property.toString(), highProperty.toString());
+  }
+
+  /**
+   * In - for a given property and collection of values.
+   */
+  public static <T> Expression in(Property<T> property, Collection<T> value) {
+    return Expr.in(property.toString(), value);
+  }
+
+  /**
+   * In - for a given property and sub-query.
+   */
+  public static <T> Expression in(Property<T> property, Query<?> subQuery) {
+    return Expr.in(property.toString(), subQuery);
+  }
+
+  /**
+   * In or empty - for a given property and collection of values.
+   */
+  public static <T> Expression inOrEmpty(Property<T> property, Collection<T> value) {
+    return Expr.inOrEmpty(property.toString(), value);
+  }
+
+  /**
+   * Not In - for a given property and collection of values.
+   */
+  public static <T> Expression notIn(Property<T> property, Collection<T> value) {
+    return Expr.factory().notIn(property.toString(), value);
+  }
+
+  /**
+   * Not In - for a given property and sub-query.
+   */
+  public static <T> Expression notIn(Property<T> property, Query<?> subQuery) {
+    return Expr.factory().notIn(property.toString(), subQuery);
+  }
+
+  // ---- String operators ---- //
+
+  /**
+   * Like - for a given property and value.
+   */
+  public static Expression like(Property<String> property, String value) {
+    return Expr.like(property.toString(), value);
+  }
+
+  /**
+   * Case-insensitive Like - for a given property and value.
+   */
+  public static Expression ilike(Property<String> property, String value) {
+    return Expr.ilike(property.toString(), value);
+  }
+
+  /**
+   * Starts with - for a given property and value.
+   */
+  public static Expression startsWith(Property<String> property, String value) {
+    return Expr.startsWith(property.toString(), value);
+  }
+
+  /**
+   * Case-insensitive starts with - for a given property and value.
+   */
+  public static Expression istartsWith(Property<String> property, String value) {
+    return Expr.istartsWith(property.toString(), value);
+  }
+
+  /**
+   * Contains - for a given property and value.
+   */
+  public static Expression contains(Property<String> property, String value) {
+    return Expr.contains(property.toString(), value);
+  }
+
+  /**
+   * Case-insensitive contains - for a given property and value.
+   */
+  public static Expression icontains(Property<String> property, String value) {
+    return Expr.icontains(property.toString(), value);
+  }
+}
@@ -144,6 +144,35 @@ public interface Transaction extends AutoCloseable {
   */
  void rollback(Throwable e) throws PersistenceException;

+  /**
+   * Performs a rollback on the underlying JDBC connection with the intention of
+   * continuing to use this same transaction and performing a commit or rollback
+   * later to complete the transaction.
+   * <p>
+   * Typically used when catching {@link DuplicateKeyException} where we wish to
+   * rollback work done at that point but carry on processing using the transaction.
+   *
+   * <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>
+   */
+  void rollbackAndContinue();
+
  /**
   * Set when we want nested transactions to use Savepoint's.
   * <p>
@@ -440,14 +469,6 @@ public interface Transaction extends AutoCloseable {
   */
  void setGetGeneratedKeys(boolean getGeneratedKeys);

-  /**
-   * Deprecated renamed to setGetGeneratedKeys().
-   */
-  @Deprecated
-  default void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
-    setGetGeneratedKeys(getGeneratedKeys);
-  }
-
  /**
   * By default when mixing UpdateSql (or CallableSql) with Beans the batch is
   * automatically flushed when you change (between persisting beans and
@@ -463,14 +484,6 @@ public interface Transaction extends AutoCloseable {
   */
  void setFlushOnMixed(boolean batchFlushOnMixed);

-  /**
-   * Deprecated renamed to setFlushOnMixed().
-   */
-  @Deprecated
-  default void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
-    setFlushOnMixed(batchFlushOnMixed);
-  }
-
  /**
   * By default executing a query will automatically flush any batched
   * statements (persisted beans, executed UpdateSql etc).
@@ -480,14 +493,6 @@ public interface Transaction extends AutoCloseable {
   */
  void setFlushOnQuery(boolean batchFlushOnQuery);

-  /**
-   * Deprecated renamed to setFlushOnQuery().
-   */
-  @Deprecated
-  default void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
-    setFlushOnQuery(batchFlushOnQuery);
-  }
-
  /**
   * Return true if the batch (of persisted beans or executed UpdateSql etc)
   * should be flushed prior to executing a query.
@@ -496,14 +501,6 @@ public interface Transaction extends AutoCloseable {
   */
  boolean isFlushOnQuery();

-  /**
-   * Deprecated renamed to isFlushOnQuery().
-   */
-  @Deprecated
-  default boolean isBatchFlushOnQuery() {
-    return isFlushOnQuery();
-  }
-
  /**
   * The batch will be flushing automatically but you can use this to explicitly
   * flush the batch if you like.
@@ -519,14 +516,6 @@ public interface Transaction extends AutoCloseable {
   */
  void flush() throws PersistenceException;

-  /**
-   * Deprecated - migrate to flush().
-   * <p>
-   * flush() is preferred as it matches the JPA flush() method.
-   */
-  @Deprecated
-  void flushBatch() throws PersistenceException;
-
  /**
   * Return the underlying Connection object.
   * <p>
@@ -540,14 +529,6 @@ public interface Transaction extends AutoCloseable {
   */
  Connection connection();

-  /**
-   * Deprecated migrate to connection().
-   */
-  @Deprecated
-  default Connection getConnection() {
-    return connection();
-  }
-
  /**
   * Add table modification information to the TransactionEvent.
   * <p>
@@ -14,7 +14,7 @@ package io.ebean;
 *
 *  int rows = DB.update(Customer.class)
 *      .set("status", Customer.Status.ACTIVE)
- *      .set("updtime", new Timestamp(System.currentTimeMillis()))
+ *      .set("whenUpdated", Instant.now())
 *      .where()
 *      .gt("id", 1000)
 *      .update();
@@ -25,6 +25,20 @@ package io.ebean;
 *   update o_customer set status=?, updtime=? where id > ?
 *
 * }</pre>
+ *
+ * <h4>Example: Using query bean</h4>
+ * <pre>{@code
+ *
+ *   var cust = QCustomer.alias();
+ *
+ *   int rows = new QCustomer()
+ *       .id.gt(1000)
+ *       .asUpdate()
+ *       .set(cust.status, Customer.Status.COMPLETE)
+ *       .set(cust.whenUpdated, Instant.now())
+ *       .update();
+ *
+ * }</pre>
 * <p>
 * Note that if the where() clause contains a join then the SQL update changes to use a
 * <code> WHERE ID IN () </code> form.
@@ -40,7 +54,7 @@ package io.ebean;
 *
 *   int rows = DB.update(Customer.class)
 *       .set("status", Customer.Status.ACTIVE)
- *       .set("updtime", new Timestamp(System.currentTimeMillis()))
+ *       .set("whenUpdated", Instant.now())
 *       .where()
 *         .eq("status", Customer.Status.NEW)
 *         .eq("billingAddress.country", nz)
@@ -73,7 +87,7 @@ public interface UpdateQuery<T> {
   *
   *   int rows = DB.update(Customer.class)
   *      .set("status", Customer.Status.ACTIVE)
-   *      .set("updtime", new Timestamp(System.currentTimeMillis()))
+   *      .set("whenUpdated", Instant.now())
   *      .where()
   *      .gt("id", 1000)
   *      .update();
@@ -85,6 +99,27 @@ public interface UpdateQuery<T> {
   */
  UpdateQuery<T> set(String property, Object value);

+  /**
+   * Set the value of a property.
+   * <p>
+   * <pre>{@code
+   *
+   *   var cust = QCustomer.alias();
+   *
+   *   int rows = new QCustomer()
+   *       .id.gt(1000)
+   *       .asUpdate()
+   *       .set(cust.status, Customer.Status.COMPLETE)
+   *       .set(cust.whenUpdated, Instant.now())
+   *       .update();
+   *
+   * }</pre>
+   *
+   * @param property The bean property to be set
+   * @param value    The value to set the property to
+   */
+  <P> UpdateQuery<T> set(Query.Property<P> property, P value);
+
  /**
   * Set the property to be null.
   * <p>
@@ -102,6 +137,13 @@ public interface UpdateQuery<T> {
   */
  UpdateQuery<T> setNull(String property);

+  /**
+   * Set the property to be null.
+   *
+   * @param property The bean property to be set
+   */
+  UpdateQuery<T> setNull(Query.Property<?> property);
+
  /**
   * Set using a property expression that does not need any bind values.
   * <p>
@@ -11,7 +11,7 @@ import java.util.ServiceLoader;
 /**
 * Lookup internal services.
 */
-class XServiceProvider {
+final class XServiceProvider {

  private static SpiRawSqlService rawSqlService = initRawSql();

@@ -18,7 +18,7 @@ import java.util.Set;
 * <em>java.util.Collection</em>. The reason being that java.util.Map is not a
 * Collection. I realise this makes this name confusing so I apologise for that.
 */
-public interface BeanCollection<E> extends Serializable {
+public interface BeanCollection<E> extends Serializable, ToStringAware {

  enum ModifyListenMode {
    /**
@@ -2,6 +2,7 @@ package io.ebean.bean;

 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.List;

 import static io.ebean.util.EncodeB64.enc;

@@ -27,19 +28,26 @@ public final class CallStack implements Serializable, CallOrigin {

  private final String zeroHash;
  private final String pathHash;
-  private final StackTraceElement[] callStack;
+  private final Object[] callStack;
  private final int hc;

-  public CallStack(StackTraceElement[] callStack, int zeroHash, int pathHash) {
+  public CallStack(Object[] callStack, int zeroHash, int pathHash) {
    this.callStack = callStack;
+    this.hc = computeHashCode();
    this.zeroHash = enc(zeroHash);
    this.pathHash = enc(pathHash);
+  }
+
+  public CallStack(List<StackWalker.StackFrame> frames) {
+    this.callStack = frames.toArray(new Object[0]);
    this.hc = computeHashCode();
+    this.zeroHash = enc(callStack[0].hashCode());
+    this.pathHash = enc(hc);
  }

  private int computeHashCode() {
    int hc = 0;
-    for (StackTraceElement element : callStack) {
+    for (Object element : callStack) {
      hc = 92821 * hc + element.hashCode();
    }
    return hc;
@@ -11,7 +11,7 @@ import java.io.Serializable;
 * general application consumption.
 * </p>
 */
-public interface EntityBean extends Serializable {
+public interface EntityBean extends Serializable, ToStringAware {

  /**
   * Return all the property names in defined order.
@@ -34,6 +34,13 @@ public interface EntityBean extends Serializable {
    throw new NotEnhancedException();
  }

+  /**
+   * Create and return a new entity bean instance optimised for read only no interception use.
+   */
+  default Object _ebean_newInstanceReadOnly() {
+    throw new NotEnhancedException();
+  }
+
  /**
   * Generated method that sets the loaded state on all the embedded beans on
   * this entity bean by using EntityBeanIntercept.setEmbeddedLoaded(Object o);
@@ -109,4 +116,8 @@ public interface EntityBean extends Serializable {
    throw new NotEnhancedException();
  }

+  @Override
+  default void toString(ToStringBuilder builder) {
+    throw new NotEnhancedException();
+  }
 }
@@ -0,0 +1,546 @@
+package io.ebean.bean;
+
+import io.ebean.ValuePair;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * EntityBeanIntercept optimised for read only use.
+ * <p>
+ * For the read only use this intercept doesn't need to hold any state that is normally
+ * required for updates such as per property changed, loaded, dirty state, original values
+ * bean state etc.
+ */
+public class InterceptReadOnly implements EntityBeanIntercept {
+
+  private final EntityBean owner;
+
+  /**
+   * Create with a given entity.
+   */
+  public InterceptReadOnly(Object ownerBean) {
+    this.owner = (EntityBean) ownerBean;
+  }
+
+  @Override
+  public EntityBean getOwner() {
+    return owner;
+  }
+
+  @Override
+  public PersistenceContext getPersistenceContext() {
+    return null;
+  }
+
+  @Override
+  public void setPersistenceContext(PersistenceContext persistenceContext) {
+
+  }
+
+  @Override
+  public void setNodeUsageCollector(NodeUsageCollector usageCollector) {
+
+  }
+
+  @Override
+  public Object getOwnerId() {
+    return null;
+  }
+
+  @Override
+  public void setOwnerId(Object ownerId) {
+
+  }
+
+  @Override
+  public Object getEmbeddedOwner() {
+    return null;
+  }
+
+  @Override
+  public int getEmbeddedOwnerIndex() {
+    return 0;
+  }
+
+  @Override
+  public void clearGetterCallback() {
+
+  }
+
+  @Override
+  public void registerGetterCallback(PreGetterCallback getterCallback) {
+
+  }
+
+  @Override
+  public void setEmbeddedOwner(EntityBean parentBean, int embeddedOwnerIndex) {
+
+  }
+
+  @Override
+  public void setBeanLoader(BeanLoader beanLoader, PersistenceContext ctx) {
+
+  }
+
+  @Override
+  public void setBeanLoader(BeanLoader beanLoader) {
+
+  }
+
+  @Override
+  public boolean isFullyLoadedBean() {
+    return false;
+  }
+
+  @Override
+  public void setFullyLoadedBean(boolean fullyLoadedBean) {
+
+  }
+
+  @Override
+  public boolean isPartial() {
+    return false;
+  }
+
+  @Override
+  public boolean isDirty() {
+    return false;
+  }
+
+  @Override
+  public void setEmbeddedDirty(int embeddedProperty) {
+
+  }
+
+  @Override
+  public void setDirty(boolean dirty) {
+
+  }
+
+  @Override
+  public boolean isNew() {
+    return false;
+  }
+
+  @Override
+  public boolean isNewOrDirty() {
+    return false;
+  }
+
+  @Override
+  public boolean hasIdOnly(int idIndex) {
+    return false;
+  }
+
+  @Override
+  public boolean isReference() {
+    return false;
+  }
+
+  @Override
+  public void setReference(int idPos) {
+
+  }
+
+  @Override
+  public void setLoadedFromCache(boolean loadedFromCache) {
+
+  }
+
+  @Override
+  public boolean isLoadedFromCache() {
+    return false;
+  }
+
+  @Override
+  public boolean isReadOnly() {
+    return true;
+  }
+
+  @Override
+  public void setReadOnly(boolean readOnly) {
+
+  }
+
+  @Override
+  public void setForceUpdate(boolean forceUpdate) {
+
+  }
+
+  @Override
+  public boolean isUpdate() {
+    return false;
+  }
+
+  @Override
+  public boolean isLoaded() {
+    return true;
+  }
+
+  @Override
+  public void setNew() {
+
+  }
+
+  @Override
+  public void setLoaded() {
+
+  }
+
+  @Override
+  public void setLoadedLazy() {
+
+  }
+
+  @Override
+  public void setLazyLoadFailure(Object ownerId) {
+
+  }
+
+  @Override
+  public boolean isLazyLoadFailure() {
+    return false;
+  }
+
+  @Override
+  public boolean isDisableLazyLoad() {
+    return false;
+  }
+
+  @Override
+  public void setDisableLazyLoad(boolean disableLazyLoad) {
+
+  }
+
+  @Override
+  public void setEmbeddedLoaded(Object embeddedBean) {
+
+  }
+
+  @Override
+  public boolean isEmbeddedNewOrDirty(Object embeddedBean) {
+    return false;
+  }
+
+  @Override
+  public Object getOrigValue(int propertyIndex) {
+    return null;
+  }
+
+  @Override
+  public int findProperty(String propertyName) {
+    return 0;
+  }
+
+  @Override
+  public String getProperty(int propertyIndex) {
+    return null;
+  }
+
+  @Override
+  public int getPropertyLength() {
+    return 0;
+  }
+
+  @Override
+  public void setPropertyLoaded(String propertyName, boolean loaded) {
+
+  }
+
+  @Override
+  public void setPropertyUnloaded(int propertyIndex) {
+
+  }
+
+  @Override
+  public void setLoadedProperty(int propertyIndex) {
+
+  }
+
+  @Override
+  public void setLoadedPropertyAll() {
+
+  }
+
+  @Override
+  public boolean isLoadedProperty(int propertyIndex) {
+    return false;
+  }
+
+  @Override
+  public boolean isChangedProperty(int propertyIndex) {
+    return false;
+  }
+
+  @Override
+  public boolean isDirtyProperty(int propertyIndex) {
+    return false;
+  }
+
+  @Override
+  public void markPropertyAsChanged(int propertyIndex) {
+
+  }
+
+  @Override
+  public void setChangedProperty(int propertyIndex) {
+
+  }
+
+  @Override
+  public void setChangeLoaded(int propertyIndex) {
+
+  }
+
+  @Override
+  public void setEmbeddedPropertyDirty(int propertyIndex) {
+
+  }
+
+  @Override
+  public void setOriginalValue(int propertyIndex, Object value) {
+
+  }
+
+  @Override
+  public void setOriginalValueForce(int propertyIndex, Object value) {
+
+  }
+
+  @Override
+  public void setNewBeanForUpdate() {
+
+  }
+
+  @Override
+  public Set<String> getLoadedPropertyNames() {
+    return Collections.emptySet();
+  }
+
+  @Override
+  public boolean[] getDirtyProperties() {
+    return new boolean[0];
+  }
+
+  @Override
+  public Set<String> getDirtyPropertyNames() {
+    return Collections.emptySet();
+  }
+
+  @Override
+  public void addDirtyPropertyNames(Set<String> props, String prefix) {
+
+  }
+
+  @Override
+  public boolean hasDirtyProperty(Set<String> propertyNames) {
+    return false;
+  }
+
+  @Override
+  public Map<String, ValuePair> getDirtyValues() {
+    return Collections.emptyMap();
+  }
+
+  @Override
+  public void addDirtyPropertyValues(Map<String, ValuePair> dirtyValues, String prefix) {
+
+  }
+
+  @Override
+  public void addDirtyPropertyValues(BeanDiffVisitor visitor) {
+
+  }
+
+  @Override
+  public StringBuilder getDirtyPropertyKey() {
+    return null;
+  }
+
+  @Override
+  public void addDirtyPropertyKey(StringBuilder sb) {
+
+  }
+
+  @Override
+  public StringBuilder getLoadedPropertyKey() {
+    return null;
+  }
+
+  @Override
+  public boolean[] getLoaded() {
+    return new boolean[0];
+  }
+
+  @Override
+  public int getLazyLoadPropertyIndex() {
+    return 0;
+  }
+
+  @Override
+  public String getLazyLoadProperty() {
+    return null;
+  }
+
+  @Override
+  public void loadBean(int loadProperty) {
+
+  }
+
+  @Override
+  public void loadBeanInternal(int loadProperty, BeanLoader loader) {
+
+  }
+
+  @Override
+  public void initialisedMany(int propertyIndex) {
+
+  }
+
+  @Override
+  public void preGetterCallback(int propertyIndex) {
+
+  }
+
+  @Override
+  public void preGetId() {
+
+  }
+
+  @Override
+  public void preGetter(int propertyIndex) {
+
+  }
+
+  @Override
+  public void preSetterMany(boolean interceptField, int propertyIndex, Object oldValue, Object newValue) {
+
+  }
+
+  @Override
+  public void setChangedPropertyValue(int propertyIndex, boolean setDirtyState, Object origValue) {
+
+  }
+
+  @Override
+  public void setDirtyStatus() {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, Object oldValue, Object newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, boolean oldValue, boolean newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, int oldValue, int newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, long oldValue, long newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, double oldValue, double newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, float oldValue, float newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, short oldValue, short newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, char oldValue, char newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, byte oldValue, byte newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, char[] oldValue, char[] newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, byte[] oldValue, byte[] newValue) {
+
+  }
+
+  @Override
+  public void setOldValue(int propertyIndex, Object oldValue) {
+
+  }
+
+  @Override
+  public int getSortOrder() {
+    return 0;
+  }
+
+  @Override
+  public void setSortOrder(int sortOrder) {
+
+  }
+
+  @Override
+  public void setDeletedFromCollection(boolean deletedFromCollection) {
+
+  }
+
+  @Override
+  public boolean isOrphanDelete() {
+    return false;
+  }
+
+  @Override
+  public void setLoadError(int propertyIndex, Exception t) {
+
+  }
+
+  @Override
+  public Map<String, Exception> getLoadErrors() {
+    return null;
+  }
+
+  @Override
+  public boolean isChangedProp(int i) {
+    return false;
+  }
+
+  @Override
+  public MutableValueInfo mutableInfo(int propertyIndex) {
+    return null;
+  }
+
+  @Override
+  public void mutableInfo(int propertyIndex, MutableValueInfo info) {
+
+  }
+
+  @Override
+  public void mutableNext(int propertyIndex, MutableValueNext next) {
+
+  }
+
+  @Override
+  public String mutableNext(int propertyIndex) {
+    return null;
+  }
+}
@@ -1,6 +1,6 @@
 package io.ebean.bean;

-import java.lang.ref.WeakReference;
+import java.lang.ref.Cleaner;
 import java.util.LinkedHashSet;
 import java.util.Set;

@@ -8,120 +8,102 @@ import java.util.Set;
 * Collects profile information for a bean (or reference/proxy bean) at a given node.
 * <p>
 * The node identifies the location of the bean in the object graph.
- * </p>
- * <p>
- * It has to use a weak reference so as to ensure that it does not stop the
- * associated bean from being garbage collected.
- * </p>
 */
 public final class NodeUsageCollector {

-  /**
-   * The point in the object graph for a specific query and call stack point.
-   */
-  private final ObjectGraphNode node;
+  private final static Cleaner cleaner = Cleaner.create();
+
+  public static final class State implements Runnable {
+
+    private final NodeUsageListener listener;
+    /**
+     * The properties used at this profile point.
+     */
+    private final Set<String> used = new LinkedHashSet<>();
+    /**
+     * The point in the object graph for a specific query and call stack point.
+     */
+    private final ObjectGraphNode node;
+    /**
+     * set to true if the bean is modified (setter called)
+     */
+    private boolean modified;
+
+    private State(ObjectGraphNode node, NodeUsageListener listener) {
+      this.node = node;
+      this.listener = listener;
+    }
+
+    @Override
+    public String toString() {
+      return node + " read:" + used + " modified:" + modified;
+    }
+
+    @Override
+    public void run() {
+      listener.collectNodeUsage(this);
+    }
+
+    /**
+     * Return true if no properties where used.
+     */
+    public boolean isEmpty() {
+      return used.isEmpty();
+    }
+
+    /**
+     * Return the associated node which identifies the location in the object
+     * graph of the bean/reference.
+     */
+    public ObjectGraphNode node() {
+      return node;
+    }
+
+    /**
+     * Return the set of used properties.
+     */
+    public Set<String> used() {
+      return used;
+    }
+
+    /**
+     * Return true if the bean was modified by a setter.
+     */
+    public boolean isModified() {
+      return modified;
+    }
+  }
+
+  private final State state;
+
+  public NodeUsageCollector(ObjectGraphNode node, NodeUsageListener listener) {
+    this.state = new State(node, listener);
+    cleaner.register(this, state);
+  }

  /**
-   * Weak to allow garbage collection.
+   * Return the underlying state.
   */
-  private final WeakReference<NodeUsageListener> managerRef;
-
-  /**
-   * The properties used at this profile point.
-   */
-  private final Set<String> used = new LinkedHashSet<>();
-
-  /**
-   * set to true if the bean is modified (setter called)
-   */
-  private boolean modified;
-
-  /**
-   * The property that cause a reference to lazy load.
-   */
-  private String loadProperty;
-
-  public NodeUsageCollector(ObjectGraphNode node, WeakReference<NodeUsageListener> managerRef) {
-    this.node = node;
-    // weak to allow garbage collection.
-    this.managerRef = managerRef;
+  public State state() {
+    return state;
  }

  /**
   * The bean has been modified by a setter method.
   */
  public void setModified() {
-    modified = true;
+    state.modified = true;
  }

  /**
   * Add the name of a property that has been used.
   */
  public void addUsed(String property) {
-    used.add(property);
-  }
-
-  /**
-   * The property that invoked a lazy load.
-   */
-  public void setLoadProperty(String loadProperty) {
-    this.loadProperty = loadProperty;
-  }
-
-  /**
-   * Publish the usage info to the manager.
-   */
-  private void publishUsageInfo() {
-    NodeUsageListener manager = managerRef.get();
-    if (manager != null) {
-      manager.collectNodeUsage(this);
-    }
-  }
-
-  /**
-   * publish the collected usage information when garbage collection occurs.
-   */
-  @Override
-  protected void finalize() throws Throwable {
-    publishUsageInfo();
-    super.finalize();
-  }
-
-  /**
-   * Return the associated node which identifies the location in the object
-   * graph of the bean/reference.
-   */
-  public ObjectGraphNode getNode() {
-    return node;
-  }
-
-  /**
-   * Return true if no properties where used.
-   */
-  public boolean isEmpty() {
-    return used.isEmpty();
-  }
-
-  /**
-   * Return the set of used properties.
-   */
-  public Set<String> getUsed() {
-    return used;
-  }
-
-  /**
-   * Return true if the bean was modified by a setter.
-   */
-  public boolean isModified() {
-    return modified;
-  }
-
-  public String getLoadProperty() {
-    return loadProperty;
+    state.used.add(property);
  }

  @Override
  public String toString() {
-    return node + " read:" + used + " modified:" + modified;
+    return state.toString();
  }
 }
@@ -10,7 +10,6 @@ public interface NodeUsageListener {
   * <p>
   * This is the properties that are used for a given bean in the object graph.
   * This information is used by autoTune to tune queries.
-   * </p>
   */
-  void collectNodeUsage(NodeUsageCollector collector);
+  void collectNodeUsage(NodeUsageCollector.State state);
 }
@@ -0,0 +1,12 @@
+package io.ebean.bean;
+
+/**
+ * A type that can participate in building toString content with ToStringBuilder.
+ */
+public interface ToStringAware {
+
+  /**
+   * Append to the ToStringBuilder.
+   */
+  void toString(ToStringBuilder builder);
+}
@@ -0,0 +1,190 @@
+package io.ebean.bean;
+
+import io.ebean.common.BeanMap;
+
+import java.util.Collection;
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+/**
+ * Helps build toString content taking into account recursion.
+ * <p>
+ * That is, it detects and handles the case where there are relationships that recurse
+ * and would otherwise become an infinite loop (e.g. bidirectional parent child).
+ */
+public final class ToStringBuilder {
+
+  /**
+   * The max number of objects that we allow before stopping content being appended.
+   */
+  private static final int MAX = 100;
+
+  /**
+   * Max length of content in string form added for any given value.
+   */
+  private static final int TRIM_LENGTH = 500;
+
+  /**
+   * The max total content after which we stop content being appended.
+   */
+  private static final int MAX_TOTAL_CONTENT = 2000;
+
+  private final IdentityHashMap<Object, Integer> id = new IdentityHashMap<>();
+  private final StringBuilder sb = new StringBuilder(50);
+  private boolean first = true;
+  private int counter;
+
+  @Override
+  public String toString() {
+    return sb.toString();
+  }
+
+  /**
+   * Set of an object being added.
+   */
+  public void start(Object bean) {
+    if (counter == 0) {
+      id.putIfAbsent(bean, 0);
+    }
+    if (counter <= MAX) {
+      sb.append(bean.getClass().getSimpleName()).append("@").append(counter).append("(");
+    }
+  }
+
+  /**
+   * Add a property as name value pair.
+   */
+  public void add(String name, Object value) {
+    if (value != null && counter <= MAX) {
+      if (value instanceof BeanCollection) {
+        if (((BeanCollection<?>)value).isReference()) {
+          // suppress unloaded bean collections
+          return;
+        }
+      }
+      key(name);
+      value(value);
+    }
+  }
+
+  /**
+   * Add raw content.
+   */
+  public void addRaw(String content) {
+    sb.append(content);
+  }
+
+  /**
+   * End of an object.
+   */
+  public void end() {
+    if (counter <= MAX) {
+      sb.append(")");
+    }
+  }
+
+  private void key(String name) {
+    if (counter > MAX) {
+      return;
+    }
+    if (first) {
+      first = false;
+    } else {
+      sb.append(", ");
+    }
+    sb.append(name).append(":");
+  }
+
+  private void value(Object value) {
+    if (counter > MAX) {
+      return;
+    }
+    if (value instanceof ToStringAware) {
+      if (value instanceof BeanCollection) {
+        ((ToStringAware) value).toString(this);
+      } else if (push(value)) {
+        ((ToStringAware) value).toString(this);
+      }
+    } else if (value instanceof Collection) {
+      addCollection((Collection<?>) value);
+    } else if (value instanceof Map) {
+      addMap(((Map<?, ?>) value));
+    } else {
+      String content = String.valueOf(value);
+      if (content.length() > TRIM_LENGTH) {
+        content = content.substring(0, TRIM_LENGTH) + " <trimmed>";
+      }
+      sb.append(content);
+      if (sb.length() >= MAX_TOTAL_CONTENT) {
+        sb.append(" ...");
+        counter += MAX;
+      }
+    }
+  }
+
+  public void addMap(Map<?,?> map) {
+    if (map == null || map.isEmpty()) {
+      sb.append("{}");
+    } else {
+      boolean firstElement = true;
+      sb.append("{");
+      for (Map.Entry<?, ?> entry : map.entrySet()) {
+        if (firstElement) {
+          firstElement = false;
+        } else {
+          sb.append(", ");
+        }
+        sb.append(entry.getKey()).append(":");
+        value(entry.getValue());
+        if (counter > MAX) {
+          return;
+        }
+      }
+      sb.append("}");
+    }
+  }
+
+  /**
+   * Add a collection of values.
+   */
+  public void addCollection(Collection<?> c) {
+    if (c == null || c.isEmpty()) {
+      sb.append("[]");
+      return;
+    }
+    boolean firstElement = true;
+    sb.append("[");
+    for (Object o : c) {
+      if (firstElement) {
+        firstElement = false;
+      } else {
+        sb.append(", ");
+      }
+      value(o);
+      if (counter > MAX) {
+        return;
+      }
+    }
+    sb.append("]");
+  }
+
+  private boolean push(Object bean) {
+    if (counter > MAX) {
+      return false;
+    }
+    if (counter == MAX) {
+      sb.append(" ...");
+      counter++;
+      return false;
+    }
+    Integer idx = id.putIfAbsent(bean, counter++);
+    if (idx != null) {
+      --counter;
+      sb.append(bean.getClass().getSimpleName()).append("@").append(idx);
+      return false;
+    }
+    first = true;
+    return true;
+  }
+
+}
@@ -1,5 +1,6 @@
 package io.ebean.cache;

+import io.avaje.lang.Nullable;
 import io.ebean.meta.MetricVisitor;

 import java.util.LinkedHashMap;
@@ -68,40 +69,39 @@ public interface ServerCache {
  /**
   * Return the number of entries in the cache.
   */
-  int size();
+  default int size() {
+    return 0;
+  }

  /**
   * Return the hit ratio the cache is currently getting.
   */
  default int hitRatio() {
-    return getHitRatio();
+    return 0;
  }

-  /**
-   * Deprecated migrate to hitRatio().
-   */
-  @Deprecated
-  int getHitRatio();
-
  /**
   * Return statistics for the cache.
   *
   * @param reset if true the statistics are reset.
   */
+  @Nullable
  default ServerCacheStatistics statistics(boolean reset) {
-    return getStatistics(reset);
+    return null;
  }

-  /**
-   * Deprecated migrate to statistics().
-   */
-  @Deprecated
-  ServerCacheStatistics getStatistics(boolean reset);
-
  /**
   * Visit the metrics for the cache.
   */
  default void visit(MetricVisitor visitor) {
    // do nothing by default
  }
+
+  /**
+   * Unwrap the underlying ServerCache.
+   */
+  @SuppressWarnings("unchecked")
+  default <T> T unwrap(Class<T> cls) {
+    return (T) this;
+  }
 }
@@ -13,6 +13,7 @@ public class ServerCacheConfig {
  private final ServerCacheOptions cacheOptions;
  private final CurrentTenantProvider tenantProvider;
  private final QueryCacheEntryValidate queryCacheEntryValidate;
+  private final TenantAwareKey tenantAwareKey;

  public ServerCacheConfig(ServerCacheType type, String cacheKey, String shortName, ServerCacheOptions cacheOptions, CurrentTenantProvider tenantProvider, QueryCacheEntryValidate queryCacheEntryValidate) {
    this.type = type;
@@ -21,6 +22,14 @@ public class ServerCacheConfig {
    this.cacheOptions = cacheOptions;
    this.tenantProvider = tenantProvider;
    this.queryCacheEntryValidate = queryCacheEntryValidate;
+    this.tenantAwareKey = (tenantProvider == null) ? null : new TenantAwareKey(tenantProvider);
+  }
+
+  /**
+   * Return the ServerCache taking into account if multi-tenant is used.
+   */
+  public ServerCache tenantAware(ServerCache cache) {
+    return tenantAwareKey == null ? cache : new TenantAwareCache(cache, tenantAwareKey);
  }

  /**
--- a/Show More
+++ b/Show More