Bump to 13.7.0

Add SqlQuery usingTransaction() for consistency and deprecate ExtendedServer API

.github/workflows/build.yml

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

.github/workflows/db2luw.yml

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

.github/workflows/h2database.yml

@@ -37,5 +37,5 @@ jobs:
     - name: Maven version
       run: mvn --version
     - name: H2Database
-      run: mvn clean package
+      run: mvn -T 8 clean package
 

.github/workflows/jdk-18-ea.yml

@@ -35,5 +35,5 @@ jobs:
           ~/.m2
         key: build-${{ env.cache-name }}
     - name: Build with Maven
-      run: mvn package
+      run: mvn -T 8 test
 

.github/workflows/jdk-ea.yml

@@ -16,9 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ## valhalla - failing on javadoc with:
-        ## javadoc: error - The code being documented uses packages in the unnamed module, but the packages defined in https://ebean.io/platforms/ebean-platform-h2/apidocs/ are in named modules.
-        java_version: [GA,EA,loom,metropolis,panama]
+        java_version: [GA,EA]
         os: [ubuntu-latest]
 
     steps:
@@ -39,5 +37,5 @@ jobs:
     - name: Maven version
       run: mvn --version
     - name: Build with Maven
-      run: mvn package
+      run: mvn -T 8 test
 

.github/workflows/mariadb.yml

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

.github/workflows/mysql.yml

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

.github/workflows/oracle.yml

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

.github/workflows/postgres.yml

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

.github/workflows/sqlserver.yml

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

README.md

@@ -1,26 +1,56 @@
+
 [![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)
 [![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>
@@ -50,13 +80,14 @@
 </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
 

composites/ebean-clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.6.3</tag>
-  </scm>
 </project>

composites/ebean-cockroach/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.6.3</tag>
-  </scm>
 </project>

composites/ebean-db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.6.3</tag>
-  </scm>
 </project>

composites/ebean-h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.6.3</tag>
-  </scm>
 </project>

composites/ebean-hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.6.3</tag>
-  </scm>
 </project>

composites/ebean-mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.6.3</tag>
-  </scm>
 </project>

composites/ebean-mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.6.3</tag>
-  </scm>
 </project>

composites/ebean-nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.6.3</tag>
-  </scm>
 </project>

composites/ebean-oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.6.3</tag>
-  </scm>
 </project>

composites/ebean-postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.6.3</tag>
-  </scm>
 </project>

composites/ebean-sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.6.3</tag>
-  </scm>
 </project>

composites/ebean-sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.6.3</tag>
-  </scm>
 </project>

composites/ebean-yugabyte/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.6.3</tag>
-  </scm>
 </project>

composites/ebean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.6.3</tag>
-  </scm>
 </project>

composites/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <artifactId>composites</artifactId>

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean api</name>
@@ -27,7 +27,13 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>2.0</version>
+      <version>2.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-applog-slf4j</artifactId>
+      <version>1.0</version>
     </dependency>
 
     <!--
@@ -37,25 +43,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>3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>8.0</version>
+      <version>${ebean-annotation.version}</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-types</artifactId>
-      <version>2.2</version>
+      <version>3.0</version>
     </dependency>
 
     <dependency>
@@ -103,4 +109,23 @@
 
   </dependencies>
 
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>**/ebean-maven-version.txt</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>false</filtering>
+        <excludes>
+          <exclude>**/ebean-maven-version.txt</exclude>
+        </excludes>
+      </resource>
+    </resources>
+  </build>
+
 </project>

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

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

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

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

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

@@ -238,7 +238,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:
@@ -961,7 +961,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);
    *     ...
    *   }
    * });
@@ -1010,9 +1010,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>

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

@@ -30,10 +30,8 @@ import java.util.concurrent.Callable;
  * singleton (see {@link DatabaseConfig#setRegister(boolean)}). The DB
  * singleton is essentially a map of Database's that have been registered
  * with it.
- * </p>
  * <p>
  * The Database can then be retrieved later via {@link DB#byName(String)}.
- * </p>
  *
  * <h5>The 'default' Database</h5>
  * <p>
@@ -41,18 +39,15 @@ import java.util.concurrent.Callable;
  * (see {@link DatabaseConfig#setDefaultServer(boolean)}. Many methods on DB
  * such as {@link DB#find(Class)} etc are actually just a convenient way to
  * call methods on the 'default/primary' Database.
- * </p>
  *
  * <h5>Constructing a Database</h5>
  * <p>
- * Database's are constructed by the DatabaseFactory. They can be created
+ * Databases are constructed by the DatabaseFactory. They can be created
  * programmatically via {@link DatabaseFactory#create(DatabaseConfig)} or they
  * can be automatically constructed on demand using configuration information in
  * the application.properties file.
- * </p>
  *
  * <h5>Example: Get a Database</h5>
- * <p>
  * <pre>{@code
  *
  *   // Get access to the Human Resources Database
@@ -71,22 +66,19 @@ import java.util.concurrent.Callable;
  *
  * <h5>Database vs DB API</h5>
  * <p>
- * Database provides additional API compared with DB. For example it
+ * Database provides additional API compared with DB. For example, it
  * provides more control over the use of Transactions that is not available in
  * the DB API.
- * </p>
  *
  * <p>
  * <em>External Transactions:</em> If you wanted to use transactions created
  * externally to Ebean then Database provides additional methods where you
  * can explicitly pass a transaction (that can be created externally).
- * </p>
  *
  * <p>
- * <em>Bypass ThreadLocal Mechanism:</em> If you want to bypass the built in
+ * <em>Bypass ThreadLocal Mechanism:</em> If you want to bypass the built-in
  * ThreadLocal transaction management you can use the createTransaction()
  * method. Example: a single thread requires more than one transaction.
- * </p>
  *
  * @see DB
  * @see DatabaseFactory
@@ -104,12 +96,10 @@ public interface Database {
    * Shutdown the Database instance programmatically.
    * <p>
    * This method is not normally required. Ebean registers a shutdown hook and shuts down cleanly.
-   * </p>
    * <p>
    * If the under underlying DataSource is the Ebean implementation then you
-   * also have the option of shutting down the DataSource and deregistering the
+   * also have the option of shutting down the DataSource and de-registering the
    * JDBC driver.
-   * </p>
    *
    * @param shutdownDataSource if true then shutdown the underlying DataSource if it is the Ebean
    *                           DataSource implementation.
@@ -155,10 +145,10 @@ public interface Database {
    * <p>
    * Note many platforms have multiple specific platform types so often we want to
    * get the base platform via {@link Platform#base()}.
-   * </p>
+   *
    * <pre>{@code
    *
-   *  Platform platform = database.getPlatform().base();
+   *  Platform platform = database.platform().base();
    *  if (platform == Platform.MYSQL) {
    *    // do MySql specific function
    *  }
@@ -178,7 +168,6 @@ public interface Database {
    * Return the BeanState for a given entity bean.
    * <p>
    * This will return null if the bean is not an enhanced entity bean.
-   * </p>
    */
   BeanState beanState(Object bean);
 
@@ -192,7 +181,6 @@ public interface Database {
    * <p>
    * For example, if the id value passed in is a String but ought to be a Long or UUID etc
    * then it will automatically be converted.
-   * </p>
    *
    * @param bean The entity bean to set the id value on.
    * @param id   The id value to set.
@@ -204,7 +192,6 @@ public interface Database {
    * <p>
    * When null is passed in for b, then the 'OldValues' of a is used for the
    * difference comparison.
-   * </p>
    */
   Map<String, ValuePair> diff(Object newBean, Object oldBean);
 
@@ -214,7 +201,6 @@ public interface Database {
    * Useful if you use BeanPostConstructListeners or &#64;PostConstruct Annotations.
    * In this case you should not use "new Bean...()". Making all bean constructors protected
    * could be a good idea here.
-   * </p>
    */
   <T> T createEntityBean(Class<T> type);
 
@@ -248,7 +234,6 @@ public interface Database {
    * 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
@@ -304,17 +289,14 @@ public interface Database {
    * <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()}
    * {@link Query#findSet()} etc will execute against the same Database from
    * which is was created.
-   * </p>
-   * <p>
+   *
    * <pre>{@code
    *
    *   // Find order 2 specifying explicitly the parts of the object graph to
@@ -344,7 +326,7 @@ public interface Database {
    * 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";
@@ -367,12 +349,10 @@ public interface Database {
    * <p>
    * This will only work when a IdGenerator is on the bean such as for beans
    * that use 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>
    */
   Object nextId(Class<?> beanType);
 
@@ -381,10 +361,8 @@ public interface Database {
    * 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>
    */
   <T> Filter<T> filter(Class<T> beanType);
 
@@ -401,12 +379,10 @@ public interface Database {
    * <p>
    * If you leave off any keywords the defaults are ascending order and treating
    * nulls as high values.
-   * </p>
    * <p>
    * Note that the sorting uses a Comparator and Collections.sort(); and does
    * not invoke a DB query.
-   * </p>
-   * <p>
+   *
    * <pre>{@code
    *
    *   // find orders and their customers
@@ -431,17 +407,15 @@ public interface Database {
   <T> void sort(List<T> list, String sortByClause);
 
   /**
-   * Create a orm update where you will supply the insert/update or delete
+   * Create an orm update where you will supply the insert/update or delete
    * statement (rather than using a named one that is already defined using the
    * &#064;NamedUpdates annotation).
    * <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>
-   * <p>
+   *
    * <pre>{@code
    *
    *   // The bean name and properties - "topic","postCount" and "id"
@@ -466,7 +440,6 @@ public interface Database {
    * <p>
    * DTO beans are just normal bean like classes with public constructor(s) and setters.
    * They do not need to be registered with DB before use.
-   * </p>
    *
    * @param dtoType The type of the DTO bean the rows will be mapped into.
    * @param sql     The SQL query to execute.
@@ -479,7 +452,6 @@ public interface Database {
    * <p>
    * DTO beans are just normal bean like classes with public constructor(s) and setters.
    * They do not need to be registered with DB before use.
-   * </p>
    *
    * @param dtoType    The type of the DTO bean the rows will be mapped into.
    * @param namedQuery The name of the query
@@ -493,10 +465,8 @@ public interface Database {
    *
    * <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>
    */
   SqlQuery sqlQuery(String sql);
 
@@ -505,11 +475,9 @@ public interface Database {
    * <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
    */
@@ -522,7 +490,7 @@ public interface Database {
 
   /**
    * 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.
@@ -536,7 +504,6 @@ public interface Database {
    * 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>
    */
   Transaction createTransaction();
 
@@ -544,7 +511,6 @@ public interface Database {
    * Create a new transaction additionally specifying the isolation level.
    * <p>
    * Note that this transaction is NOT stored in a thread local.
-   * </p>
    */
   Transaction createTransaction(TxIsolation isolation);
 
@@ -552,86 +518,77 @@ public interface Database {
    * 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>
    * <p>
+   * Example of using a transaction to span multiple calls to find(), save() etc.
+   *
    * <h3>Using try with resources</h3>
    * <pre>{@code
    *
-   *    // start a transaction (stored in a ThreadLocal)
+   *   // start a transaction (stored in a ThreadLocal)
+   *   try (Transaction txn = database.beginTransaction()) {
    *
-   *    try (Transaction txn = database.beginTransaction()) {
+   *     Order order = database.find(Order.class, 10);
+   *     ...
+   *     database.save(order);
    *
-   * 	    Order order = database.find(Order.class, 10);
-   * 	    ...
-   * 	    database.save(order);
-   *
-   * 	    txn.commit();
-   *    }
+   *     txn.commit();
+   *   }
    *
    * }</pre>
-   * <p>
+   *
    * <h3>Using try finally block</h3>
    * <pre>{@code
    *
-   *    // start a transaction (stored in a ThreadLocal)
-   *    Transaction txn = database.beginTransaction();
-   *    try {
-   * 	    Order order = database.find(Order.class,10);
+   *   // start a transaction (stored in a ThreadLocal)
+   *   Transaction txn = database.beginTransaction();
+   *   try {
+   * 	   Order order = database.find(Order.class,10);
    *
-   * 	    database.save(order);
-   *
-   * 	    txn.commit();
-   *
-   *    } finally {
-   * 	    txn.end();
-   *    }
+   *     database.save(order);
+   *     txn.commit();
    *
+   *   } finally {
+   *     txn.end();
+   *   }
    * }</pre>
-   * <p>
+   *
    * <h3>Transaction options</h3>
    * <pre>{@code
    *
-   *     try (Transaction txn = database.beginTransaction()) {
+   *   try (Transaction txn = database.beginTransaction()) {
    *
-   *       // explicitly turn on/off JDBC batch use
-   *       txn.setBatchMode(true);
-   *       txn.setBatchSize(50);
+   *     // explicitly turn on/off JDBC batch use
+   *     txn.setBatchMode(true);
+   *     txn.setBatchSize(50);
    *
-   *       // control flushing when mixing save and queries
-   *       txn.setBatchFlushOnQuery(false);
+   *     // control flushing when mixing save and queries
+   *     txn.setBatchFlushOnQuery(false);
    *
-   *       // turn off persist cascade if needed
-   *       txn.setPersistCascade(false);
+   *     // turn off persist cascade if needed
+   *     txn.setPersistCascade(false);
    *
-   *       // for large batch insert processing when we do not
-   *       // ... need the generatedKeys, don't get them
-   *       txn.setBatchGetGeneratedKeys(false);
+   *     // for large batch insert processing when we do not
+   *     // ... need the generatedKeys, don't get them
+   *     txn.setBatchGetGeneratedKeys(false);
    *
-   *       // explicitly flush the JDBC batch buffer
-   *       txn.flush();
+   *     // explicitly flush the JDBC batch buffer
+   *     txn.flush();
    *
-   *       ...
+   *     ...
    *
-   *       txn.commit();
-   *    }
+   *     txn.commit();
+   *   }
    *
    * }</pre>
    * <p>
-   * <p>
    * If you want to externalise the transaction management then you use
    * createTransaction() and pass the transaction around to the various methods on
    * Database yourself.
-   * </p>
    */
   Transaction beginTransaction();
 
@@ -643,11 +600,9 @@ public interface Database {
   /**
    * Start a transaction typically specifying REQUIRES_NEW or REQUIRED semantics.
    * <p>
-   * <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
    * // Start a new transaction. If there is a current transaction
@@ -694,10 +649,8 @@ public interface Database {
    * This only is useful when JDBC batch is used. Flush occurs automatically when the
    * transaction commits or batch size is reached. This manually flushes the JDBC batch
    * buffer.
-   * </p>
    * <p>
    * This is the same as <code>currentTransaction().flush()</code>.
-   * </p>
    */
   void flush();
 
@@ -717,7 +670,6 @@ public interface Database {
    * <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>
@@ -744,7 +696,6 @@ public interface Database {
    * <p>
    * Note that this resets OneToMany and ManyToMany properties so that if they
    * are accessed a lazy load will refresh the many property.
-   * </p>
    */
   void refresh(Object bean);
 
@@ -763,12 +714,11 @@ public interface Database {
    *   // Fetch order 1
    *   Order order = database.find(Order.class, 1);
    * }</pre>
-   * <p>
+   *
    * <p>
    * If you want more control over the query then you can use createQuery() and
    * Query.findOne();
-   * </p>
-   * <p>
+   *
    * <pre>{@code
    *   // ... additionally fetching customer, customer shipping address,
    *   // order details, and the product associated with each order detail.
@@ -810,10 +760,9 @@ public interface Database {
    * <p>
    * This will not perform a query against the database unless some property other
    * that the id property is accessed.
-   * </p>
    * <p>
    * It is most commonly used to set a 'foreign key' on another bean like:
-   * </p>
+   *
    * <pre>{@code
    *
    *   Product product = database.getReference(Product.class, 1);
@@ -853,12 +802,10 @@ public interface Database {
    * <p>
    * The extended API has the options for executing queries that take an explicit
    * transaction as an argument.
-   * </p>
    * <p>
-   * Typically we only need to use the extended API when we do NOT want to use the
+   * Typically, we only need to use the extended API when we do NOT want to use the
    * usual ThreadLocal based mechanism to obtain the current transaction but instead
    * supply the transaction explicitly.
-   * </p>
    */
   ExtendedServer extended();
 
@@ -867,32 +814,27 @@ public interface Database {
    * <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>
    * In this example below the details property has a CascadeType.ALL set so
    * saving an order will also save all its details.
-   * </p>
-   * <p>
+   *
    * <pre>{@code
    *   public class Order { ...
    *
    *     @OneToMany(cascade=CascadeType.ALL, mappedBy="order")
-   * 	   List<OrderDetail> details;
-   * 	   ...
+   *     List<OrderDetail> details;
+   *     ...
    *   }
    * }</pre>
    * <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>
    */
   void save(Object bean) throws OptimisticLockException;
 
@@ -910,16 +852,13 @@ public interface Database {
    * 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 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>
    */
   boolean delete(Object bean) throws OptimisticLockException;
 
@@ -927,12 +866,10 @@ public interface Database {
    * Delete the bean with an explicit transaction.
    * <p>
    * This will return true if the bean was deleted successfully or JDBC batch is being used.
-   * </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. However, if JDBC batch mode is used then this always returns true.
-   * </p>
    */
   boolean delete(Object bean, Transaction transaction) throws OptimisticLockException;
 
@@ -1014,16 +951,13 @@ public interface Database {
    * <p>
    * If you wish to execute a Sql Select natively then you should use the
    * SqlQuery object or DtoQuery.
-   * </p>
    * <p>
    * Note that the table modification information is automatically deduced and
    * you do not need to call the DB.externalModification() method when you
    * use this method.
-   * </p>
    * <p>
    * Example:
-   * </p>
-   * <p>
+   *
    * <pre>{@code
    *
    *   // example that uses 'named' parameters
@@ -1051,7 +985,6 @@ public interface Database {
    * transaction.
    * <p>
    * This returns the number of rows that where inserted, updated or deleted.
-   * </p>
    */
   int execute(Update<?> update);
 
@@ -1065,8 +998,7 @@ public interface Database {
    * For making calls to stored procedures.
    * <p>
    * Example:
-   * </p>
-   * <p>
+   *
    * <pre>{@code
    *
    *   String sql = "{call sp_order_modify(?,?,?)}";
@@ -1091,23 +1023,19 @@ public interface Database {
    * <p>
    * If you use database.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 inserted  true if rows where inserted into the table
@@ -1147,7 +1075,6 @@ public interface Database {
    * Note: This checks only the root bean!
    * <p>
    * <pre>{@code
-   *
    *   // there is a unique constraint on title
    *
    *   Document doc = new Document();
@@ -1176,7 +1103,7 @@ public interface Database {
    *     // uniqueProperties > [title]
    *     //       custom msg > property[title] value[One flew over the cuckoo's nest]
    *
-   *  }
+   *   }
    *
    * }</pre>
    *
@@ -1200,13 +1127,12 @@ public interface Database {
    * dirty so that it is not skipped.
    * <p>
    * <pre>{@code
+   *   Customer customer = database.find(Customer, id);
    *
-   * Customer customer = database.find(Customer, id);
-   *
-   * // mark the bean as dirty so that a save() or update() will
-   * // increment the version property
-   * database.markAsDirty(customer);
-   * database.save(customer);
+   *   // mark the bean as dirty so that a save() or update() will
+   *   // increment the version property
+   *   database.markAsDirty(customer);
+   *   database.save(customer);
    *
    * }</pre>
    */
@@ -1219,18 +1145,17 @@ public interface Database {
    * <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>
+   *
    * <pre>{@code
    *
-   * // A 'stateless update' example
-   * Customer customer = new Customer();
-   * customer.setId(7);
-   * customer.setName("ModifiedNameNoOCC");
-   * database.update(customer);
+   *   // A 'stateless update' example
+   *   Customer customer = new Customer();
+   *   customer.setId(7);
+   *   customer.setName("ModifiedNameNoOCC");
+   *   database.update(customer);
    *
    * }</pre>
    */
@@ -1281,7 +1206,6 @@ public interface Database {
    * Compared to save() this forces bean to perform an insert rather than trying to decide
    * based on the bean state. As such this is useful when you fetch beans from one database
    * and want to insert them into another database (and you want to explicitly insert them).
-   * </p>
    */
   void insert(Object bean);
 
@@ -1314,21 +1238,18 @@ public interface Database {
   /**
    * Execute a Runnable in a Transaction with an explicit scope.
    * <p>
-   * The scope can control the transaction type, isolation and rollback
-   * semantics.
-   * </p>
-   * <p>
+   * The scope can control the transaction type, isolation and rollback semantics.
+   *
    * <pre>{@code
+   *  // set specific transactional scope settings
+   *  TxScope scope = TxScope.requiresNew().setIsolation(TxIsolation.SERIALIZABLE);
    *
-   *   // set specific transactional scope settings
-   *   TxScope scope = TxScope.requiresNew().setIsolation(TxIsolation.SERIALIZABLE);
-   *
-   *   database.execute(scope, new Runnable() {
-   * 	   public void run() {
-   * 		   User u1 = database.find(User.class, 1);
-   * 		   ...
-   *     }
-   *   });
+   *  database.execute(scope, new Runnable() {
+   *    public void run() {
+   *      User u1 = database.find(User.class, 1);
+   *      ...
+   *    }
+   *  });
    *
    * }</pre>
    */
@@ -1339,21 +1260,19 @@ public interface Database {
    * <p>
    * The default scope runs with REQUIRED and by default will rollback on any
    * exception (checked or runtime).
-   * </p>
-   * <p>
+   *
    * <pre>{@code
+   *  database.execute(() -> {
    *
-   *    database.execute(() -> {
+   *    User u1 = database.find(User.class, 1);
+   *    User u2 = database.find(User.class, 2);
    *
-   *        User u1 = database.find(User.class, 1);
-   *        User u2 = database.find(User.class, 2);
+   *    u1.setName("u1 mod");
+   *    u2.setName("u2 mod");
    *
-   *        u1.setName("u1 mod");
-   *        u2.setName("u2 mod");
-   *
-   *        u1.save();
-   *        u2.save();
-   *    });
+   *    u1.save();
+   *    u2.save();
+   *  });
    *
    * }</pre>
    */
@@ -1364,18 +1283,16 @@ public interface Database {
    * <p>
    * The scope can control the transaction type, isolation and rollback
    * semantics.
-   * </p>
-   * <p>
-   * <pre>{@code
    *
+   * <pre>{@code
    *   // set specific transactional scope settings
    *   TxScope scope = TxScope.requiresNew().setIsolation(TxIsolation.SERIALIZABLE);
    *
    *   database.executeCall(scope, new Callable<String>() {
-   * 	   public String call() {
-   * 		   User u1 = database.find(User.class, 1);
-   * 		   ...
-   * 		   return u1.getEmail();
+   *     public String call() {
+   *       User u1 = database.find(User.class, 1);
+   *       ...
+   *       return u1.getEmail();
    *     }
    *   });
    *
@@ -1388,10 +1305,8 @@ public interface Database {
    * <p>
    * The default scope runs with REQUIRED and by default will rollback on any
    * exception (checked or runtime).
-   * </p>
-   * <p>
-   * <pre>{@code
    *
+   * <pre>{@code
    *   database.executeCall(new Callable<String>() {
    *     public String call() {
    *       User u1 = database.find(User.class, 1);
@@ -1406,7 +1321,6 @@ public interface Database {
    *       return u1.getEmail();
    *     }
    *   });
-   *
    * }</pre>
    */
   <T> T executeCall(Callable<T> callable);
@@ -1417,8 +1331,7 @@ public interface Database {
   ServerCacheManager cacheManager();
 
   /**
-   * Return the BackgroundExecutor service for asynchronous processing of
-   * queries.
+   * Return the BackgroundExecutor service for asynchronous processing of queries.
    */
   BackgroundExecutor backgroundExecutor();
 
@@ -1427,33 +1340,30 @@ public interface Database {
    * <p>
    * This instance is safe to be used concurrently by multiple threads and this
    * method is cheap to call.
-   * </p>
-   * <p>
+   *
    * <h3>Simple example:</h3>
    * <pre>{@code
-   *
-   *     JsonContext json = database.json();
-   *     String jsonOutput = json.toJson(list);
-   *     System.out.println(jsonOutput);
-   *
+   *   JsonContext json = database.json();
+   *   String jsonOutput = json.toJson(list);
+   *   System.out.println(jsonOutput);
    * }</pre>
+   *
    * <p>
    * <h3>Using PathProperties:</h3>
    * <pre>{@code
+   *   // specify just the properties we want
+   *   PathProperties paths = PathProperties.parse("name, status, anniversary");
    *
-   *     // specify just the properties we want
-   *     PathProperties paths = PathProperties.parse("name, status, anniversary");
+   *   List<Customer> customers =
+   *     database.find(Customer.class)
+   *       // apply those paths to the query (only fetch what we need)
+   *       .apply(paths)
+   *       .where().ilike("name", "rob%")
+   *       .findList();
    *
-   *     List<Customer> customers =
-   *       database.find(Customer.class)
-   *         // apply those paths to the query (only fetch what we need)
-   *         .apply(paths)
-   *         .where().ilike("name", "rob%")
-   *         .findList();
-   *
-   *     // ... get the json
-   *     JsonContext jsonContext = database.json();
-   *     String json = jsonContext.toJson(customers, paths);
+   *   // ... get the json
+   *   JsonContext jsonContext = database.json();
+   *   String json = jsonContext.toJson(customers, paths);
    *
    * }</pre>
    *
@@ -1478,7 +1388,6 @@ public interface Database {
    * Publish a single bean given its type and id returning the resulting live bean.
    * <p>
    * The values are published from the draft to the live bean.
-   * </p>
    *
    * @param <T>         the type of the entity bean
    * @param beanType    the type of the entity bean
@@ -1493,7 +1402,6 @@ public interface Database {
    * This will use the current transaction or create one if required.
    * <p>
    * The values are published from the draft to the live bean.
-   * </p>
    *
    * @param <T>      the type of the entity bean
    * @param beanType the type of the entity bean
@@ -1506,7 +1414,6 @@ public interface Database {
    * Publish the beans that match the query returning the resulting published beans.
    * <p>
    * The values are published from the draft beans to the live beans.
-   * </p>
    *
    * @param <T>         the type of the entity bean
    * @param query       the query used to select the draft beans to publish
@@ -1519,7 +1426,6 @@ public interface Database {
    * This will use the current transaction or create one if required.
    * <p>
    * The values are published from the draft beans to the live beans.
-   * </p>
    *
    * @param <T>   the type of the entity bean
    * @param query the query used to select the draft beans to publish
@@ -1531,7 +1437,6 @@ public interface Database {
    * <p>
    * The values from the live beans are set back to the draft bean and the
    * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
-   * </p>
    *
    * @param <T>         the type of the entity bean
    * @param beanType    the type of the entity bean
@@ -1546,7 +1451,6 @@ public interface Database {
    * <p>
    * The values from the live beans are set back to the draft bean and the
    * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
-   * </p>
    *
    * @param <T>      the type of the entity bean
    * @param beanType the type of the entity bean
@@ -1560,7 +1464,6 @@ public interface Database {
    * <p>
    * The values from the live beans are set back to the draft bean and the
    * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
-   * </p>
    *
    * @param <T>         the type of the entity bean
    * @param query       the query used to select the draft beans to restore
@@ -1573,7 +1476,6 @@ public interface Database {
    * <p>
    * The values from the live beans are set back to the draft bean and the
    * <code>@DraftDirty</code> and <code>@DraftReset</code> properties are reset.
-   * </p>
    *
    * @param <T>   the type of the entity bean
    * @param query the query used to select the draft beans to restore
@@ -1585,7 +1487,6 @@ public interface Database {
    * <p>
    * Validate the query checking the where and orderBy expression paths to confirm if
    * they represent valid properties/path for the given bean type.
-   * </p>
    */
   <T> Set<String> validateQuery(Query<T> query);
 
@@ -1611,6 +1512,6 @@ public interface Database {
   /**
    * Truncate the base tables for the given bean types.
    */
-  void truncate(Class<?>... tables);
+  void truncate(Class<?>... beanTypes);
 
 }

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

@@ -3,8 +3,7 @@ package io.ebean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.util.Properties;
 
 /**
@@ -29,9 +28,11 @@ public final 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.info("ebean version: {}", version);
@@ -88,7 +89,7 @@ public final 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;

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

@@ -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
@@ -826,6 +835,20 @@ public interface ExpressionList<T> {
    */
   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.
    */

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

@@ -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,465 +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);
 
   /**
-   * 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)
+   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
    */
+  @Deprecated
   <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);
 

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

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

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

@@ -925,6 +925,11 @@ public interface Query<T> extends CancelableQuery {
    */
   <A> List<A> findSingleAttributeList();
 
+  /**
+   * Execute the query returning a hashset of values for a single property.
+   */
+  <A> Set<A> findSingleAttributeSet();
+
   /**
    * Execute a query returning a single value of a single property/column.
    * <p>
@@ -1574,10 +1579,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);
 
   /**

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

@@ -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.
    */
@@ -298,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.
      */

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

@@ -6,6 +6,12 @@ import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
 
+/**
+ * This is the object associated to every entity bean using byte code enhancement.
+ * <p>
+ * This provides per property state such as loaded state, changed state, original values
+ * as well as bean level dirty state etc.
+ */
 public interface EntityBeanIntercept extends Serializable {
 
   /**
@@ -282,8 +288,14 @@ public interface EntityBeanIntercept extends Serializable {
    */
   void markPropertyAsChanged(int propertyIndex);
 
+  /**
+   * Set the changed state for the given property.
+   */
   void setChangedProperty(int propertyIndex);
 
+  /**
+   * Set the changed and loaded state for the given property.
+   */
   void setChangeLoaded(int propertyIndex);
 
   /**
@@ -291,6 +303,9 @@ public interface EntityBeanIntercept extends Serializable {
    */
   void setEmbeddedPropertyDirty(int propertyIndex);
 
+  /**
+   * Set the original value for the property.
+   */
   void setOriginalValue(int propertyIndex, Object value);
 
   /**
@@ -358,6 +373,9 @@ public interface EntityBeanIntercept extends Serializable {
    */
   StringBuilder getLoadedPropertyKey();
 
+  /**
+   * Return the loaded state for all the properties.
+   */
   boolean[] getLoaded();
 
   /**
@@ -385,6 +403,9 @@ public interface EntityBeanIntercept extends Serializable {
    */
   void initialisedMany(int propertyIndex);
 
+  /**
+   * Invoke the PreGetterCallback if it has been set due to getter for the given property.
+   */
   void preGetterCallback(int propertyIndex);
 
   /**
@@ -402,8 +423,14 @@ public interface EntityBeanIntercept extends Serializable {
    */
   void preSetterMany(boolean interceptField, int propertyIndex, Object oldValue, Object newValue);
 
+  /**
+   * Set the property changed state, bean dirtyState and property original value.
+   */
   void setChangedPropertyValue(int propertyIndex, boolean setDirtyState, Object origValue);
 
+  /**
+   * Set the dirty state on the bean.
+   */
   void setDirtyStatus();
 
   /**
@@ -482,6 +509,9 @@ public interface EntityBeanIntercept extends Serializable {
    */
   void setDeletedFromCollection(boolean deletedFromCollection);
 
+  /**
+   * Return true if the bean was orphan deleted from a collection.
+   */
   boolean isOrphanDelete();
 
   /**
@@ -494,7 +524,10 @@ public interface EntityBeanIntercept extends Serializable {
    */
   Map<String, Exception> getLoadErrors();
 
-  boolean isChangedProp(int i);
+  /**
+   * Return true if the property has its changed state set.
+   */
+  boolean isChangedProp(int propertyIndex);
 
   /**
    * Return the MutableValueInfo for the given property or null.

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

@@ -6,10 +6,20 @@ 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;
   }

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

@@ -21,7 +21,6 @@ import java.util.concurrent.locks.ReentrantLock;
  * <p>
  * This provides the mechanisms to support deferred fetching of reference beans
  * and oldValues generation for concurrency checking.
- * </p>
  */
 public final class InterceptReadWrite implements EntityBeanIntercept {
 
@@ -32,24 +31,17 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   private static final int STATE_LOADED = 2;
 
   /**
-   * Used when a bean is partially filled.
+   * Used when a bean is partially loaded.
    */
   private static final byte FLAG_LOADED_PROP = 1;
   private static final byte FLAG_CHANGED_PROP = 2;
   private static final byte FLAG_CHANGEDLOADED_PROP = 3;
   /**
-   * Flags indicating if a property is a dirty embedded bean. Used to distinguish
-   * between an embedded bean being completely overwritten and one of its
-   * embedded properties being made dirty.
+   * Flags indicating if a property is a dirty embedded bean. Used to distinguish between an
+   * embedded bean being completely overwritten vs one with embedded properties that are dirty.
    */
   private static final byte FLAG_EMBEDDED_DIRTY = 4;
-  /**
-   * Flags indicating if a property is a dirty embedded bean. Used to distinguish
-   * between an embedded bean being completely overwritten and one of its
-   * embedded properties being made dirty.
-   */
   private static final byte FLAG_ORIG_VALUE_SET = 8;
-
   /**
    * Flags indicating if the mutable hash is set.
    */
@@ -78,10 +70,9 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   private boolean readOnly;
   private boolean dirty;
   /**
-   * Flag set to disable lazy loading - typically for SQL "report" type entity beans.
+   * Flag set to disable lazy loading.
    */
   private boolean disableLazyLoad;
-
   /**
    * Flag set when lazy loading failed due to the underlying bean being deleted in the DB.
    */
@@ -107,7 +98,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   private MutableValueNext[] mutableNext;
 
   /**
-   * Create a intercept with a given entity.
+   * Create with a given entity.
    */
   public InterceptReadWrite(Object ownerBean) {
     this.owner = (EntityBean) ownerBean;

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

@@ -16,6 +16,7 @@ import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
+import io.ebean.meta.MetricNamingMatch;
 import io.ebean.util.StringHelper;
 
 import javax.persistence.EnumType;
@@ -24,6 +25,7 @@ import java.time.Clock;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.function.Function;
 
 /**
  * The configuration used for creating a Database.
@@ -115,9 +117,9 @@ public class DatabaseConfig {
   private TenantCatalogProvider tenantCatalogProvider;
 
   /**
-   * When true will load entity classes via ModuleInfoLoader.
+   * When true will load entity classes via EntityClassRegister.
    * <p>
-   * NB: ModuleInfoLoader implementations are generated by querybean generator.
+   * NB: EntityClassRegister implementations are generated by querybean generator.
    * Having this on and registering entity classes means we don't need to manually
    * write that code or use classpath scanning to find entity classes.
    */
@@ -546,6 +548,8 @@ public class DatabaseConfig {
 
   private String dumpMetricsOptions;
 
+  private Function<String, String> metricNaming = MetricNamingMatch.INSTANCE;
+
   /**
    * Construct a Database Configuration for programmatically creating an Database.
    */
@@ -3376,7 +3380,7 @@ public class DatabaseConfig {
   }
 
   /**
-   * Return true if entity classes should be loaded and registered via ModuleInfoLoader.
+   * Return true if entity classes should be loaded and registered via EntityClassRegister.
    * <p>
    * When false we either register entity classes via application code or use classpath
    * scanning to find and register entity classes.
@@ -3396,6 +3400,20 @@ public class DatabaseConfig {
     this.loadModuleInfo = loadModuleInfo;
   }
 
+  /**
+   * Return the naming convention to apply to metrics names.
+   */
+  public Function<String, String> getMetricNaming() {
+    return metricNaming;
+  }
+
+  /**
+   * Set the naming convention to apply to metrics names.
+   */
+  public void setMetricNaming(Function<String, String> metricNaming) {
+    this.metricNaming = metricNaming;
+  }
+
   public enum UuidVersion {
     VERSION4,
     VERSION1,

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

@@ -5,7 +5,7 @@ import java.util.List;
 /**
  * Loads and returns entity classes to register with Ebean databases.
  */
-public interface ModuleInfoLoader {
+public interface EntityClassRegister {
 
   /**
    * Return entity classes to register for a named DB (not default DB).

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

@@ -802,20 +802,6 @@ public class DatabasePlatform {
     }
   }
 
-  /**
-   * Return true if partitions exist for the given table.
-   */
-  public boolean tablePartitionsExist(Connection connection, String table) throws SQLException {
-    return true;
-  }
-
-  /**
-   * Return the SQL to create an initial partition for the given table.
-   */
-  public String tablePartitionInit(String tableName, PartitionMode mode) {
-    return null;
-  }
-
   /**
    * Escapes the like string for this DB-Platform
    */

ebean-api/src/main/java/io/ebean/meta/BasicMetricVisitor.java

@@ -2,28 +2,57 @@ package io.ebean.meta;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * A simple MetricVisitor that can collect the desired metrics into lists.
  */
 public class BasicMetricVisitor extends AbstractMetricVisitor implements ServerMetrics {
 
+  private final String name;
+  private final Function<String,String> naming;
   private final List<MetaTimedMetric> timed = new ArrayList<>();
   private final List<MetaQueryMetric> query = new ArrayList<>();
   private final List<MetaCountMetric> count = new ArrayList<>();
 
+  public BasicMetricVisitor() {
+    this("db", MetricNamingMatch.INSTANCE);
+  }
+
   /**
    * Construct to reset and collect everything.
    */
-  public BasicMetricVisitor() {
-    super(true, true, true, true);
+  public BasicMetricVisitor(String name, Function<String,String> naming) {
+    this(name, naming, true, true, true, true);
   }
 
   /**
    * Construct specifying reset and what to collect.
    */
-  public BasicMetricVisitor(boolean reset, boolean collectTransactionMetrics, boolean collectQueryMetrics, boolean collectL2Metrics) {
+  public BasicMetricVisitor(String name, Function<String,String> naming, boolean reset, boolean collectTransactionMetrics, boolean collectQueryMetrics, boolean collectL2Metrics) {
     super(reset, collectTransactionMetrics, collectQueryMetrics, collectL2Metrics);
+    this.name = name;
+    this.naming = naming;
+  }
+
+  @Override
+  public String name() {
+    return name;
+  }
+
+  @Override
+  public Function<String, String> namingConvention() {
+    return naming;
+  }
+
+  @Override
+  public ServerMetricsAsJson asJson() {
+    return new MetricsAsJson(this);
+  }
+
+  @Override
+  public List<MetricData> asData() {
+    return new MetricsAsData(this).data();
   }
 
   @Override

ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java

@@ -17,21 +17,20 @@ public interface MetaInfoManager {
   ServerMetrics collectMetrics();
 
   /**
-   * Collect the metrics in raw JSON form.
-   * <pre>{@code
-   *
-   *   String metricsJson = database.getMetaInfoManager()
-   *       .collectMetricsAsJson()
-   *       .json();
-   *
-   * }</pre>
+   * Deprecated migrate to collectMetrics().asJson().
    */
-  ServerMetricsAsJson collectMetricsAsJson();
+  @Deprecated
+  default ServerMetricsAsJson collectMetricsAsJson() {
+    return collectMetrics().asJson();
+  }
 
   /**
-   * Return the metrics as a list of MetricData.
+   * Deprecated migrate to collectMetrics().asData().
    */
-  List<MetricData> collectMetricsAsData();
+  @Deprecated
+  default List<MetricData> collectMetricsAsData() {
+    return collectMetrics().asData();
+  }
 
   /**
    * Visit the metrics resetting and collecting/reporting as desired.

ebean-api/src/main/java/io/ebean/meta/MetricNamingMatch.java

@@ -0,0 +1,16 @@
+package io.ebean.meta;
+
+import java.util.function.Function;
+
+/**
+ * Metric naming convention that is exact match.
+ */
+public final class MetricNamingMatch implements Function<String, String> {
+
+  public static final Function<String, String> INSTANCE = new MetricNamingMatch();
+
+  @Override
+  public String apply(String name) {
+    return name;
+  }
+}

ebean-api/src/main/java/io/ebean/meta/MetricVisitor.java

@@ -1,10 +1,17 @@
 package io.ebean.meta;
 
+import java.util.function.Function;
+
 /**
  * Defines visitor to read and report the transaction and query metrics.
  */
 public interface MetricVisitor {
 
+  /**
+   * Return the naming convention that should be applied to the reported metric names.
+   */
+  Function<String, String> namingConvention();
+
   /**
    * Return true if the metrics should be reset.
    */

ebean-api/src/main/java/io/ebean/meta/MetricsAsData.java

@@ -1,12 +1,4 @@
-package io.ebeaninternal.server.core;
-
-import io.ebean.Database;
-import io.ebean.meta.MetaCountMetric;
-import io.ebean.meta.MetaMetric;
-import io.ebean.meta.MetaQueryMetric;
-import io.ebean.meta.MetaTimedMetric;
-import io.ebean.meta.MetricData;
-import io.ebean.meta.ServerMetrics;
+package io.ebean.meta;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,34 +6,26 @@ import java.util.List;
 /**
  * Dump the metrics into a list of MetricData.
  */
-final class DumpMetricsData {
+final class MetricsAsData {
 
-  private final Database database;
+  private final ServerMetrics metrics;
   private final List<MetricData> list = new ArrayList<>();
 
-  DumpMetricsData(Database database) {
-    this.database = database;
+  MetricsAsData(ServerMetrics metrics) {
+    this.metrics = metrics;
   }
 
   List<MetricData> data() {
-    collect(database.metaInfo().collectMetrics());
-    return list;
-  }
-
-  private void collect(ServerMetrics serverMetrics) {
-    final List<MetaTimedMetric> timedMetrics = serverMetrics.timedMetrics();
-    final List<MetaCountMetric> countMetrics = serverMetrics.countMetrics();
-    final List<MetaQueryMetric> queryMetrics = serverMetrics.queryMetrics();
-
-    for (MetaTimedMetric metric : timedMetrics) {
+    for (MetaTimedMetric metric : metrics.timedMetrics()) {
       add(metric);
     }
-    for (MetaCountMetric metric : countMetrics) {
+    for (MetaCountMetric metric : metrics.countMetrics()) {
       addCount(metric);
     }
-    for (MetaQueryMetric metric : queryMetrics) {
+    for (MetaQueryMetric metric : metrics.queryMetrics()) {
       addQuery(metric);
     }
+    return list;
   }
 
   private MetricData create(MetaMetric metric) {

ebean-api/src/main/java/io/ebean/meta/MetricsAsJson.java

@@ -1,25 +1,16 @@
-package io.ebeaninternal.server.core;
-
-import io.ebean.Database;
-import io.ebean.meta.MetaCountMetric;
-import io.ebean.meta.MetaMetric;
-import io.ebean.meta.MetaQueryMetric;
-import io.ebean.meta.MetaTimedMetric;
-import io.ebean.meta.ServerMetrics;
-import io.ebean.meta.ServerMetricsAsJson;
-import io.ebean.meta.SortMetric;
+package io.ebean.meta;
 
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Comparator;
 import java.util.List;
 
-final class DumpMetricsJson implements ServerMetricsAsJson {
+final class MetricsAsJson implements ServerMetricsAsJson {
 
-  private final Database database;
+  private final ServerMetrics metrics;
   private Appendable writer;
   /**
-   * By default include sql and location attributes for the initial collection only.
+   * By default, include sql and location attributes for the initial collection only.
    */
   private int includeExtraAttributes = 1;
   private boolean withHeader = true;
@@ -29,8 +20,8 @@ final class DumpMetricsJson implements ServerMetricsAsJson {
   private int listCounter;
   private int objKeyCounter;
 
-  DumpMetricsJson(Database database) {
-    this.database = database;
+  MetricsAsJson(ServerMetrics metrics) {
+    this.metrics = metrics;
   }
 
   @Override
@@ -66,24 +57,24 @@ final class DumpMetricsJson implements ServerMetricsAsJson {
   @Override
   public String json() {
     writer = new StringWriter();
-    collect(database.metaInfo().collectMetrics());
+    collect();
     return writer.toString();
   }
 
   @Override
   public void write(Appendable buffer) {
     writer = buffer;
-    collect(database.metaInfo().collectMetrics());
+    collect();
   }
 
-  private void collect(ServerMetrics serverMetrics) {
+  private void collect() {
     try {
       start();
-      for (MetaTimedMetric metric : serverMetrics.timedMetrics()) {
+      for (MetaTimedMetric metric : metrics.timedMetrics()) {
         logTimed(metric);
       }
 
-      List<MetaCountMetric> countMetrics = serverMetrics.countMetrics();
+      List<MetaCountMetric> countMetrics = metrics.countMetrics();
       if (!countMetrics.isEmpty()) {
         if (sortBy != null) {
           countMetrics.sort(SortMetric.COUNT_NAME);
@@ -93,7 +84,7 @@ final class DumpMetricsJson implements ServerMetricsAsJson {
         }
       }
 
-      List<MetaQueryMetric> queryMetrics = serverMetrics.queryMetrics();
+      List<MetaQueryMetric> queryMetrics = metrics.queryMetrics();
       if (!queryMetrics.isEmpty()) {
         if (sortBy != null) {
           queryMetrics.sort(sortBy);
@@ -112,7 +103,7 @@ final class DumpMetricsJson implements ServerMetricsAsJson {
     if (withHeader) {
       objStart();
       key("db");
-      val(database.name());
+      val(metrics.name());
       key("metrics");
       listStart();
     }

ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java

@@ -7,6 +7,21 @@ import java.util.List;
  */
 public interface ServerMetrics {
 
+  /**
+   * Return the name of the database these metrics were obtained for.
+   */
+  String name();
+
+  /**
+   * Return ServerMetricsAsJson to build the metrics as JSON content.
+   */
+  ServerMetricsAsJson asJson();
+
+  /**
+   * Return the metrics as a list of MetricData.
+   */
+  List<MetricData> asData();
+
   /**
    * Return timed metrics for Transactions, labelled SqlQuery, labelled SqlUpdate.
    */

ebean-api/src/main/resources/META-INF/ebean-maven-version.txt

@@ -0,0 +1 @@
+${project.version}

ebean-autotune/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.6.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,16 +26,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
       <scope>provided</scope>
     </dependency>
 
     <!-- needed for java 11+ -->
     <dependency>
-      <groupId>org.glassfish.jaxb</groupId>
-      <artifactId>jaxb-runtime</artifactId>
-      <version>2.3.6</version>
-      <scope>provided</scope>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
     </dependency>
 
     <dependency>
@@ -55,7 +60,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -70,7 +75,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:13.6.0</tile>
+            <tile>io.ebean.tile:enhancement:13.6.5</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Autotune.java

@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.autotune.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ObjectFactory.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.autotune.model;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Origin.java

@@ -1,10 +1,10 @@
 package io.ebeaninternal.server.autotune.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileDiff.java

@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.autotune.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileEmpty.java

@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.autotune.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileNew.java

@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.autotune.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/package-info.java

@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/autotune", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/autotune", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package io.ebeaninternal.server.autotune.model;

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java

@@ -3,9 +3,9 @@ package io.ebeaninternal.server.autotune.service;
 
 import io.ebeaninternal.server.autotune.model.Autotune;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java

@@ -3,9 +3,9 @@ package io.ebeaninternal.server.autotune.service;
 
 import io.ebeaninternal.server.autotune.model.Autotune;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java

@@ -143,6 +143,7 @@ public class BaseQueryTuner {
     switch (type) {
       case COUNT:
       case ATTRIBUTE:
+      case ATTRIBUTE_SET:
       case ID_LIST:
       case UPDATE:
       case DELETE:

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

@@ -10,6 +10,5 @@ module io.ebean.autotune {
 
   requires io.ebean.api;
   requires io.ebean.core;
-  requires java.xml;
-  requires java.xml.bind;
+  requires jakarta.xml.bind;
 }

ebean-bom/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -18,6 +18,13 @@
 
       <!-- dependencies external to this ebean.git build -->
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-annotation</artifactId>
+        <version>${ebean-annotation.version}</version>
+      </dependency>
+
+
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-runner</artifactId>
@@ -71,88 +78,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.6.3</version>
+        <version>13.7.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.6.3</version>
+        <version>13.7.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.6.3</version>
+        <version>13.7.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.6.3</version>
+        <version>13.7.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.6.3</version>
+        <version>13.7.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.6.3</version>
+        <version>13.7.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.6.3</version>
+        <version>13.7.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.6.3</version>
+        <version>13.7.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.6.3</version>
+        <version>13.7.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.6.3</version>
+        <version>13.7.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.6.3</version>
+        <version>13.7.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.6.3</version>
+        <version>13.7.0</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.6.3</version>
+        <version>13.7.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.6.3</version>
+        <version>13.7.0</version>
       </dependency>
 
     </dependencies>

ebean-core-type/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>

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

@@ -16,25 +16,24 @@ import java.sql.SQLException;
  * <p>
  * Scalar in the sense that the types are not compound types. Scalar types only
  * map to a single database column.
- * </p>
  * <p>
  * These types fall into two categories. Types that are mapped natively to JDBC
  * types and the rest. Types that map to native JDBC types do not require any
  * data type conversion to be persisted to the database. These are java types
  * that map via java.sql.Types.
- * </p>
  * <p>
  * Types that are not native to JDBC require some conversion. These include some
  * common java types such as java.util.Date, java.util.Calendar,
  * java.math.BigInteger.
- * </p>
  * <p>
  * Note that Booleans may be native for some databases and require conversion on
  * other databases.
- * </p>
  */
 public interface ScalarType<T> extends StringParser, StringFormatter, ScalarDataReader<T> {
 
+  /**
+   * Return true for types that do mutation detection based on json content.
+   */
   default boolean isJsonMapper() {
     return false;
   }
@@ -43,38 +42,40 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    * Return true if this is a binary type and can not support parse() and format() from/to string.
    * This allows Ebean to optimise marshalling types to string.
    */
-  boolean isBinaryType();
+  default boolean isBinaryType() {
+    return false;
+  }
 
   /**
    * Return true if this is a mutable scalar type (like hstore).
    */
-  boolean isMutable();
+  default boolean isMutable() {
+    return false;
+  }
 
   /**
    * For mutable scalarType's return true if the value is dirty.
    * Non-dirty properties may be excluded from updates.
    */
-  boolean isDirty(Object value);
+  default boolean isDirty(Object value) {
+    return false;
+  }
 
   /**
    * Return the default DB column length for this type.
    * <p>
    * If a BeanProperty has no explicit length defined then this length should
    * be assigned.
-   * </p>
-   * <p>
-   * This is primarily to support defining a length on Enum types (to
-   * supplement defining the length on the BeanProperty directly).
-   * </p>
    */
-  int getLength();
+  default int getLength() {
+    return 0;
+  }
 
   /**
    * Return true if the type is native to JDBC.
    * <p>
    * If it is native to JDBC then its values/instances do not need to be
    * converted to and from an associated JDBC type.
-   * </p>
    */
   boolean isJdbcNative();
 
@@ -83,16 +84,13 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    * <p>
    * This type should be consistent with the toJdbcType() method in converting
    * the type to the appropriate type for binding to preparedStatements.
-   * </p>
    */
   int getJdbcType();
 
   /**
    * Return the type that matches the bean property type.
    * <p>
-   * This represents the 'logical' type rather than the JDBC type this maps
-   * to.
-   * </p>
+   * This represents the 'logical' type rather than the JDBC type this maps to.
    */
   Class<T> getType();
 
@@ -104,7 +102,7 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
   T read(DataReader reader) throws SQLException;
 
   /**
-   * Ignore the reading of this value. Typically this means moving the index
+   * Ignore the reading of this value. Typically, this means moving the index
    * position in the ResultSet.
    */
   void loadIgnore(DataReader reader);
@@ -114,20 +112,16 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    * <p>
    * value may need to be converted from the logical bean property type to the
    * JDBC type.
-   * </p>
    */
   void bind(DataBinder binder, T value) throws SQLException;
 
   /**
    * Convert the value as necessary to the JDBC type.
    * <p>
-   * Note that this should also match the type as per the getJdbcType()
-   * method.
-   * </p>
+   * Note that this should also match the type as per the getJdbcType() method.
    * <p>
    * This is typically used when the matching type is used in a where clause
    * and we use this to ensure it is an appropriate jdbc type.
-   * </p>
    */
   Object toJdbcType(Object value);
 
@@ -135,19 +129,14 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    * Convert the value as necessary to the logical Bean type.
    * <p>
    * The type as per the bean property.
-   * </p>
    * <p>
    * This is used to automatically convert id values (typically from a string
    * to a int, long or UUID).
-   * </p>
    */
   T toBeanType(Object value);
 
   /**
    * Convert the type into a string representation.
-   * <p>
-   * Reciprocal of parse().
-   * </p>
    */
   String formatValue(T value);
 
@@ -155,10 +144,8 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    * Convert the type into a string representation.
    * <p>
    * This assumes the value is of the correct type.
-   * </p>
    * <p>
    * This is so that ScalarType also implements the StringFormatter interface.
-   * </p>
    */
   @Override
   String format(Object value);
@@ -167,10 +154,6 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    * Convert the string value to the appropriate java object.
    * <p>
    * Mostly used to support CSV, JSON and XML parsing.
-   * </p>
-   * <p>
-   * Reciprocal of formatValue().
-   * </p>
    */
   @Override
   T parse(String value);
@@ -183,29 +166,32 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
   /**
    * Return true if the type can accept long systemTimeMillis input.
    * <p>
-   * This is used to determine if is is sensible to use the
+   * This is used to determine if it is sensible to use the
    * {@link #convertFromMillis(long)} method.
-   * </p>
    * <p>
    * This includes the Date, Calendar, sql Date, Time, Timestamp, JODA types
    * as well as Long, BigDecimal and String (although it generally is not
    * expected to parse systemTimeMillis to a String or BigDecimal).
-   * </p>
    */
-  boolean isDateTimeCapable();
+  default boolean isDateTimeCapable() {
+    return false;
+  }
 
   /**
    * Convert the value into a long version value.
    */
-  long asVersion(T value);
+  default long asVersion(T value) {
+    throw new UnsupportedOperationException();
+  }
 
   /**
    * Convert the systemTimeMillis into the appropriate java object.
    * <p>
    * For non dateTime types this will throw an exception.
-   * </p>
    */
-  T convertFromMillis(long dateTime);
+  default T convertFromMillis(long dateTime) {
+    throw new UnsupportedOperationException();
+  }
 
   /**
    * Read the value from binary input.
@@ -215,7 +201,7 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
   /**
    * Write the value to binary output.
    */
-  void writeData(DataOutput dataOutput, T v) throws IOException;
+  void writeData(DataOutput dataOutput, T value) throws IOException;
 
   /**
    * Read the value from JsonParser.

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.6.3</version>
+    <version>13.7.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.6.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
     </dependency>
 
     <dependency>
@@ -136,7 +136,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.3.3</version>
+      <version>42.4.1</version>
       <optional>true</optional>
     </dependency>
 
@@ -144,21 +144,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.6.3</version>
+      <version>13.7.0</version>
       <scope>test</scope>
     </dependency>
 

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

@@ -25,6 +25,11 @@ import java.util.stream.Stream;
  */
 public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectionLoader {
 
+  /**
+   * Return the NOW time from the Clock.
+   */
+  long clockNow();
+
   /**
    * Return true if the L2 cache has been disabled.
    */

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

@@ -92,6 +92,11 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
      */
     ATTRIBUTE(FIND_ATTRIBUTE, "findAttribute", false, false),
 
+    /**
+     * Find single attribute set.
+     */
+    ATTRIBUTE_SET(FIND_ATTRIBUTE_SET, "findAttributeSet", false, false),
+
     /**
      * Find rowCount.
      */
@@ -412,6 +417,8 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
 
   /**
    * Return a copy of the query.
+   * <p>
+   * Note that this does NOT copy the forUpdate property. See #2762.
    */
   @Override
   SpiQuery<T> copy();

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

@@ -1,10 +1,17 @@
 package io.ebeaninternal.api;
 
+import io.avaje.lang.Nullable;
 import io.ebean.SqlQuery;
+import io.ebean.Transaction;
 
 /**
  * SQL query - Internal extension to SqlQuery.
  */
 public interface SpiSqlQuery extends SqlQuery, SpiSqlBinding {
 
+  /**
+   * Return the transaction explicitly associated to the query.
+   */
+  @Nullable
+  Transaction transaction();
 }

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

@@ -28,6 +28,7 @@ public interface TxnProfileEventCodes {
   String FIND_ID_LIST = "fi";
   String FIND_EXISTS = "ex";
   String FIND_ATTRIBUTE = "fa";
+  String FIND_ATTRIBUTE_SET = "fas";
   String FIND_COUNT = "fc";
   String FIND_SUBQUERY = "fs";
 

ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java

@@ -33,4 +33,6 @@ public interface SpiJsonReader {
   void beanVisitor(Object bean, Map<String, Object> unmappedProperties);
 
   Object readValueUsingObjectMapper(Class<?> propertyType) throws IOException;
+
+  boolean isIntercept();
 }

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

@@ -199,7 +199,7 @@ final class DefaultBeanLoader {
     query.setLazyLoadProperty(ebi.getLazyLoadProperty());
     if (draft) {
       query.asDraft();
-    } else if (mode == SpiQuery.Mode.LAZYLOAD_BEAN) {
+    } else if (mode == SpiQuery.Mode.LAZYLOAD_BEAN && desc.isSoftDelete()) {
       query.setIncludeSoftDeletes();
     }
     if (embeddedOwnerIndex > -1) {

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

@@ -1,12 +1,7 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.config.BackgroundExecutorWrapper;
-import io.ebean.config.ContainerConfig;
-import io.ebean.config.DatabaseConfig;
-import io.ebean.config.DatabaseConfigProvider;
-import io.ebean.config.ModuleInfoLoader;
-import io.ebean.config.TenantMode;
-import io.ebean.config.UnderscoreNamingConvention;
+import io.ebean.config.*;
+import io.ebean.config.EntityClassRegister;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.event.ShutdownManager;
 import io.ebean.service.SpiContainer;
@@ -129,7 +124,7 @@ public final class DefaultContainer implements SpiContainer {
     if (config.isAutoLoadModuleInfo()) {
       // auto register entity classes
       boolean found = false;
-      for (ModuleInfoLoader loader : ServiceLoader.load(ModuleInfoLoader.class)) {
+      for (EntityClassRegister loader : ServiceLoader.load(EntityClassRegister.class)) {
         config.addAll(loader.classesFor(config.getName(), config.isDefaultServer()));
         found = true;
       }
@@ -140,9 +135,9 @@ public final class DefaultContainer implements SpiContainer {
   }
 
   private void checkMissingModulePathProvides() {
-    URL servicesFile = ClassLoader.getSystemResource("META-INF/services/io.ebean.config.ModuleInfoLoader");
+    URL servicesFile = ClassLoader.getSystemResource("META-INF/services/io.ebean.config.EntityClassRegister");
     if (servicesFile != null) {
-      log.error("module-info.java is probably missing 'provides io.ebean.config.ModuleInfoLoader with _Ebean$ModuleInfo' clause. ModuleInfoLoader exists but was not service loaded.");
+      log.error("module-info.java is probably missing 'provides io.ebean.config.EntityClassRegister with EbeanEntityRegister' clause. EntityClassRegister exists but was not service loaded.");
     }
   }
 

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

@@ -1,20 +1,9 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.meta.AbstractMetricVisitor;
-import io.ebean.meta.BasicMetricVisitor;
-import io.ebean.meta.MetaCountMetric;
-import io.ebean.meta.MetaInfoManager;
-import io.ebean.meta.MetaQueryMetric;
-import io.ebean.meta.MetaQueryPlan;
-import io.ebean.meta.MetaTimedMetric;
-import io.ebean.meta.MetricData;
-import io.ebean.meta.MetricVisitor;
-import io.ebean.meta.QueryPlanInit;
-import io.ebean.meta.QueryPlanRequest;
-import io.ebean.meta.ServerMetrics;
-import io.ebean.meta.ServerMetricsAsJson;
+import io.ebean.meta.*;
 
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * DefaultServer based implementation of MetaInfoManager.
@@ -22,9 +11,11 @@ import java.util.List;
 final class DefaultMetaInfoManager implements MetaInfoManager {
 
   private final DefaultServer server;
+  private final Function<String, String> naming;
 
-  DefaultMetaInfoManager(DefaultServer server) {
+  DefaultMetaInfoManager(DefaultServer server, Function<String, String> naming) {
     this.server = server;
+    this.naming = naming;
   }
 
   @Override
@@ -47,19 +38,9 @@ final class DefaultMetaInfoManager implements MetaInfoManager {
     return visitBasic();
   }
 
-  @Override
-  public ServerMetricsAsJson collectMetricsAsJson() {
-    return new DumpMetricsJson(server);
-  }
-
-  @Override
-  public List<MetricData> collectMetricsAsData() {
-    return new DumpMetricsData(server).data();
-  }
-
   @Override
   public BasicMetricVisitor visitBasic() {
-    BasicMetricVisitor basic = new BasicMetricVisitor();
+    BasicMetricVisitor basic = new BasicMetricVisitor(server.name(), naming);
     visitMetrics(basic);
     return basic;
   }
@@ -78,6 +59,11 @@ final class DefaultMetaInfoManager implements MetaInfoManager {
       super(true, true, true, true);
     }
 
+    @Override
+    public Function<String, String> namingConvention() {
+      return MetricNamingMatch.INSTANCE;
+    }
+
     @Override
     public void visitTimed(MetaTimedMetric metric) {
       // ignore

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

@@ -213,7 +213,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     this.transactionManager = config.createTransactionManager(this, docStoreComponents.updateProcessor());
     this.documentStore = docStoreComponents.documentStore();
     this.queryPlanManager = config.initQueryPlanManager(transactionManager);
-    this.metaInfoManager = new DefaultMetaInfoManager(this);
+    this.metaInfoManager = new DefaultMetaInfoManager(this, this.config.getMetricNaming());
     this.serverPlugins = config.getPlugins();
     this.ddlGenerator = config.initDdlGenerator(this);
     this.scriptRunner = new DScriptRunner(this);
@@ -1186,14 +1186,34 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   @SuppressWarnings("unchecked")
   public <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction) {
-    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ATTRIBUTE, query, transaction);
+    SpiOrmQueryRequest<T> request = buildQueryRequest(Type.ATTRIBUTE, query, transaction);
+    request.query().setSingleAttribute();
+    request.prepareQuery();
     Object result = request.getFromQueryCache();
     if (result != null) {
       return (List<A>) result;
     }
     try {
       request.initTransIfRequired();
-      return request.findSingleAttributeList();
+      return request.findSingleAttributeCollection(new ArrayList<>());
+    } finally {
+      request.endTransIfRequired();
+    }
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public <A, T> Set<A> findSingleAttributeSet(Query<T> query, Transaction transaction) {
+    SpiOrmQueryRequest<T> request = buildQueryRequest(Type.ATTRIBUTE_SET, query, transaction);
+    request.query().setSingleAttribute();
+    request.prepareQuery();
+    Object result = request.getFromQueryCache();
+    if (result != null) {
+      return (Set<A>) result;
+    }
+    try {
+      request.initTransIfRequired();
+      return request.findSingleAttributeCollection(new LinkedHashSet<>());
     } finally {
       request.endTransIfRequired();
     }
@@ -1494,7 +1514,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   private <P> P executeSqlQuery(Function<RelationalQueryRequest, P> fun, SpiSqlQuery query) {
-    RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query, null);
+    RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query, query.transaction());
     try {
       request.initTransIfRequired();
       return fun.apply(request);

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

@@ -6,6 +6,7 @@ import io.ebean.bean.BeanCollection;
 
 import javax.persistence.PersistenceException;
 import java.sql.SQLException;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -29,9 +30,9 @@ public interface OrmQueryEngine {
   <T> BeanCollection<T> findMany(OrmQueryRequest<T> request);
 
   /**
-   * Execute the findSingleAttributeList query.
+   * Execute the findSingleAttributeCollection query.
    */
-  <A> List<A> findSingleAttributeList(OrmQueryRequest<?> request);
+  <A extends Collection<?>> A findSingleAttributeCollection(OrmQueryRequest<?> request, A collection);
 
   /**
    * Execute the findVersions query.

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

@@ -431,8 +431,8 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   }
 
   @Override
-  public <A> List<A> findSingleAttributeList() {
-    return queryEngine.findSingleAttributeList(this);
+  public <A extends Collection<?>> A findSingleAttributeCollection(A collection) {
+    return queryEngine.findSingleAttributeCollection(this, collection);
   }
 
   /**
@@ -458,8 +458,8 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   /**
    * Return the many property that is fetched in the query or null if there is not one.
    */
-  public BeanPropertyAssocMany<?> manyProperty() {
-    return manyProperty;
+  public BeanPropertyAssocMany<?> manyPropertyForOrderBy() {
+    return query.isSingleAttribute() ? null : manyProperty;
   }
 
   /**

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

@@ -77,8 +77,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    */
   private List<BeanPropertyAssocMany<?>> updatedManys;
   /**
-   * Need to get and store the updated properties because the persist listener is notified
-   * later on a different thread and the bean has been reset at that point.
+   * Store the updated properties to notify persist listener.
    */
   private Set<String> updatedProperties;
   /**
@@ -122,7 +121,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    */
   private boolean complete;
   /**
-   * Many to many intersection table changes that are held for later batch processing.
+   * Many-to-many intersection table changes that are held for later batch processing.
    */
   private List<SaveMany> saveMany;
 
@@ -148,9 +147,10 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
         // 'stateless update' - set loaded properties as dirty
         intercept.setNewBeanForUpdate();
         statelessUpdate = true;
+      } else if (!intercept.isDirty()) {
+        // check if any mutable scalar properties are dirty
+        beanDescriptor.checkAnyMutableProperties(intercept);
       }
-      // Mark Mutable scalar properties (like Hstore) as dirty where necessary
-      beanDescriptor.checkMutableProperties(intercept);
     }
     this.concurrencyMode = beanDescriptor.concurrencyMode(intercept);
     this.publish = Flags.isPublish(flags);
@@ -726,10 +726,6 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
         executeInsert();
         return -1;
       case UPDATE:
-        if (beanPersistListener != null) {
-          // store the updated properties for sending later
-          updatedProperties = updatedProperties();
-        }
         executeUpdate();
         return -1;
       case DELETE_SOFT:
@@ -1208,6 +1204,11 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   private void executeUpdate() {
     setTenantId();
     if (controller == null || controller.preUpdate(this)) {
+      // check dirty state for all mutable scalar properties (like DbJson, Hstore)
+      beanDescriptor.checkAllMutableProperties(intercept);
+      if (beanPersistListener != null) {
+        updatedProperties = updatedProperties();
+      }
       postControllerPrepareUpdate();
       beanManager.getBeanPersister().update(this);
     }

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

@@ -22,9 +22,6 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
   private int estimateCapacity;
   private int rows;
 
-  /**
-   * Create the BeanFindRequest.
-   */
   RelationalQueryRequest(SpiEbeanServer server, RelationalQueryEngine engine, SqlQuery q, Transaction t) {
     super(server, (SpiSqlBinding) q, t);
     this.queryEngine = engine;

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

@@ -7,6 +7,7 @@ import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeanservice.docstore.api.DocQueryRequest;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -122,7 +123,7 @@ public interface SpiOrmQueryRequest<T> extends BeanQueryRequest<T>, DocQueryRequ
   /**
    * Execute the findSingleAttributeList query.
    */
-  <A> List<A> findSingleAttributeList();
+  <A extends Collection<?>> A findSingleAttributeCollection(A collection);
 
   /**
    * Execute returning the ResultSet.

ebean-core/src/main/java/io/ebeaninternal/server/core/timezone/DataTimeZone.java

@@ -13,11 +13,10 @@ public interface DataTimeZone {
   Calendar getTimeZone();
 
   /**
-   * Return the Calendar to use for Timezone information when reading/writing date.
-   * A 'date' only value has normally no timezone information, but some platforms (like MySQL)
-   * reqire this.
+   * Return the Calendar to use for Timezone information when reading/writing a time component (date only/time only).
+   * A time component has normally no timezone information, but some platforms (like MySQL) reqire this.
    */
-  default Calendar getDateTimeZone() {
+  default Calendar getTimeComponentTimeZone() {
     return null;
   }
 }

ebean-core/src/main/java/io/ebeaninternal/server/core/timezone/MySqlDataTimeZone.java

@@ -19,7 +19,7 @@ public class MySqlDataTimeZone implements DataTimeZone {
   }
 
   @Override
-  public Calendar getDateTimeZone() {
+  public Calendar getTimeComponentTimeZone() {
     return zone;
   }
 }

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

@@ -1482,7 +1482,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
     iudMetrics.visit(visitor);
     for (CQueryPlan queryPlan : queryPlanCache.values()) {
       if (!queryPlan.isEmptyStats()) {
-        visitor.visitQuery(queryPlan.getSnapshot(visitor.reset()));
+        visitor.visitQuery(queryPlan.visit(visitor));
       }
     }
   }
@@ -3140,9 +3140,9 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   }
 
   /**
-   * Check for mutable scalar types and mark as dirty if necessary.
+   * Check all mutable scalar types and mark as dirty if necessary.
    */
-  public void checkMutableProperties(EntityBeanIntercept ebi) {
+  public void checkAllMutableProperties(EntityBeanIntercept ebi) {
     for (BeanProperty beanProperty : propertiesMutable) {
       int propertyIndex = beanProperty.propertyIndex();
       if (ebi.isLoadedProperty(propertyIndex)) {
@@ -3156,6 +3156,23 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
     }
   }
 
+  /**
+   * Return true if any mutable properties are dirty.
+   */
+  public boolean checkAnyMutableProperties(EntityBeanIntercept ebi) {
+    for (BeanProperty beanProperty : propertiesMutable) {
+      int propertyIndex = beanProperty.propertyIndex();
+      if (ebi.isLoadedProperty(propertyIndex)) {
+        Object value = beanProperty.getValue(ebi.getOwner());
+        if (beanProperty.checkMutable(value, ebi.isDirtyProperty(propertyIndex), ebi)) {
+          ebi.markPropertyAsChanged(propertyIndex);
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
   public ConcurrencyMode concurrencyMode(EntityBeanIntercept ebi) {
     if (!hasVersionProperty(ebi)) {
       return ConcurrencyMode.NONE;

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

@@ -578,8 +578,8 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   }
 
   private <T> String errNothingRegistered() {
-    return "There are no registered entities. If using query beans, that generates _Ebean$ModuleInfo.java into " +
-      "generated sources and is service loaded. If using module-info.java, then probably missing 'provides io.ebean.config.ModuleInfoLoader with _Ebean$ModuleInfo' clause.";
+    return "There are no registered entities. If using query beans, that generates EbeanEntityRegister.java into " +
+      "generated sources and is service loaded. If using module-info.java, then probably missing 'provides io.ebean.config.EntityClassRegister with EbeanEntityRegister' clause.";
   }
 
   private String errNotRegistered(Class<?> beanClass) {

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

@@ -1414,7 +1414,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     JsonToken event = ctx.nextToken();
     if (JsonToken.VALUE_NULL == event) {
       if (jsonDeserialize) {
-        setValue(bean, null);
+        if (ctx.isIntercept()) {
+          setValueIntercept(bean, null);
+        } else {
+          setValue(bean, null);
+        }
       }
     } else {
       // expect to read non-null json value
@@ -1433,7 +1437,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
         }
       }
       if (jsonDeserialize) {
-        setValue(bean, objValue);
+        if (ctx.isIntercept()) {
+          setValueIntercept(bean, objValue);
+        } else {
+          setValue(bean, objValue);
+        }
       }
     }
   }

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

@@ -50,7 +50,11 @@ class BeanPropertyAssocManyJsonHelp {
     if (JsonToken.START_ARRAY != event && JsonToken.START_OBJECT != event) {
       throw new JsonParseException(parser, "Unexpected token " + event + " - expecting start array or object");
     }
-    many.setValue(parentBean, many.jsonReadCollection(readJson, parentBean));
+    if (readJson.isIntercept()) {
+      many.setValueIntercept(parentBean, many.jsonReadCollection(readJson, parentBean));
+    } else {
+      many.setValue(parentBean, many.jsonReadCollection(readJson, parentBean));
+    }
   }
 
   /**

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

@@ -785,7 +785,11 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     if (jsonDeserialize && targetDescriptor != null) {
       T target = (T) value(bean);
       T assocBean = targetDescriptor.jsonRead(readJson, name, target);
-      setValue(bean, assocBean);
+      if (readJson.isIntercept()) {
+        setValueIntercept(bean, assocBean);
+      } else {
+        setValue(bean, assocBean);
+      }
     }
   }
 

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

@@ -6,7 +6,6 @@ import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.core.type.DataReader;
 import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.query.STreePropertyAssocMany;
 
 import java.util.Map;
 
@@ -70,11 +69,6 @@ public interface DbReadContext {
    */
   void register(BeanPropertyAssocMany<?> many, BeanCollection<?> bc);
 
-  /**
-   * Return the property that is associated with the many. There can only be
-   * one. This can be null.
-   */
-  STreePropertyAssocMany getManyProperty();
 
   /**
    * Set back the bean that has just been loaded with its id.

ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java

@@ -46,20 +46,29 @@ final class DtoMetaBuilder {
   }
 
   static String propertyName(String methodName) {
-    final String name = methodName.substring(3);
-    return Character.toLowerCase(name.charAt(0)) + name.substring(1);
+    if (isTraditionalSetterMethod(methodName)) {
+      final String name = methodName.substring(3);
+      return Character.toLowerCase(name.charAt(0)) + name.substring(1);
+    } else {
+      // accessor style setter method
+      return methodName;
+    }
+  }
+
+  private static boolean isTraditionalSetterMethod(String methodName) {
+    return methodName.startsWith("set") && methodName.length() > 3 && Character.isUpperCase(methodName.charAt(3));
   }
 
   /**
    * Include a public "setter" method - 1 argument, returns void.
    */
   static boolean includeMethod(Method method) {
+    String name = method.getName();
     final int modifiers = method.getModifiers();
     return Modifier.isPublic(modifiers)
       && !Modifier.isStatic(modifiers)
-      && Void.TYPE.equals(method.getReturnType())
       && method.getParameterTypes().length == 1
-      && method.getName().startsWith("set") && method.getName().length() > 3;
+      && (!name.equals("wait") && !name.equals("equals"));
   }
 
   private void readConstructors() {

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

@@ -467,6 +467,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.findSingleAttributeList();
   }
 
+  @Override
+  public <A> Set<A> findSingleAttributeSet() {
+    return query.findSingleAttributeSet();
+  }
+
   @Override
   public boolean exists() {
     return query.exists();
@@ -793,6 +798,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return add(expr.eq(propertyName, value));
   }
 
+  @Override
+  public ExpressionList<T> eqIfPresent(String propertyName, @Nullable Object value) {
+    return value == null ? this : add(expr.eq(propertyName, value));
+  }
+
   @Override
   public ExpressionList<T> eqOrNull(String propertyName, Object value) {
     return add(expr.eqOrNull(propertyName, value));

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

@@ -309,6 +309,11 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
     return exprList.eq(propertyName, value);
   }
 
+  @Override
+  public ExpressionList<T> eqIfPresent(String propertyName, @Nullable Object value) {
+    return value == null ? this : exprList.eq(propertyName, value);
+  }
+
   @Override
   public ExpressionList<T> eqOrNull(String propertyName, Object value) {
     return exprList.eqOrNull(propertyName, value);
@@ -464,6 +469,11 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
     return exprList.findSingleAttributeList();
   }
 
+  @Override
+  public <A> Set<A> findSingleAttributeSet() {
+    return exprList.findSingleAttributeSet();
+  }
+
   @Override
   public PagedList<T> findPagedList() {
     return exprList.findPagedList();

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

@@ -101,7 +101,7 @@ public final class DLoadContext implements LoadContext {
     this.useDocStore = query.isUseDocStore();
     this.asOf = query.getAsOf();
     this.asDraft = query.isAsDraft();
-    this.includeSoftDeletes = query.isIncludeSoftDeletes();
+    this.includeSoftDeletes = query.isIncludeSoftDeletes() && query.getMode() == SpiQuery.Mode.NORMAL;
     this.readOnly = query.isReadOnly();
     this.disableReadAudit = query.isDisableReadAudit();
     this.disableLazyLoading = query.isDisableLazyLoading();
@@ -234,7 +234,7 @@ public final class DLoadContext implements LoadContext {
     }
   }
 
-  protected SpiEbeanServer getEbeanServer() {
+  SpiEbeanServer getEbeanServer() {
     return ebeanServer;
   }
 
@@ -242,7 +242,7 @@ public final class DLoadContext implements LoadContext {
    * Return the parent state which defines the sharedInstance and readOnly status
    * which needs to be propagated to other beans and collections.
    */
-  protected Boolean isReadOnly() {
+  Boolean isReadOnly() {
     return readOnly;
   }
 
@@ -283,7 +283,7 @@ public final class DLoadContext implements LoadContext {
 
   DLoadBeanContext getBeanContextWithInherit(String path, BeanPropertyAssocOne<?> property) {
     String key = path + ":" + property.targetDescriptor().name();
-    return beanMap.computeIfAbsent(key, p -> createBeanContext(property, path, null));
+    return beanMap.computeIfAbsent(key, p -> createBeanContext(property, path));
   }
 
   private void registerSecondaryNode(boolean many, OrmQueryProperties props) {
@@ -313,8 +313,8 @@ public final class DLoadContext implements LoadContext {
     return new DLoadBeanContext(this, p.targetDescriptor(), path, queryProps);
   }
 
-  private DLoadBeanContext createBeanContext(BeanPropertyAssoc<?> property, String path, OrmQueryProperties queryProps) {
-    return new DLoadBeanContext(this, property.targetDescriptor(), path, queryProps);
+  private DLoadBeanContext createBeanContext(BeanPropertyAssoc<?> property, String path) {
+    return new DLoadBeanContext(this, property.targetDescriptor(), path, null);
   }
 
   private BeanProperty getBeanProperty(BeanDescriptor<?> desc, String path) {

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

@@ -126,7 +126,7 @@ final class SaveManyBeans extends SaveManyBase {
       // performance optimisation for large collections
       targetDescriptor.preAllocateIds(collection.size());
     }
-    if (!insertedParent && many.isOrphanRemoval() && request.isForcedUpdate()) {
+    if (forcedUpdateOrphanRemoval()) {
       // collect the Id's (to exclude from deleteManyDetails)
       List<Object> detailIds = collectIds(collection, targetDescriptor, isMap);
       // deleting missing children - children not in our collected detailIds
@@ -140,6 +140,10 @@ final class SaveManyBeans extends SaveManyBase {
     transaction.depth(-1);
   }
 
+  private boolean forcedUpdateOrphanRemoval() {
+    return !insertedParent && many.isOrphanRemoval() && request.isForcedUpdate();
+  }
+
   private void saveAllBeans(final BeanProperty orderColumn) {
     Object mapKeyValue = null;
     boolean skipSavingThisBean;
@@ -340,7 +344,7 @@ final class SaveManyBeans extends SaveManyBase {
       return;
     }
     if (!(value instanceof BeanCollection<?>)) {
-      if (!insertedParent && cascade && isChangedProperty()) {
+      if (!forcedUpdateOrphanRemoval() && (!insertedParent && cascade && isChangedProperty())) {
         persister.addToFlushQueue(many.deleteByParentId(request.beanId(), null), transaction, 0);
         insertAllChildren = true;
       }

ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java

@@ -13,6 +13,7 @@ final class DCountMetric implements CountMetric {
 
   private final String name;
   private final LongAdder count = new LongAdder();
+  private String reportName;
 
   DCountMetric(String name) {
     this.name = name;
@@ -50,10 +51,17 @@ final class DCountMetric implements CountMetric {
   public void visit(MetricVisitor visitor) {
     long val = visitor.reset() ? count.sumThenReset() : count.sum();
     if (val > 0) {
+      final String name = reportName != null ? reportName : reportName(visitor);
       visitor.visitCount(new DCountMetricStats(name, val));
     }
   }
 
+  String reportName(MetricVisitor visitor) {
+    final String tmp = visitor.namingConvention().apply(name);
+    this.reportName = tmp;
+    return tmp;
+  }
+
   private static class DCountMetricStats implements CountMetricStats {
 
     private final String name;

ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java

@@ -11,6 +11,7 @@ final class DQueryPlanMetric implements QueryPlanMetric {
   private final DQueryPlanMeta meta;
   private final DTimedMetric metric;
   private boolean collected;
+  private String reportName;
 
   DQueryPlanMetric(DQueryPlanMeta meta, DTimedMetric metric) {
     this.meta = meta;
@@ -21,11 +22,18 @@ final class DQueryPlanMetric implements QueryPlanMetric {
   public void visit(MetricVisitor visitor) {
     TimedMetricStats stats = metric.collect(visitor.reset());
     if (stats != null) {
-      visitor.visitQuery(new Stats(meta, stats, collected));
+      String name = reportName != null ? reportName : reportName(visitor);
+      visitor.visitQuery(new Stats(name, meta, stats, collected));
       collected = true;
     }
   }
 
+  String reportName(MetricVisitor visitor) {
+    final String tmp = visitor.namingConvention().apply(meta.getName());
+    this.reportName = tmp;
+    return tmp;
+  }
+
   @Override
   public TimedMetric metric() {
     return metric;
@@ -33,11 +41,13 @@ final class DQueryPlanMetric implements QueryPlanMetric {
 
   private static class Stats implements MetaQueryMetric {
 
+    private final String name;
     private final DQueryPlanMeta meta;
     private final TimedMetricStats stats;
     private final boolean collected;
 
-    private Stats(DQueryPlanMeta meta, TimedMetricStats stats, boolean collected) {
+    private Stats(String name, DQueryPlanMeta meta, TimedMetricStats stats, boolean collected) {
+      this.name = name;
       this.meta = meta;
       this.stats = stats;
       this.collected = collected;
@@ -75,7 +85,7 @@ final class DQueryPlanMetric implements QueryPlanMetric {
 
     @Override
     public String name() {
-      return meta.getName();
+      return name;
     }
 
     @Override

ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java

@@ -19,6 +19,7 @@ final class DTimedMetric implements TimedMetric {
   private final LongAdder total = new LongAdder();
   private final LongAccumulator max = new LongAccumulator(Math::max, Long.MIN_VALUE);
   private boolean collected;
+  private String reportName;
 
   DTimedMetric(String name) {
     this.name = name;
@@ -40,9 +41,6 @@ final class DTimedMetric implements TimedMetric {
     add((System.nanoTime() - startNanos) / 1000L);
   }
 
-  /**
-   * Add a value. Usually the value is Time or Bytes etc.
-   */
   @Override
   public void add(long value) {
     count.increment();
@@ -55,9 +53,6 @@ final class DTimedMetric implements TimedMetric {
     return count.sum() == 0;
   }
 
-  /**
-   * Reset all the internal counters and start time.
-   */
   @Override
   public void reset() {
     max.reset();
@@ -67,30 +62,42 @@ final class DTimedMetric implements TimedMetric {
 
   @Override
   public void visit(MetricVisitor visitor) {
-    DTimeMetricStats metric = collect(visitor.reset());
-    if (metric != null) {
-      visitor.visitTimed(metric);
+    final long countSum = visitor.reset() ? count.sumThenReset() : count.sum();
+    if (countSum > 0) {
+      final String name = reportName != null ? reportName : reportName(visitor);
+      visitor.visitTimed(stats(visitor.reset(), name, countSum));
     }
   }
 
   @Override
   public DTimeMetricStats collect(boolean reset) {
-    return (count.sum() == 0) ? null : getStatistics(reset);
+    final long countSum = reset ? count.sumThenReset() : count.sum();
+    if (countSum == 0) {
+      return null;
+    } else {
+      return stats(reset, name, countSum);
+    }
   }
 
   /**
    * Return the current statistics resetting the internal values if reset is true.
    */
-  private DTimeMetricStats getStatistics(boolean reset) {
+  private DTimeMetricStats stats(boolean reset, String name, long countSum) {
     try {
       if (reset) {
-        return new DTimeMetricStats(name, collected, count.sumThenReset(), total.sumThenReset(), max.getThenReset());
+        return new DTimeMetricStats(name, collected, countSum, total.sumThenReset(), max.getThenReset());
       } else {
-        return new DTimeMetricStats(name, collected, count.sum(), total.sum(), max.get());
+        return new DTimeMetricStats(name, collected, countSum, total.sum(), max.get());
       }
     } finally {
       collected = true;
     }
   }
 
+  String reportName(MetricVisitor visitor) {
+    final String tmp = visitor.namingConvention().apply(name);
+    this.reportName = tmp;
+    return tmp;
+  }
+
 }

ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java

@@ -13,6 +13,7 @@ final class DTimedProfileLocation extends DProfileLocation implements TimedProfi
   private final TimedMetric timedMetric;
   private final boolean overrideMetricName;
   private String fullName;
+  private String reportName;
 
   DTimedProfileLocation(int lineNumber, String label, TimedMetric timedMetric) {
     super(lineNumber);
@@ -47,11 +48,17 @@ final class DTimedProfileLocation extends DProfileLocation implements TimedProfi
   public void visit(MetricVisitor visitor) {
     TimedMetricStats collect = timedMetric.collect(visitor.reset());
     if (collect != null) {
-      if (overrideMetricName) {
-        collect.setName(fullName);
-      }
+      final String name = reportName != null ? reportName : reportName(visitor, collect.name());
+      collect.setName(name);
       collect.setLocation(location());
       visitor.visitTimed(collect);
     }
   }
+
+  private String reportName(MetricVisitor visitor, String name) {
+    final String defaultName = overrideMetricName ? fullName : name;
+    final String tmp = visitor.namingConvention().apply(defaultName);
+    this.reportName = tmp;
+    return tmp;
+  }
 }

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

@@ -605,14 +605,6 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
     return logWhereSql;
   }
 
-  /**
-   * Return the property that is associated with the many. There can only be one
-   * per SqlSelect. This can be null.
-   */
-  @Override
-  public STreePropertyAssocMany getManyProperty() {
-    return manyProperty;
-  }
 
   public String getBindLog() {
     return bindLog;

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

@@ -178,7 +178,6 @@ final class CQueryBuilder {
 
   CQueryFetchSingleAttribute buildFetchAttributeQuery(OrmQueryRequest<?> request) {
     SpiQuery<?> query = request.query();
-    query.setSingleAttribute();
     if (!query.isIncludeSoftDeletes()) {
       BeanDescriptor<?> desc = request.descriptor();
       if (desc.isSoftDelete()) {
@@ -561,7 +560,7 @@ final class CQueryBuilder {
       if (selectClause != null) {
         sb.append(selectClause);
       } else {
-        useSqlLimiter = (query.hasMaxRowsOrFirstRow() && select.getManyProperty() == null);
+        useSqlLimiter = (query.hasMaxRowsOrFirstRow() && (select.getManyProperty() == null || query.isSingleAttribute()));
         if (!useSqlLimiter) {
           appendSelectDistinct();
         }