#3121 BindMaxLength validation

At deploy time derive a BindMaxLength property to use
per BeanProperty

.github/workflows/build.yml

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

.github/workflows/db2luw.yml

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

.github/workflows/h2database.yml

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

.github/workflows/jdk-ea.yml

@@ -20,14 +20,14 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Java
       uses: oracle-actions/setup-java@v1
       with:
         website: jdk.java.net
         release: ${{ matrix.java_version }}
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: maven-cache
       with:

.github/workflows/mariadb.yml

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

.github/workflows/multi-db-platform.yml

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

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

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

.github/workflows/mysql.yml

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

.github/workflows/oracle.yml

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

.github/workflows/postgres.yml

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

.github/workflows/sqlserver-2019.yml

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

.github/workflows/sqlserver.yml

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

.github/workflows/yugabyte.yml

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

.gitignore

@@ -11,6 +11,7 @@ ebean-profiling*.xml
 /db
 /mydb.db
 profiling/
+.DS_Store
 
 # Intellij project files
 *.iml

CONFIGURATION.md

@@ -4,13 +4,13 @@ Overview of ebean.properties file
 
 ### DbMigration options
 
-You can set individual values for different platforms when generating migrations
+You can set individual values for different platforms when generating migrations.
 
 `dbmigration.platform.<PLATFORM>.databaseSequenceBatchSize`
 For DB's using sequences this is the number of sequence values prefetched.
  
 `dbmigration.platform.<PLATFORM>.dbuuid`
-Control, how UUID generation should work - it affects DDL which column type is generated. Possible values:
+Control, how UUID generation should work - it affects which column type is generated in DDL. Possible values:
 - BINARY enforces binary UUID 
 - VARCHAR enforces varchar UUID
 - BINARY_OPTIMIZED enforces binary-optimized UUID (makes sense only with Type1 ID)
@@ -19,7 +19,7 @@ Control, how UUID generation should work - it affects DDL which column type is g
 - AUTO_VARCHAR (default) use varchar when platform does not support UUID 
 
 `dbmigration.platform.<PLATFORM>.uuidStoreAsBinary`
-Same as setting dbuuid to BINARY
+Same as setting dbuuid to BINARY.
 
 `dbmigration.platform.<PLATFORM>.geometrySRID`
 The Geometry SRID value (default 4326).
@@ -30,7 +30,6 @@ The ID type (IDENTITY, SEQUENCE, GENERATOR, EXTERNAL)
 `dbmigration.platform.<PLATFORM>.mapping`
 Adjust the mapping. For example `BOOLEAN=integer(32);BIT=tinyint(3)`
 
-
 `ebean.migration.applyPrefix`
 Set this to "V" to be compatible with FlywayDB.
 
@@ -50,7 +49,7 @@ Set to true if the DB migration should be generated on server start.
 The version of a pending drop that should be generated as the next migration.
 
 `ebean.migration.includeGeneratedFileComment`
-TODO
+Adds the header about the migration files being generated when true. Reading 'THIS IS A GENERATED FILE - DO NOT MODIFY'
 
 `ebean.migration.metaTable`
 For running migration the DB table that holds migration execution status. Default 'db_migration'
@@ -65,17 +64,17 @@ Subdirectory the model xml files go into. Default 'model'
 Suffix. Default '.model.xml' 
 
 `ebean.migration.name`
-Description text that can be appended to the version to become the ddl script file name
+Description text that can be appended to the version to become the ddl script file name.
  
 `ebean.migration.patchInsertOn`
-migration versions that should be added to history without running.
+Migration versions that should be added to history without running.
 
 `ebean.migration.patchResetChecksumOn`
 migration versions that should have their checksum reset and not run.
 Use this if you get a 'Checksum mismatch' error.
 
 `ebean.migration.placeholders`
-A comma and equals delimited placeholders that are substituted in SQL scripts when running migration (used by DB Migration runner only).
+A comma and equals delimited map of placeholders that are substituted in SQL scripts when running migration (used by DB Migration runner only).
 
 `ebean.migration.platform`
 The database platform to generate migration DDL for.
@@ -90,7 +89,7 @@ The migration version name (typically FlywayDb compatible). Example: 1.1.1_2
 ### Ebean UUID options
 
 `ebean.uuidVersion`
-Controls, how the UUIDs are generated. Possible values
+Controls how the UUIDs are generated. Possible values:
 - VERSION4 (default) generate random V4 UUIDs,
 - VERSION1 generate rfc4122 compliant Type 1 UUIDs (requires a state file)
 - VERSION1RND generate fake Type 1 UUIDs
@@ -98,7 +97,7 @@ Controls, how the UUIDs are generated. Possible values
 Note, that V1 UUIDs in conjunction with AUTO_BINARY_OPTIMIZED will give you the best index performance, but you MUST understand how this works to avoid collisions.
 
 `ebean.uuidStateFile`
-The state file that is Required to generate V1 UUIDs
+The state file that is required to generate V1 UUIDs.
 
 
 ### DocStoreConfig
@@ -107,7 +106,7 @@ The state file that is Required to generate V1 UUIDs
 True when the Document store integration is active/on.
 
 `ebean.docstore.allowAllCertificates`
-Set to true such that the client allows connections to invalid/self signed SSL certificates.
+Set to true such that the client allows connections to invalid/self-signed SSL certificates.
 
 `ebean.docstore.bulkBatchSize`
 The default batch size to use for the Bulk API calls.
@@ -192,7 +191,7 @@ Suffix appended to the base table to derive the view that contains the union of
 Set to true if the DataSource uses autoCommit. Indicates that Ebean should use autoCommit friendly Transactions and TransactionManager.
 
 `ebean.autoReadOnlyDataSource`
-When true create a read only DataSource using readOnlyDataSourceConfig defaulting values from dataSourceConfig
+When true create a read only DataSource using readOnlyDataSourceConfig defaulting values from dataSourceConfig.
 
 `ebean.autostart`
 Should the server start all

README.md

@@ -120,3 +120,4 @@ To set this option as the global default for IntelliJ use:
 `Run - Edit Configurations -> Edit configuration templates -> JUnit -> modify options - Do not use module-path option`
 
 
+end

composites/ebean-clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -31,17 +31,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-cockroach/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -31,17 +31,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -31,17 +31,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -31,17 +31,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -31,17 +31,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -31,17 +31,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -31,17 +31,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -31,17 +31,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -31,17 +31,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -31,17 +31,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -31,17 +31,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -31,17 +31,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean-yugabyte/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -31,17 +31,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/ebean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,31 +16,31 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.14.1</version>
+      <version>13.18.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.14.1</version>
+      <version>13.18.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -49,17 +49,23 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.14.1</version>
+      <version>13.20.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

composites/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
+    <version>13.20.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
@@ -26,12 +26,6 @@
       <version>1.0</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-config</artifactId>
-      <version>2.4</version>
-    </dependency>
-
     <!--
     Class retention Nonnull and Nullable annotations
     to assist with IDE auto-completion with Ebean API
@@ -42,6 +36,12 @@
       <version>1.1</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-config</artifactId>
+      <version>3.4</version>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>persistence-api</artifactId>

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

@@ -33,11 +33,6 @@ import java.util.Optional;
 @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;
 
@@ -50,7 +45,6 @@ public abstract class BeanFinder<I,T> {
   protected BeanFinder(Class<T> type, Database database) {
     this.type = type;
     this.database = database;
-    this.server = database;
   }
 
   /**

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

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

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

@@ -35,7 +35,7 @@ import java.util.concurrent.Callable;
  * <h5>The 'default' Database</h5>
  * <p>
  * One Database can be designated as the 'default' or 'primary' Database
- * (see {@link DatabaseConfig#setDefaultServer(boolean)}. Many methods on DB
+ * (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.
  *
@@ -166,7 +166,7 @@ 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.
+   * This will throw an IllegalArgumentException if the bean is not an enhanced entity bean.
    */
   BeanState beanState(Object bean);
 

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

@@ -41,14 +41,14 @@ public final class Expr {
    * Equal To - property equal to the given value.
    */
   public static Expression eq(String propertyName, Object value) {
-    return DB.expressionFactory().eq(propertyName, value);
+    return factory().eq(propertyName, value);
   }
 
   /**
    * Not Equal To - property not equal to the given value.
    */
   public static Expression ne(String propertyName, Object value) {
-    return DB.expressionFactory().ne(propertyName, value);
+    return factory().ne(propertyName, value);
   }
 
   /**
@@ -56,7 +56,7 @@ public final class Expr {
    * using a lower() function to make it case insensitive).
    */
   public static Expression ieq(String propertyName, String value) {
-    return DB.expressionFactory().ieq(propertyName, value);
+    return factory().ieq(propertyName, value);
   }
 
   /**
@@ -66,28 +66,28 @@ public final class Expr {
    * </p>
    */
   public static Expression inRange(String propertyName, Object value1, Object value2) {
-    return DB.expressionFactory().inRange(propertyName, value1, value2);
+    return factory().inRange(propertyName, value1, value2);
   }
 
   /**
    * Between - property between the two given values.
    */
   public static Expression between(String propertyName, Object value1, Object value2) {
-    return DB.expressionFactory().between(propertyName, value1, value2);
+    return factory().between(propertyName, value1, value2);
   }
 
   /**
    * Between - value between two given properties.
    */
   public static Expression between(String lowProperty, String highProperty, Object value) {
-    return DB.expressionFactory().betweenProperties(lowProperty, highProperty, value);
+    return factory().betweenProperties(lowProperty, highProperty, value);
   }
 
   /**
    * Greater Than - property greater than the given value.
    */
   public static Expression gt(String propertyName, Object value) {
-    return DB.expressionFactory().gt(propertyName, value);
+    return factory().gt(propertyName, value);
   }
 
   /**
@@ -95,42 +95,42 @@ public final class Expr {
    * value.
    */
   public static Expression ge(String propertyName, Object value) {
-    return DB.expressionFactory().ge(propertyName, value);
+    return factory().ge(propertyName, value);
   }
 
   /**
    * Less Than - property less than the given value.
    */
   public static Expression lt(String propertyName, Object value) {
-    return DB.expressionFactory().lt(propertyName, value);
+    return factory().lt(propertyName, value);
   }
 
   /**
    * Less Than or Equal to - property less than or equal to the given value.
    */
   public static Expression le(String propertyName, Object value) {
-    return DB.expressionFactory().le(propertyName, value);
+    return factory().le(propertyName, value);
   }
 
   /**
    * Is Null - property is null.
    */
   public static Expression isNull(String propertyName) {
-    return DB.expressionFactory().isNull(propertyName);
+    return factory().isNull(propertyName);
   }
 
   /**
    * Is Not Null - property is not null.
    */
   public static Expression isNotNull(String propertyName) {
-    return DB.expressionFactory().isNotNull(propertyName);
+    return factory().isNotNull(propertyName);
   }
 
   /**
    * Case insensitive {@link #exampleLike(Object)}
    */
   public static ExampleExpression iexampleLike(Object example) {
-    return DB.expressionFactory().iexampleLike(example);
+    return factory().iexampleLike(example);
   }
 
   /**
@@ -138,14 +138,14 @@ public final class Expr {
    * LikeType.RAW (you need to add you own wildcards % and _).
    */
   public static ExampleExpression exampleLike(Object example) {
-    return DB.expressionFactory().exampleLike(example);
+    return factory().exampleLike(example);
   }
 
   /**
    * Create the query by Example expression specifying more options.
    */
   public static ExampleExpression exampleLike(Object example, boolean caseInsensitive, LikeType likeType) {
-    return DB.expressionFactory().exampleLike(example, caseInsensitive, likeType);
+    return factory().exampleLike(example, caseInsensitive, likeType);
   }
 
   /**
@@ -153,7 +153,7 @@ public final class Expr {
    * characters % (percentage) and _ (underscore).
    */
   public static Expression like(String propertyName, String value) {
-    return DB.expressionFactory().like(propertyName, value);
+    return factory().like(propertyName, value);
   }
 
   /**
@@ -162,14 +162,14 @@ public final class Expr {
    * a lower() function to make the expression case insensitive.
    */
   public static Expression ilike(String propertyName, String value) {
-    return DB.expressionFactory().ilike(propertyName, value);
+    return factory().ilike(propertyName, value);
   }
 
   /**
    * Starts With - property like value%.
    */
   public static Expression startsWith(String propertyName, String value) {
-    return DB.expressionFactory().startsWith(propertyName, value);
+    return factory().startsWith(propertyName, value);
   }
 
   /**
@@ -177,14 +177,14 @@ public final class Expr {
    * lower() function to make the expression case insensitive.
    */
   public static Expression istartsWith(String propertyName, String value) {
-    return DB.expressionFactory().istartsWith(propertyName, value);
+    return factory().istartsWith(propertyName, value);
   }
 
   /**
    * Ends With - property like %value.
    */
   public static Expression endsWith(String propertyName, String value) {
-    return DB.expressionFactory().endsWith(propertyName, value);
+    return factory().endsWith(propertyName, value);
   }
 
   /**
@@ -192,14 +192,14 @@ public final class Expr {
    * function to make the expression case insensitive.
    */
   public static Expression iendsWith(String propertyName, String value) {
-    return DB.expressionFactory().iendsWith(propertyName, value);
+    return factory().iendsWith(propertyName, value);
   }
 
   /**
    * Contains - property like %value%.
    */
   public static Expression contains(String propertyName, String value) {
-    return DB.expressionFactory().contains(propertyName, value);
+    return factory().contains(propertyName, value);
   }
 
   /**
@@ -207,42 +207,42 @@ public final class Expr {
    * function to make the expression case insensitive.
    */
   public static Expression icontains(String propertyName, String value) {
-    return DB.expressionFactory().icontains(propertyName, value);
+    return factory().icontains(propertyName, value);
   }
 
   /**
    * For collection properties that are empty (have not existing elements).
    */
   public static Expression isEmpty(String propertyName) {
-    return DB.expressionFactory().isEmpty(propertyName);
+    return factory().isEmpty(propertyName);
   }
 
   /**
    * For collection properties that are not empty (have existing elements).
    */
   public static Expression isNotEmpty(String propertyName) {
-    return DB.expressionFactory().isNotEmpty(propertyName);
+    return factory().isNotEmpty(propertyName);
   }
 
   /**
    * In - property has a value in the array of values.
    */
   public static Expression in(String propertyName, Object[] values) {
-    return DB.expressionFactory().in(propertyName, values);
+    return factory().in(propertyName, values);
   }
 
   /**
    * In - using a subQuery.
    */
   public static Expression in(String propertyName, Query<?> subQuery) {
-    return DB.expressionFactory().in(propertyName, subQuery);
+    return factory().in(propertyName, subQuery);
   }
 
   /**
    * In - property has a value in the collection of values.
    */
   public static Expression in(String propertyName, Collection<?> values) {
-    return DB.expressionFactory().in(propertyName, values);
+    return factory().in(propertyName, values);
   }
 
   /**
@@ -279,14 +279,14 @@ public final class Expr {
    * }</pre>
    */
   public static Expression inOrEmpty(String propertyName, Collection<?> values) {
-    return DB.expressionFactory().inOrEmpty(propertyName, values);
+    return factory().inOrEmpty(propertyName, values);
   }
 
   /**
    * Id Equal to - ID property is equal to the value.
    */
   public static Expression idEq(Object value) {
-    return DB.expressionFactory().idEq(value);
+    return factory().idEq(value);
   }
 
   /**
@@ -299,7 +299,7 @@ public final class Expr {
    * @param propertyMap a map keyed by property names.
    */
   public static Expression allEq(Map<String, Object> propertyMap) {
-    return DB.expressionFactory().allEq(propertyMap);
+    return factory().allEq(propertyMap);
   }
 
   /**
@@ -310,7 +310,7 @@ public final class Expr {
    * </p>
    */
   public static Expression raw(String raw, Object value) {
-    return DB.expressionFactory().raw(raw, value);
+    return factory().raw(raw, value);
   }
 
   /**
@@ -321,48 +321,48 @@ public final class Expr {
    * </p>
    */
   public static Expression raw(String raw, Object[] values) {
-    return DB.expressionFactory().raw(raw, values);
+    return factory().raw(raw, values);
   }
 
   /**
    * Add raw expression with no parameters.
    */
   public static Expression raw(String raw) {
-    return DB.expressionFactory().raw(raw);
+    return factory().raw(raw);
   }
 
   /**
    * And - join two expressions with a logical and.
    */
   public static Expression and(Expression expOne, Expression expTwo) {
-    return DB.expressionFactory().and(expOne, expTwo);
+    return factory().and(expOne, expTwo);
   }
 
   /**
    * Or - join two expressions with a logical or.
    */
   public static Expression or(Expression expOne, Expression expTwo) {
-    return DB.expressionFactory().or(expOne, expTwo);
+    return factory().or(expOne, expTwo);
   }
 
   /**
    * Negate the expression (prefix it with NOT).
    */
   public static Expression not(Expression exp) {
-    return DB.expressionFactory().not(exp);
+    return factory().not(exp);
   }
 
   /**
    * Return a list of expressions that will be joined by AND's.
    */
   public static <T> Junction<T> conjunction(Query<T> query) {
-    return DB.expressionFactory().conjunction(query);
+    return factory().conjunction(query);
   }
 
   /**
    * Return a list of expressions that will be joined by OR's.
    */
   public static <T> Junction<T> disjunction(Query<T> query) {
-    return DB.expressionFactory().disjunction(query);
+    return factory().disjunction(query);
   }
 }

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

@@ -1,10 +1,6 @@
 package io.ebean;
 
-import io.ebean.search.Match;
-import io.ebean.search.MultiMatch;
-import io.ebean.search.TextCommonTerms;
-import io.ebean.search.TextQueryString;
-import io.ebean.search.TextSimple;
+import io.ebean.search.*;
 
 import java.util.Collection;
 import java.util.Map;
@@ -423,6 +419,94 @@ public interface ExpressionFactory {
    */
   Expression inOrEmpty(String propertyName, Collection<?> values);
 
+  /**
+   * EXISTS a raw SQL SubQuery.
+   *
+   * @param sqlSubQuery The SQL SubQuery
+   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression exists(String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not EXISTS a raw SQL SubQuery.
+   *
+   * @param sqlSubQuery The SQL SubQuery
+   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression notExists(String sqlSubQuery, Object... bindValues);
+
+  /**
+   * IN a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression inSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not IN a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression notInSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression eqSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression neSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Greater Than or Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression geSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Greater Than a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression gtSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Less Than or Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression leSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Less Than a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  Expression ltSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
   /**
    * Not In - property has a value in the array of values.
    */

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

@@ -54,14 +54,12 @@ public interface ExpressionList<T> {
   Query<T> orderById(boolean orderById);
 
   /**
-   * Set the order by clause replacing the existing order by clause if there is
-   * one.
-   * <p>
-   * This follows SQL syntax using commas between each property with the
-   * optional asc and desc keywords representing ascending and descending order
-   * respectively.
+   * Deprecated migrate to {@link #orderBy(String)}
    */
-  ExpressionList<T> order(String orderByClause);
+  @Deprecated(since = "13.19")
+  default ExpressionList<T> order(String orderByClause) {
+    return orderBy(orderByClause);
+  }
 
   /**
    * Set the order by clause replacing the existing order by clause if there is
@@ -74,15 +72,12 @@ public interface ExpressionList<T> {
   ExpressionList<T> orderBy(String orderBy);
 
   /**
-   * Return the OrderBy so that you can append an ascending or descending
-   * property to the order by clause.
-   * <p>
-   * This will never return a null. If no order by clause exists then an 'empty'
-   * OrderBy object is returned.
-   * <p>
-   * This is the same as <code>orderBy()</code>
+   * Deprecated migrate to orderBy().
    */
-  OrderBy<T> order();
+  @Deprecated
+  default OrderBy<T> order() {
+    return orderBy();
+  }
 
   /**
    * Return the OrderBy so that you can append an ascending or descending
@@ -95,12 +90,6 @@ public interface ExpressionList<T> {
    */
   OrderBy<T> orderBy();
 
-  /**
-   * Deprecated migrate to {@link #orderBy(String)}
-   */
-  @Deprecated
-  Query<T> setOrderBy(String orderBy);
-
   /**
    * Apply the path properties to the query replacing the select and fetch clauses.
    */
@@ -404,6 +393,7 @@ public interface ExpressionList<T> {
    *
    * }</pre>
    */
+  @Nullable
   default <A> A findSingleAttribute() {
     List<A> list = findSingleAttributeList();
     return !list.isEmpty() ? list.get(0) : null;
@@ -1141,6 +1131,94 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> inPairs(Pairs pairs);
 
+  /**
+   * EXISTS a raw SQL SubQuery.
+   *
+   * @param sqlSubQuery The SQL SubQuery
+   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> exists(String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not EXISTS a raw SQL SubQuery.
+   *
+   * @param sqlSubQuery The SQL SubQuery
+   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> notExists(String sqlSubQuery, Object... bindValues);
+
+  /**
+   * IN a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> inSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not IN a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> notInSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> eqSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> neSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Greater Than a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> gtSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Greater Than or Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> geSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Less Than a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> ltSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Less Than or Equal To a raw SQL SubQuery.
+   *
+   * @param propertyName The bean property
+   * @param sqlSubQuery  The SQL SubQuery
+   * @param bindValues   Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  ExpressionList<T> leSubQuery(String propertyName, String sqlSubQuery, Object... bindValues);
+
   /**
    * In - using a subQuery.
    */

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

@@ -1,26 +1,9 @@
 package io.ebean;
 
-import io.avaje.lang.Nullable;
-
 import java.time.Clock;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
 
 /**
  * The extended API for Database.
- * <p>
- * 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>
- * 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.
  */
 public interface ExtendedServer {
 
@@ -35,162 +18,4 @@ public interface ExtendedServer {
   @Deprecated
   void setClock(Clock clock);
 
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> boolean exists(Query<T> ormQuery, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> int findCount(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <A, T> List<A> findIds(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> Stream<T> findStream(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> void findEach(Query<T> query, int batch, Consumer<List<T>> consumer, Transaction t);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> List<Version<T>> findVersions(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> List<T> findList(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> FutureIds<T> findFutureIds(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> FutureList<T> findFutureList(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> Set<T> findSet(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction);
-
-  /**
-   * 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);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> int delete(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  <T> int update(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  List<SqlRow> findList(SqlQuery query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  void findEach(SqlQuery query, Consumer<SqlRow> consumer, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  void findEachWhile(SqlQuery query, Predicate<SqlRow> consumer, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link SqlQuery#usingTransaction(Transaction)}.
-   */
-  @Deprecated
-  @Nullable
-  SqlRow findOne(SqlQuery query, Transaction transaction);
-
 }

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

@@ -30,23 +30,6 @@ public interface ProfileLocation {
     return XServiceProvider.profileLocationFactory().create(label);
   }
 
-  /**
-   * Deprecated in favor of {@link #create(String)}.
-   */
-  @Deprecated
-  static ProfileLocation create(int lineNumber, String label) {
-    return create(label);
-  }
-
-  /**
-   * Deprecated for removal - not used.
-   * Create and return a new ProfileLocation with a given location.
-   */
-  @Deprecated
-  static ProfileLocation createAt(String location) {
-    return XServiceProvider.profileLocationFactory().createAt(location);
-  }
-
   /**
    * Obtain the description returning true if this is the initial call.
    */

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

@@ -1372,13 +1372,9 @@ public interface Query<T> extends CancelableQuery {
   Query<T> orderBy(String orderByClause);
 
   /**
-   * Set the order by clause replacing the existing order by clause if there is
-   * one.
-   * <p>
-   * This follows SQL syntax using commas between each property with the
-   * optional asc and desc keywords representing ascending and descending order
-   * respectively.
+   * Deprecated migrate to orderBy().
    */
+  @Deprecated(since = "13.19")
   default Query<T> order(String orderByClause) {
     return orderBy(orderByClause);
   }
@@ -1395,14 +1391,9 @@ public interface Query<T> extends CancelableQuery {
   OrderBy<T> orderBy();
 
   /**
-   * Return the OrderBy so that you can append an ascending or descending
-   * property to the order by clause.
-   * <p>
-   * This will never return a null. If no order by clause exists then an 'empty'
-   * OrderBy object is returned.
-   * <p>
-   * This is the same as <code>orderBy()</code>
+   * Deprecated migrate to orderBy().
    */
+  @Deprecated(since = "13.19")
   default OrderBy<T> order() {
     return orderBy();
   }
@@ -1413,8 +1404,9 @@ public interface Query<T> extends CancelableQuery {
   Query<T> setOrderBy(OrderBy<T> orderBy);
 
   /**
-   * Set an OrderBy object to replace any existing OrderBy clause.
+   * Deprecated migrate to setOrderBy().
    */
+  @Deprecated(since = "13.19")
   default Query<T> setOrder(OrderBy<T> orderBy) {
     return setOrderBy(orderBy);
   }
@@ -1579,14 +1571,6 @@ public interface Query<T> extends CancelableQuery {
    */
   Query<T> setReadOnly(boolean readOnly);
 
-  /**
-   * 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);
-
   /**
    * Set a timeout on this query.
    * <p>

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

@@ -77,12 +77,12 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
   /**
    * Return the bean that owns this collection.
    */
-  EntityBean getOwnerBean();
+  EntityBean owner();
 
   /**
    * Return the bean property name this collection represents.
    */
-  String getPropertyName();
+  String propertyName();
 
   /**
    * Check after the lazy load that the underlying collection is not null
@@ -99,7 +99,7 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
    * This is so that the filter can be applied on refresh.
    * </p>
    */
-  ExpressionList<?> getFilterMany();
+  ExpressionList<?> filterMany();
 
   /**
    * Set the filter that was used in building this collection.
@@ -154,7 +154,7 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
   /**
    * Returns the underlying collection of beans from the Set, Map or List.
    */
-  Collection<E> getActualDetails();
+  Collection<E> actualDetails();
 
   /**
    * Returns the underlying entries so for Maps this is a collection of
@@ -162,7 +162,7 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
    * <p>
    * For maps this returns the entrySet as we need the keys of the map.
    */
-  Collection<?> getActualEntries();
+  Collection<?> actualEntries();
 
   /**
    * return true if there are real rows held. Return false is this is using
@@ -195,7 +195,7 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
   /**
    * Return the current modify listening mode. Can be null for on newly created beans.
    */
-  ModifyListenMode getModifyListening();
+  ModifyListenMode modifyListening();
 
   /**
    * Add an object to the additions list.
@@ -217,13 +217,13 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
    * Return the list of objects added to the list set or map. These will used to
    * insert rows into the intersection table of a ManyToMany.
    */
-  Set<E> getModifyAdditions();
+  Set<E> modifyAdditions();
 
   /**
    * Return the list of objects removed from the list set or map. These will
    * used to delete rows from the intersection table of a ManyToMany.
    */
-  Set<E> getModifyRemovals();
+  Set<E> modifyRemovals();
 
   /**
    * Reset the set of additions and deletions. This is called after the
@@ -239,5 +239,5 @@ public interface BeanCollection<E> extends Serializable, ToStringAware {
   /**
    * Return a shallow copy of this collection that is modifiable.
    */
-  BeanCollection<E> getShallowCopy();
+  BeanCollection<E> shallowCopy();
 }

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

@@ -13,7 +13,7 @@ public interface BeanLoader {
   /**
    * Return the name of the associated Database.
    */
-  String getName();
+  String name();
 
   /**
    * Invoke the lazy loading for this bean.

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

@@ -8,15 +8,15 @@ public interface CallOrigin {
   /**
    * Return the top element. Typically the top stack element with class and line.
    */
-  String getTopElement();
+  String top();
 
   /**
    * Return the full description of the call origin.
    */
-  String getFullDescription();
+  String description();
 
   /**
    * Compute and return an origin key based on the query hash.
    */
-  String getOriginKey(int queryHash);
+  String key(int queryHash);
 }

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

@@ -41,14 +41,14 @@ public final class CallStack implements Serializable, CallOrigin {
   public CallStack(List<StackWalker.StackFrame> frames) {
     this.callStack = frames.toArray(new Object[0]);
     this.hc = computeHashCode();
-    this.zeroHash = enc(callStack[0].hashCode());
+    this.zeroHash = enc(callStack[0].toString().hashCode());
     this.pathHash = enc(hc);
   }
 
   private int computeHashCode() {
     int hc = 0;
     for (Object element : callStack) {
-      hc = 92821 * hc + element.hashCode();
+      hc = 92821 * hc + element.toString().hashCode();
     }
     return hc;
   }
@@ -79,7 +79,7 @@ public final class CallStack implements Serializable, CallOrigin {
    * Return the first element of the call stack.
    */
   @Override
-  public String getTopElement() {
+  public String top() {
     return callStack[0].toString();
   }
 
@@ -87,7 +87,7 @@ public final class CallStack implements Serializable, CallOrigin {
    * Return the call stack lines appended with the given newLine string.
    */
   @Override
-  public String getFullDescription() {
+  public String description() {
     StringBuilder sb = new StringBuilder(400);
     for (int i = 0; i < callStack.length; i++) {
       if (i > 0) {
@@ -99,7 +99,7 @@ public final class CallStack implements Serializable, CallOrigin {
   }
 
   @Override
-  public String getOriginKey(int queryHash) {
+  public String key(int queryHash) {
     return enc(queryHash) + "." + zeroHash + "." + pathHash;
   }
 

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

@@ -17,12 +17,12 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return the 'owning' entity bean.
    */
-  EntityBean getOwner();
+  EntityBean owner();
 
   /**
    * Return the persistenceContext.
    */
-  PersistenceContext getPersistenceContext();
+  PersistenceContext persistenceContext();
 
   /**
    * Set the persistenceContext.
@@ -37,7 +37,7 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return the ownerId (IdClass).
    */
-  Object getOwnerId();
+  Object ownerId();
 
   /**
    * Set the ownerId (IdClass).
@@ -47,12 +47,12 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return the owning bean for an embedded bean.
    */
-  Object getEmbeddedOwner();
+  Object embeddedOwner();
 
   /**
    * Return the property index (for the parent) of this embedded bean.
    */
-  int getEmbeddedOwnerIndex();
+  int embeddedOwnerIndex();
 
   /**
    * Clear the getter callback.
@@ -229,7 +229,7 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return the original value that was changed via an update.
    */
-  Object getOrigValue(int propertyIndex);
+  Object origValue(int propertyIndex);
 
   /**
    * Finds the index position of a given property. Returns -1 if the
@@ -240,12 +240,12 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return the property name for the given property.
    */
-  String getProperty(int propertyIndex);
+  String property(int propertyIndex);
 
   /**
    * Return the number of properties.
    */
-  int getPropertyLength();
+  int propertyLength();
 
   /**
    * Set the loaded state of the property given it's name.
@@ -321,17 +321,17 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return the set of property names for a partially loaded bean.
    */
-  Set<String> getLoadedPropertyNames();
+  Set<String> loadedPropertyNames();
 
   /**
    * Return the array of flags indicating the dirty properties.
    */
-  boolean[] getDirtyProperties();
+  boolean[] dirtyProperties();
 
   /**
    * Return the set of dirty properties.
    */
-  Set<String> getDirtyPropertyNames();
+  Set<String> dirtyPropertyNames();
 
   /**
    * Recursively add dirty properties.
@@ -346,7 +346,7 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return a map of dirty properties with their new and old values.
    */
-  Map<String, ValuePair> getDirtyValues();
+  Map<String, ValuePair> dirtyValues();
 
   /**
    * Recursively add dirty properties.
@@ -361,7 +361,7 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return a dirty property hash taking into account embedded beans.
    */
-  StringBuilder getDirtyPropertyKey();
+  StringBuilder dirtyPropertyKey();
 
   /**
    * Add and return a dirty property hash.
@@ -371,22 +371,22 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return a loaded property hash.
    */
-  StringBuilder getLoadedPropertyKey();
+  StringBuilder loadedPropertyKey();
 
   /**
    * Return the loaded state for all the properties.
    */
-  boolean[] getLoaded();
+  boolean[] loaded();
 
   /**
    * Return the index of the property that triggered the lazy load.
    */
-  int getLazyLoadPropertyIndex();
+  int lazyLoadPropertyIndex();
 
   /**
    * Return the property that triggered the lazy load.
    */
-  String getLazyLoadProperty();
+  String lazyLoadProperty();
 
   /**
    * Load the bean when it is a reference.
@@ -497,7 +497,7 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Return the sort order value for an order column.
    */
-  int getSortOrder();
+  int sortOrder();
 
   /**
    * Set the sort order value for an order column.
@@ -522,7 +522,7 @@ public interface EntityBeanIntercept extends Serializable {
   /**
    * Returns the loadErrors.
    */
-  Map<String, Exception> getLoadErrors();
+  Map<String, Exception> loadErrors();
 
   /**
    * Return true if the property has its changed state set.

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

@@ -25,12 +25,17 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public EntityBean getOwner() {
+  public String toString() {
+    return "InterceptReadOnly{" + owner + '}';
+  }
+
+  @Override
+  public EntityBean owner() {
     return owner;
   }
 
   @Override
-  public PersistenceContext getPersistenceContext() {
+  public PersistenceContext persistenceContext() {
     return null;
   }
 
@@ -45,7 +50,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public Object getOwnerId() {
+  public Object ownerId() {
     return null;
   }
 
@@ -55,12 +60,12 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public Object getEmbeddedOwner() {
+  public Object embeddedOwner() {
     return null;
   }
 
   @Override
-  public int getEmbeddedOwnerIndex() {
+  public int embeddedOwnerIndex() {
     return 0;
   }
 
@@ -225,7 +230,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public Object getOrigValue(int propertyIndex) {
+  public Object origValue(int propertyIndex) {
     return null;
   }
 
@@ -235,12 +240,12 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public String getProperty(int propertyIndex) {
+  public String property(int propertyIndex) {
     return null;
   }
 
   @Override
-  public int getPropertyLength() {
+  public int propertyLength() {
     return 0;
   }
 
@@ -315,17 +320,17 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public Set<String> getLoadedPropertyNames() {
+  public Set<String> loadedPropertyNames() {
     return Collections.emptySet();
   }
 
   @Override
-  public boolean[] getDirtyProperties() {
+  public boolean[] dirtyProperties() {
     return new boolean[0];
   }
 
   @Override
-  public Set<String> getDirtyPropertyNames() {
+  public Set<String> dirtyPropertyNames() {
     return Collections.emptySet();
   }
 
@@ -340,7 +345,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public Map<String, ValuePair> getDirtyValues() {
+  public Map<String, ValuePair> dirtyValues() {
     return Collections.emptyMap();
   }
 
@@ -355,7 +360,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public StringBuilder getDirtyPropertyKey() {
+  public StringBuilder dirtyPropertyKey() {
     return null;
   }
 
@@ -365,22 +370,22 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public StringBuilder getLoadedPropertyKey() {
+  public StringBuilder loadedPropertyKey() {
     return null;
   }
 
   @Override
-  public boolean[] getLoaded() {
+  public boolean[] loaded() {
     return new boolean[0];
   }
 
   @Override
-  public int getLazyLoadPropertyIndex() {
+  public int lazyLoadPropertyIndex() {
     return 0;
   }
 
   @Override
-  public String getLazyLoadProperty() {
+  public String lazyLoadProperty() {
     return null;
   }
 
@@ -490,7 +495,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public int getSortOrder() {
+  public int sortOrder() {
     return 0;
   }
 
@@ -515,7 +520,7 @@ public class InterceptReadOnly implements EntityBeanIntercept {
   }
 
   @Override
-  public Map<String, Exception> getLoadErrors() {
+  public Map<String, Exception> loadErrors() {
     return null;
   }
 

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

@@ -47,7 +47,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
    */
   private static final byte FLAG_MUTABLE_HASH_SET = 16;
 
-  private transient final ReentrantLock lock = new ReentrantLock();
+  private final ReentrantLock lock = new ReentrantLock();
   private transient NodeUsageCollector nodeUsageCollector;
   private transient PersistenceContext persistenceContext;
   private transient BeanLoader beanLoader;
@@ -114,12 +114,30 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public EntityBean getOwner() {
+  public String toString() {
+    return "InterceptReadWrite@" + hashCode() + "{state=" + state +
+      (dirty ? " dirty;" : "") +
+      (forceUpdate ? " forceUpdate;" : "") +
+      (readOnly ? " readOnly;" : "") +
+      (disableLazyLoad ? " disableLazyLoad;" : "") +
+      (lazyLoadFailure ? " lazyLoadFailure;" : "") +
+      (fullyLoadedBean ? " fullyLoadedBean;" : "") +
+      (loadedFromCache ? " loadedFromCache;" : "") +
+      ", pc=" + System.identityHashCode(persistenceContext) +
+      ", flags=" + Arrays.toString(flags) +
+      (lazyLoadProperty > -1 ? (", lazyLoadProperty=" + lazyLoadProperty) : "") +
+      ", loader=" + beanLoader +
+      (ownerId != null ? (", ownerId=" + ownerId) : "") +
+      '}';
+  }
+
+  @Override
+  public EntityBean owner() {
     return owner;
   }
 
   @Override
-  public PersistenceContext getPersistenceContext() {
+  public PersistenceContext persistenceContext() {
     return persistenceContext;
   }
 
@@ -134,7 +152,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public Object getOwnerId() {
+  public Object ownerId() {
     return ownerId;
   }
 
@@ -144,12 +162,12 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public Object getEmbeddedOwner() {
+  public Object embeddedOwner() {
     return embeddedOwner;
   }
 
   @Override
-  public int getEmbeddedOwnerIndex() {
+  public int embeddedOwnerIndex() {
     return embeddedOwnerIndex;
   }
 
@@ -173,13 +191,13 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   public void setBeanLoader(BeanLoader beanLoader, PersistenceContext ctx) {
     this.beanLoader = beanLoader;
     this.persistenceContext = ctx;
-    this.ebeanServerName = beanLoader.getName();
+    this.ebeanServerName = beanLoader.name();
   }
 
   @Override
   public void setBeanLoader(BeanLoader beanLoader) {
     this.beanLoader = beanLoader;
-    this.ebeanServerName = beanLoader.getName();
+    this.ebeanServerName = beanLoader.name();
   }
 
   @Override
@@ -362,8 +380,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   @Override
   public void setEmbeddedLoaded(Object embeddedBean) {
     if (embeddedBean instanceof EntityBean) {
-      EntityBean eb = (EntityBean) embeddedBean;
-      eb._ebean_getIntercept().setLoaded();
+      ((EntityBean) embeddedBean)._ebean_getIntercept().setLoaded();
     }
   }
 
@@ -383,7 +400,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public Object getOrigValue(int propertyIndex) {
+  public Object origValue(int propertyIndex) {
     if ((flags[propertyIndex] & (FLAG_ORIG_VALUE_SET | FLAG_MUTABLE_HASH_SET)) == FLAG_MUTABLE_HASH_SET) {
       // mutable hash set, but not ORIG_VALUE
       setOriginalValue(propertyIndex, mutableInfo[propertyIndex].get());
@@ -396,7 +413,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
 
   @Override
   public int findProperty(String propertyName) {
-    String[] names = owner._ebean_getPropertyNames();
+    final String[] names = owner._ebean_getPropertyNames();
     for (int i = 0; i < names.length; i++) {
       if (names[i].equals(propertyName)) {
         return i;
@@ -406,7 +423,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public String getProperty(int propertyIndex) {
+  public String property(int propertyIndex) {
     if (propertyIndex == -1) {
       return null;
     }
@@ -414,13 +431,13 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public int getPropertyLength() {
+  public int propertyLength() {
     return flags.length;
   }
 
   @Override
   public void setPropertyLoaded(String propertyName, boolean loaded) {
-    int position = findProperty(propertyName);
+    final int position = findProperty(propertyName);
     if (position == -1) {
       throw new IllegalArgumentException("Property " + propertyName + " not found");
     }
@@ -514,23 +531,23 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public Set<String> getLoadedPropertyNames() {
+  public Set<String> loadedPropertyNames() {
     if (fullyLoadedBean) {
       return null;
     }
-    Set<String> props = new LinkedHashSet<>();
+    final Set<String> props = new LinkedHashSet<>();
     for (int i = 0; i < flags.length; i++) {
       if ((flags[i] & FLAG_LOADED_PROP) != 0) {
-        props.add(getProperty(i));
+        props.add(property(i));
       }
     }
     return props;
   }
 
   @Override
-  public boolean[] getDirtyProperties() {
-    int len = getPropertyLength();
-    boolean[] dirties = new boolean[len];
+  public boolean[] dirtyProperties() {
+    final int len = propertyLength();
+    final boolean[] dirties = new boolean[len];
     for (int i = 0; i < len; i++) {
       // this, or an embedded property has been changed - recurse
       dirties[i] = (flags[i] & (FLAG_CHANGED_PROP + FLAG_EMBEDDED_DIRTY)) != 0;
@@ -539,31 +556,31 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public Set<String> getDirtyPropertyNames() {
-    Set<String> props = new LinkedHashSet<>();
+  public Set<String> dirtyPropertyNames() {
+    final Set<String> props = new LinkedHashSet<>();
     addDirtyPropertyNames(props, null);
     return props;
   }
 
   @Override
   public void addDirtyPropertyNames(Set<String> props, String prefix) {
-    int len = getPropertyLength();
+    final int len = propertyLength();
     for (int i = 0; i < len; i++) {
       if (isChangedProp(i)) {
         // the property has been changed on this bean
-        props.add((prefix == null ? getProperty(i) : prefix + getProperty(i)));
+        props.add((prefix == null ? property(i) : prefix + property(i)));
       } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
-        EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
-        embeddedBean._ebean_getIntercept().addDirtyPropertyNames(props, getProperty(i) + ".");
+        final EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
+        embeddedBean._ebean_getIntercept().addDirtyPropertyNames(props, property(i) + ".");
       }
     }
   }
 
   @Override
   public boolean hasDirtyProperty(Set<String> propertyNames) {
-    String[] names = owner._ebean_getPropertyNames();
-    int len = getPropertyLength();
+    final String[] names = owner._ebean_getPropertyNames();
+    final int len = propertyLength();
     for (int i = 0; i < len; i++) {
       if (isChangedProp(i)) {
         if (propertyNames.contains(names[i])) {
@@ -579,46 +596,46 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public Map<String, ValuePair> getDirtyValues() {
-    Map<String, ValuePair> dirtyValues = new LinkedHashMap<>();
+  public Map<String, ValuePair> dirtyValues() {
+    final Map<String, ValuePair> dirtyValues = new LinkedHashMap<>();
     addDirtyPropertyValues(dirtyValues, null);
     return dirtyValues;
   }
 
   @Override
   public void addDirtyPropertyValues(Map<String, ValuePair> dirtyValues, String prefix) {
-    int len = getPropertyLength();
+    final int len = propertyLength();
     for (int i = 0; i < len; i++) {
       if (isChangedProp(i)) {
         // the property has been changed on this bean
-        String propName = (prefix == null ? getProperty(i) : prefix + getProperty(i));
-        Object newVal = owner._ebean_getField(i);
-        Object oldVal = getOrigValue(i);
+        final String propName = (prefix == null ? property(i) : prefix + property(i));
+        final Object newVal = owner._ebean_getField(i);
+        final Object oldVal = origValue(i);
         if (notEqual(oldVal, newVal)) {
           dirtyValues.put(propName, new ValuePair(newVal, oldVal));
         }
       } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
-        EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
-        embeddedBean._ebean_getIntercept().addDirtyPropertyValues(dirtyValues, getProperty(i) + ".");
+        final EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
+        embeddedBean._ebean_getIntercept().addDirtyPropertyValues(dirtyValues, property(i) + ".");
       }
     }
   }
 
   @Override
   public void addDirtyPropertyValues(BeanDiffVisitor visitor) {
-    int len = getPropertyLength();
+    final int len = propertyLength();
     for (int i = 0; i < len; i++) {
       if (isChangedProp(i)) {
         // the property has been changed on this bean
-        Object newVal = owner._ebean_getField(i);
-        Object oldVal = getOrigValue(i);
+        final Object newVal = owner._ebean_getField(i);
+        final Object oldVal = origValue(i);
         if (notEqual(oldVal, newVal)) {
           visitor.visit(i, newVal, oldVal);
         }
       } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
-        EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
+        final EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
         visitor.visitPush(i);
         embeddedBean._ebean_getIntercept().addDirtyPropertyValues(visitor);
         visitor.visitPop();
@@ -627,8 +644,8 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public StringBuilder getDirtyPropertyKey() {
-    StringBuilder sb = new StringBuilder();
+  public StringBuilder dirtyPropertyKey() {
+    final StringBuilder sb = new StringBuilder();
     addDirtyPropertyKey(sb);
     return sb;
   }
@@ -638,24 +655,23 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
     if (sortOrder > 0) {
       sb.append("s,");
     }
-    int len = getPropertyLength();
+    final int len = propertyLength();
     for (int i = 0; i < len; i++) {
       if ((flags[i] & FLAG_CHANGED_PROP) != 0) { // we do not check against mutablecontent here.
         sb.append(i).append(',');
       } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
-        EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
         sb.append(i).append('[');
-        embeddedBean._ebean_getIntercept().addDirtyPropertyKey(sb);
+        ((EntityBean) owner._ebean_getField(i))._ebean_getIntercept().addDirtyPropertyKey(sb);
         sb.append(']');
       }
     }
   }
 
   @Override
-  public StringBuilder getLoadedPropertyKey() {
-    StringBuilder sb = new StringBuilder();
-    int len = getPropertyLength();
+  public StringBuilder loadedPropertyKey() {
+    final StringBuilder sb = new StringBuilder();
+    final int len = propertyLength();
     for (int i = 0; i < len; i++) {
       if (isLoadedProperty(i)) {
         sb.append(i).append(',');
@@ -665,8 +681,8 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public boolean[] getLoaded() {
-    boolean[] ret = new boolean[flags.length];
+  public boolean[] loaded() {
+    final boolean[] ret = new boolean[flags.length];
     for (int i = 0; i < ret.length; i++) {
       ret[i] = (flags[i] & FLAG_LOADED_PROP) != 0;
     }
@@ -674,13 +690,13 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public int getLazyLoadPropertyIndex() {
+  public int lazyLoadPropertyIndex() {
     return lazyLoadProperty;
   }
 
   @Override
-  public String getLazyLoadProperty() {
-    return getProperty(lazyLoadProperty);
+  public String lazyLoadProperty() {
+    return property(lazyLoadProperty);
   }
 
   @Override
@@ -718,7 +734,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
     }
     if (lazyLoadFailure) {
       // failed when batch lazy loaded by another bean in the batch
-      throw new EntityNotFoundException("(Lazy) loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted");
+      throw new EntityNotFoundException("(Lazy) loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted. BeanLoader: " + beanLoader);
     }
     if (lazyLoadProperty == -1) {
       lazyLoadProperty = loadProperty;
@@ -820,7 +836,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
       loadBean(propertyIndex);
     }
     if (nodeUsageCollector != null) {
-      nodeUsageCollector.addUsed(getProperty(propertyIndex));
+      nodeUsageCollector.addUsed(property(propertyIndex));
     }
   }
 
@@ -969,7 +985,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public int getSortOrder() {
+  public int sortOrder() {
     return sortOrder;
   }
 
@@ -998,19 +1014,19 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   }
 
   @Override
-  public Map<String, Exception> getLoadErrors() {
+  public Map<String, Exception> loadErrors() {
     if (loadErrors == null) {
       return Collections.emptyMap();
     }
     Map<String, Exception> ret = null;
-    int len = getPropertyLength();
+    int len = propertyLength();
     for (int i = 0; i < len; i++) {
-      Exception loadError = loadErrors[i];
+      final Exception loadError = loadErrors[i];
       if (loadError != null) {
         if (ret == null) {
           ret = new LinkedHashMap<>();
         }
-        ret.put(getProperty(i), loadError);
+        ret.put(property(i), loadError);
       }
     }
     return ret;

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

@@ -8,7 +8,6 @@ import java.util.Objects;
  * <p>
  * It represents a location relative to the root of an object graph and specific
  * to a query and call stack hash.
- * </p>
  */
 public final class ObjectGraphNode implements Serializable {
 
@@ -17,7 +16,7 @@ public final class ObjectGraphNode implements Serializable {
   /**
    * Identifies the origin.
    */
-  private final ObjectGraphOrigin originQueryPoint;
+  private final ObjectGraphOrigin origin;
 
   /**
    * The path relative to the root.
@@ -28,26 +27,26 @@ public final class ObjectGraphNode implements Serializable {
    * Create at a sub level.
    */
   public ObjectGraphNode(ObjectGraphNode parent, String path) {
-    this.originQueryPoint = parent.getOriginQueryPoint();
-    this.path = parent.getChildPath(path);
+    this.origin = parent.origin();
+    this.path = parent.childPath(path);
   }
 
   /**
    * Create an the root level.
    */
-  public ObjectGraphNode(ObjectGraphOrigin originQueryPoint, String path) {
-    this.originQueryPoint = originQueryPoint;
+  public ObjectGraphNode(ObjectGraphOrigin origin, String path) {
+    this.origin = origin;
     this.path = path;
   }
 
   /**
    * Return the origin query point.
    */
-  public ObjectGraphOrigin getOriginQueryPoint() {
-    return originQueryPoint;
+  public ObjectGraphOrigin origin() {
+    return origin;
   }
 
-  private String getChildPath(String childPath) {
+  private String childPath(String childPath) {
     if (path == null) {
       return childPath;
     } else if (childPath == null) {
@@ -60,18 +59,18 @@ public final class ObjectGraphNode implements Serializable {
   /**
    * Return the path relative to the root.
    */
-  public String getPath() {
+  public String path() {
     return path;
   }
 
   @Override
   public String toString() {
-    return "origin:" + originQueryPoint + " path[" + path + "]";
+    return "origin:" + origin + " path[" + path + "]";
   }
 
   @Override
   public int hashCode() {
-    int hc = 92821 * originQueryPoint.hashCode();
+    int hc = 92821 * origin.hashCode();
     hc = 92821 * hc + (path == null ? 0 : path.hashCode());
     return hc;
   }
@@ -87,6 +86,6 @@ public final class ObjectGraphNode implements Serializable {
 
     ObjectGraphNode e = (ObjectGraphNode) obj;
     return (Objects.equals(e.path, path))
-      && e.originQueryPoint.equals(originQueryPoint);
+      && e.origin.equals(origin);
   }
 }

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

@@ -28,38 +28,38 @@ public final class ObjectGraphOrigin implements Serializable {
     this.callOrigin = callOrigin;
     this.beanType = beanType;
     this.queryHash = queryHash;
-    this.key = callOrigin.getOriginKey(queryHash);
+    this.key = callOrigin.key(queryHash);
   }
 
   /**
    * The key includes the queryPlan hash and the callStack hash. This becomes
    * the unique identifier for a query point.
    */
-  public String getKey() {
+  public String key() {
     return key;
   }
 
   /**
    * The type of bean the query is fetching.
    */
-  public String getBeanType() {
+  public String beanType() {
     return beanType;
   }
 
   /**
    * The call stack involved.
    */
-  public CallOrigin getCallOrigin() {
+  public CallOrigin callOrigin() {
     return callOrigin;
   }
 
-  public String getTopElement() {
-    return callOrigin.getTopElement();
+  public String top() {
+    return callOrigin.top();
   }
 
   @Override
   public String toString() {
-    return "key[" + key + "] type[" + beanType + "] " + callOrigin.getTopElement();
+    return "key[" + key + "] type[" + beanType + "] " + callOrigin.top();
   }
 
   @Override

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

@@ -19,7 +19,7 @@ public abstract class SingleBeanLoader implements BeanLoader {
   }
 
   @Override
-  public String getName() {
+  public String name() {
     return database.name();
   }
 

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

@@ -1,7 +1,5 @@
 package io.ebean.bean;
 
-import io.ebean.common.BeanMap;
-
 import java.util.Collection;
 import java.util.IdentityHashMap;
 import java.util.Map;
@@ -112,7 +110,7 @@ public final class ToStringBuilder {
     } else {
       String content = String.valueOf(value);
       if (content.length() > TRIM_LENGTH) {
-        content = content.substring(0, TRIM_LENGTH) + " <trimmed>";
+        content = content.substring(0, TRIM_LENGTH) + " (trimmed)";
       }
       sb.append(content);
       if (sb.length() >= MAX_TOTAL_CONTENT) {

ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java

@@ -59,17 +59,17 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   }
 
   @Override
-  public EntityBean getOwnerBean() {
+  public EntityBean owner() {
     return ownerBean;
   }
 
   @Override
-  public String getPropertyName() {
+  public String propertyName() {
     return propertyName;
   }
 
   @Override
-  public ExpressionList<?> getFilterMany() {
+  public ExpressionList<?> filterMany() {
     return filterMany;
   }
 
@@ -129,7 +129,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   }
 
   @Override
-  public ModifyListenMode getModifyListening() {
+  public ModifyListenMode modifyListening() {
     return modifyListenMode;
   }
 
@@ -182,7 +182,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   }
 
   @Override
-  public Set<E> getModifyAdditions() {
+  public Set<E> modifyAdditions() {
     if (modifyHolder == null) {
       return null;
     } else {
@@ -191,7 +191,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   }
 
   @Override
-  public Set<E> getModifyRemovals() {
+  public Set<E> modifyRemovals() {
     if (modifyHolder == null) {
       return null;
     } else {
@@ -213,7 +213,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   }
 
   /**
-   * Copies all relevant properties for a clone. See {@link #getShallowCopy()}
+   * Copies all relevant properties for a clone. See {@link #shallowCopy()}
    */
   protected void setFromOriginal(AbstractBeanCollection<E> other) {
     this.disableLazyLoad = other.disableLazyLoad;

ebean-api/src/main/java/io/ebean/common/BeanList.java

@@ -3,12 +3,7 @@ package io.ebean.common;
 import io.ebean.bean.*;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
+import java.util.*;
 
 /**
  * List capable of lazy loading and modification awareness.
@@ -73,7 +68,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
     if (list == null) {
       list = new ArrayList<>();
     }
-    list.addAll((Collection<? extends E>) other.getActualDetails());
+    list.addAll((Collection<? extends E>) other.actualDetails());
   }
 
   @Override
@@ -159,17 +154,17 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
   /**
    * Return the actual underlying list.
    */
-  public List<E> getActualList() {
+  public List<E> actualList() {
     return list;
   }
 
   @Override
-  public Collection<E> getActualDetails() {
+  public Collection<E> actualDetails() {
     return list;
   }
 
   @Override
-  public Collection<?> getActualEntries() {
+  public Collection<?> actualEntries() {
     return list;
   }
 
@@ -538,7 +533,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
   }
 
   @Override
-  public BeanCollection<E> getShallowCopy() {
+  public BeanCollection<E> shallowCopy() {
     BeanList<E> copy = new BeanList<>(new CopyOnFirstWriteList<>(list));
     copy.setFromOriginal(this);
     return copy;

ebean-api/src/main/java/io/ebean/common/BeanMap.java

@@ -5,11 +5,7 @@ import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.ToStringBuilder;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Map capable of lazy loading and modification aware.
@@ -71,7 +67,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   public void loadFrom(BeanCollection<?> other) {
     BeanMap<K, E> otherMap = (BeanMap<K, E>) other;
     internalPutNull();
-    map.putAll(otherMap.getActualMap());
+    map.putAll(otherMap.actualMap());
   }
 
   public void internalPutNull() {
@@ -175,7 +171,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   /**
    * Return the actual underlying map.
    */
-  public Map<K, E> getActualMap() {
+  public Map<K, E> actualMap() {
     return map;
   }
 
@@ -183,7 +179,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
    * Returns the collection of beans (map values).
    */
   @Override
-  public Collection<E> getActualDetails() {
+  public Collection<E> actualDetails() {
     return map.values();
   }
 
@@ -191,7 +187,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
    * Returns the map entrySet.
    */
   @Override
-  public Collection<?> getActualEntries() {
+  public Collection<?> actualEntries() {
     return map.entrySet();
   }
 
@@ -346,7 +342,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   }
 
   @Override
-  public BeanCollection<E> getShallowCopy() {
+  public BeanCollection<E> shallowCopy() {
     BeanMap<K, E> copy = new BeanMap<>(new LinkedHashMap<>(map));
     copy.setFromOriginal(this);
     return copy;

ebean-api/src/main/java/io/ebean/common/BeanSet.java

@@ -67,7 +67,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
     if (set == null) {
       set = new LinkedHashSet<>();
     }
-    set.addAll((Collection<? extends E>) other.getActualDetails());
+    set.addAll((Collection<? extends E>) other.actualDetails());
   }
 
   @Override
@@ -155,17 +155,17 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
   /**
    * Return the actual underlying set.
    */
-  public Set<E> getActualSet() {
+  public Set<E> actualSet() {
     return set;
   }
 
   @Override
-  public Collection<E> getActualDetails() {
+  public Collection<E> actualDetails() {
     return set;
   }
 
   @Override
-  public Collection<?> getActualEntries() {
+  public Collection<?> actualEntries() {
     return set;
   }
 
@@ -382,7 +382,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
   }
 
   @Override
-  public BeanCollection<E> getShallowCopy() {
+  public BeanCollection<E> shallowCopy() {
     BeanSet<E> copy = new BeanSet<>(new LinkedHashSet<>(set));
     copy.setFromOriginal(this);
     return copy;

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

@@ -123,10 +123,10 @@ public class DatabaseConfig {
   private boolean loadModuleInfo = true;
 
   /**
-   * List of interesting classes such as entities, embedded, ScalarTypes,
-   * Listeners, Finders, Controllers etc.
+   * Interesting classes such as entities, embedded, ScalarTypes,
+   * Listeners, Finders, Controllers, AttributeConverters etc.
    */
-  private List<Class<?>> classes = new ArrayList<>();
+  private Set<Class<?>> classes = new HashSet<>();
 
   /**
    * The packages that are searched for interesting classes. Only used when
@@ -526,11 +526,6 @@ public class DatabaseConfig {
 
   private ProfilingConfig profilingConfig = new ProfilingConfig();
 
-  /**
-   * Controls the default order by id setting of queries. See {@link Query#orderById(boolean)}
-   */
-  private boolean defaultOrderById;
-
   /**
    * The mappingLocations for searching xml mapping.
    */
@@ -545,6 +540,7 @@ public class DatabaseConfig {
 
   private String dumpMetricsOptions;
 
+  private LengthCheck lengthCheck = LengthCheck.OFF;
   private Function<String, String> metricNaming = MetricNamingMatch.INSTANCE;
 
   /**
@@ -595,22 +591,6 @@ public class DatabaseConfig {
     this.slowQueryListener = slowQueryListener;
   }
 
-
-  /**
-   * Deprecated - look to have explicit order by. Sets the default orderById setting for queries.
-   */
-  @Deprecated
-  public void setDefaultOrderById(boolean defaultOrderById) {
-    this.defaultOrderById = defaultOrderById;
-  }
-
-  /**
-   * Returns the default orderById setting for queries.
-   */
-  public boolean isDefaultOrderById() {
-    return defaultOrderById;
-  }
-
   /**
    * Put a service object into configuration such that it can be used by ebean or a plugin.
    * <p>
@@ -2320,19 +2300,15 @@ public class DatabaseConfig {
   }
 
   /**
-   * Programmatically add classes (typically entities) that this server should
-   * use.
+   * Programmatically add classes (typically entities) that this server should use.
    * <p>
    * The class can be an Entity, Embedded type, ScalarType, BeanPersistListener,
    * BeanFinder or BeanPersistController.
    * <p>
    * If no classes are specified then the classes are found automatically via
    * searching the class path.
-   * <p>
-   * Alternatively the classes can be added via {@link #setClasses(List)}.
    *
-   * @param cls the entity type (or other type) that should be registered by this
-   *            database.
+   * @param cls the entity type (or other type) that should be registered by this database.
    */
   public void addClass(Class<?> cls) {
     classes.add(cls);
@@ -2341,7 +2317,7 @@ public class DatabaseConfig {
   /**
    * Register all the classes (typically entity classes).
    */
-  public void addAll(List<Class<?>> classList) {
+  public void addAll(Collection<Class<?>> classList) {
     if (classList != null && !classList.isEmpty()) {
       classes.addAll(classList);
     }
@@ -2383,15 +2359,26 @@ public class DatabaseConfig {
    * <p>
    * Alternatively the classes can contain added via {@link #addClass(Class)}.
    */
-  public void setClasses(List<Class<?>> classes) {
-    this.classes = classes;
+  public void setClasses(Collection<Class<?>> classes) {
+    this.classes = new HashSet<>(classes);
   }
 
   /**
-   * Return the classes registered for this database. Typically this includes
+   * Return the classes registered for this database. Typically, this includes
    * entities and perhaps listeners.
    */
-  public List<Class<?>> getClasses() {
+  public Set<Class<?>> classes() {
+    return classes;
+  }
+
+  /**
+   * Deprecated - migrate to classes().
+   * <p>
+   * Sorry if returning Set rather than List breaks code but it feels safer to
+   * do that than a subtle change to return a shallow copy which you will not detect.
+   */
+  @Deprecated
+  public Set<Class<?>> getClasses() {
     return classes;
   }
 
@@ -2760,8 +2747,6 @@ public class DatabaseConfig {
     this.classLoadConfig = classLoadConfig;
   }
 
-
-
   /**
    * Load settings from application.properties, application.yaml and other sources.
    * <p>
@@ -2906,7 +2891,7 @@ public class DatabaseConfig {
     serverCachePlugin = p.createInstance(ServerCachePlugin.class, "serverCachePlugin", serverCachePlugin);
 
     String packagesProp = p.get("search.packages", p.get("packages", null));
-    packages = getSearchList(packagesProp, packages);
+    packages = searchList(packagesProp, packages);
 
     skipCacheAfterWrite = p.getBoolean("skipCacheAfterWrite", skipCacheAfterWrite);
     updateAllPropertiesInBatch = p.getBoolean("updateAllPropertiesInBatch", updateAllPropertiesInBatch);
@@ -2935,7 +2920,7 @@ public class DatabaseConfig {
     jdbcFetchSizeFindEach = p.getInt("jdbcFetchSizeFindEach", jdbcFetchSizeFindEach);
     jdbcFetchSizeFindList = p.getInt("jdbcFetchSizeFindList", jdbcFetchSizeFindList);
     databasePlatformName = p.get("databasePlatformName", databasePlatformName);
-    defaultOrderById = p.getBoolean("defaultOrderById", defaultOrderById);
+    lengthCheck = p.getEnum(LengthCheck.class, "lengthCheck", lengthCheck);
 
     uuidVersion = p.getEnum(UuidVersion.class, "uuidVersion", uuidVersion);
     uuidStateFile = p.get("uuidStateFile", uuidStateFile);
@@ -2982,10 +2967,10 @@ public class DatabaseConfig {
     tenantCatalogProvider = p.createInstance(TenantCatalogProvider.class, "tenant.catalogProvider", tenantCatalogProvider);
     tenantSchemaProvider = p.createInstance(TenantSchemaProvider.class, "tenant.schemaProvider", tenantSchemaProvider);
     tenantPartitionColumn = p.get("tenant.partitionColumn", tenantPartitionColumn);
-    classes = getClasses(p);
+    classes = readClasses(p);
 
     String mappingsProp = p.get("mappingLocations", null);
-    mappingLocations = getSearchList(mappingsProp, mappingLocations);
+    mappingLocations = searchList(mappingsProp, mappingLocations);
   }
 
   private NamingConvention createNamingConvention(PropertiesWrapper properties, NamingConvention namingConvention) {
@@ -2999,13 +2984,13 @@ public class DatabaseConfig {
    * @param properties the properties
    * @return the classes
    */
-  private List<Class<?>> getClasses(PropertiesWrapper properties) {
+  private Set<Class<?>> readClasses(PropertiesWrapper properties) {
     String classNames = properties.get("classes", null);
     if (classNames == null) {
       return classes;
     }
 
-    List<Class<?>> classList = new ArrayList<>();
+    Set<Class<?>> classList = new HashSet<>();
     String[] split = StringHelper.splitNames(classNames);
     for (String cn : split) {
       if (!"class".equalsIgnoreCase(cn)) {
@@ -3020,7 +3005,7 @@ public class DatabaseConfig {
     return classList;
   }
 
-  private List<String> getSearchList(String searchNames, List<String> defaultValue) {
+  private List<String> searchList(String searchNames, List<String> defaultValue) {
     if (searchNames != null) {
       String[] entries = StringHelper.splitNames(searchNames);
       List<String> hitList = new ArrayList<>(entries.length);
@@ -3399,8 +3384,16 @@ public class DatabaseConfig {
    * When false we either register entity classes via application code or use classpath
    * scanning to find and register entity classes.
    */
+  public boolean isLoadModuleInfo() {
+    return loadModuleInfo;
+  }
+
+  /**
+   * Deprecated - migrate to isLoadModuleInfo().
+   */
+  @Deprecated
   public boolean isAutoLoadModuleInfo() {
-    return loadModuleInfo && classes.isEmpty();
+    return loadModuleInfo;
   }
 
   /**
@@ -3428,6 +3421,20 @@ public class DatabaseConfig {
     this.metricNaming = metricNaming;
   }
 
+  /**
+   * Returns the length check mode.
+   */
+  public LengthCheck getLengthCheck() {
+    return lengthCheck;
+  }
+
+  /**
+   * Sets the length check mode.
+   */
+  public void setLengthCheck(LengthCheck lengthCheck) {
+    this.lengthCheck = lengthCheck;
+  }
+
   public enum UuidVersion {
     VERSION4,
     VERSION1,

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

@@ -144,7 +144,7 @@ public class DbConstraintNaming {
       }
       sb.append(normaliseColumn(columns[i]));
     }
-    return sb.toString();
+    return sb.toString().replace(" ", "_");
   }
 
   /**

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

@@ -27,7 +27,6 @@ public class DbConstraintNormalise {
    * quoted identifier characters (",',[,] etc).
    */
   public String normaliseTable(String tableName) {
-
     tableName = trimQuotes(tableName);
     int lastPeriod = tableName.lastIndexOf('.');
     if (lastPeriod > -1) {
@@ -59,7 +58,6 @@ public class DbConstraintNormalise {
    * Trim off the platform quoted identifier quotes like [ ' and ".
    */
   public String trimQuotes(String identifier) {
-
     if (identifier == null) {
       return "";
     }

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

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

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

@@ -673,7 +673,7 @@ public class DatabasePlatform {
 
   protected String withForUpdate(String sql, Query.LockWait lockWait, Query.LockType lockType) {
     // silently assume the database does not support the "for update" clause.
-    log.log(INFO, "it seems your database does not support the 'for update' clause");
+    log.log(INFO, "it seems your database does not support the ''for update'' clause");
     return sql;
   }
 

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

@@ -28,6 +28,16 @@ public class DbPlatformType implements ExtraDbTypes {
    */
   private final boolean canHaveLength;
 
+  /**
+   * The maximum length supported by this platform type. If length is too big, fallback is used.
+   */
+  private final int maxLength;
+
+  /**
+   * Use this platform type if length exceedes
+   */
+  private final DbPlatformType fallback;
+
   /**
    * Parse a type definition into a DbPlatformType.
    * <p>
@@ -53,6 +63,41 @@ public class DbPlatformType implements ExtraDbTypes {
     this(name, defaultLength, 0);
   }
 
+  /**
+   * Construct without length, but with a max length limit and a fallback type, that is used if maxLength is exceeded.
+   * This can be used to use <ul>
+   * <li>"longtext" for unspecified length</li>
+   * <li>"text" for length up to 2^16-1</li>
+   * <li>"mediumtext" for length up to 2^24-1</li>
+   * <li>"longtext" else</li>
+   * </ul>
+   */
+  public DbPlatformType(String name, int maxLength, DbPlatformType fallback) {
+    this.name = name;
+    this.defaultLength = 0;
+    this.defaultScale = 0;
+    this.canHaveLength = false;
+    this.maxLength = maxLength;
+    this.fallback = fallback;
+  }
+
+  /**
+   * Construct with a given default length, a max length limit and a fallback type, that is used if maxLength is exceeded.
+   * This can be used to use <ul>
+   * <li>"varchar(255)" for unspecified length</li>
+   * <li>"varchar(N)" for N <= maxLength</li>
+   * <li>"varchar(max)" else</li>
+   * </ul>
+   */
+  public DbPlatformType(String name, int defaultPrecision, int maxLength, DbPlatformType fallback) {
+    this.name = name;
+    this.defaultLength = defaultPrecision;
+    this.defaultScale = 0;
+    this.canHaveLength = true;
+    this.maxLength = maxLength;
+    this.fallback = fallback;
+  }
+
   /**
    * Construct for Decimal with precision and scale.
    */
@@ -61,6 +106,8 @@ public class DbPlatformType implements ExtraDbTypes {
     this.defaultLength = defaultPrecision;
     this.defaultScale = defaultScale;
     this.canHaveLength = true;
+    this.maxLength = Integer.MAX_VALUE;
+    this.fallback = null;
   }
 
   /**
@@ -74,6 +121,8 @@ public class DbPlatformType implements ExtraDbTypes {
     this.defaultLength = 0;
     this.defaultScale = 0;
     this.canHaveLength = canHaveLength;
+    this.maxLength = Integer.MAX_VALUE;
+    this.fallback = null;
   }
 
   /**
@@ -124,33 +173,33 @@ public class DbPlatformType implements ExtraDbTypes {
    */
   public String renderType(int deployLength, int deployScale, boolean strict) {
 
-    StringBuilder sb = new StringBuilder();
-    sb.append(name);
-    if (canHaveLength || !strict) {
-      renderLengthScale(deployLength, deployScale, sb);
-    }
+    int len = deployLength != 0 ? deployLength : defaultLength;
+    if (len > maxLength) {
+      return fallback.renderType(deployLength, deployScale, strict);
+    } else {
+      StringBuilder sb = new StringBuilder();
+      sb.append(name);
+      if ((canHaveLength || !strict) && len > 0) {
+        renderLengthScale(len, deployScale, sb);
+      }
 
-    return sb.toString();
+      return sb.toString();
+    }
   }
 
   /**
    * Render the length and scale part of the column definition.
    */
-  protected void renderLengthScale(int deployLength, int deployScale, StringBuilder sb) {
+  protected void renderLengthScale(int len, int deployScale, StringBuilder sb) {
     // see if there is a precision/scale to add (or not)
-    int len = deployLength != 0 ? deployLength : defaultLength;
-    if (len == Integer.MAX_VALUE) {
-      sb.append("(max)"); // TODO: this is sqlserver specific
-    } else if (len > 0) {
-      sb.append("(");
-      sb.append(len);
-      int scale = deployScale != 0 ? deployScale : defaultScale;
-      if (scale > 0) {
-        sb.append(",");
-        sb.append(scale);
-      }
-      sb.append(")");
+    sb.append('(');
+    sb.append(len);
+    int scale = deployScale != 0 ? deployScale : defaultScale;
+    if (scale > 0) {
+      sb.append(',');
+      sb.append(scale);
     }
+    sb.append(')');
   }
 
   /**

ebean-api/src/main/java/io/ebean/event/ShutdownManager.java

@@ -143,7 +143,7 @@ public final class ShutdownManager {
       }
       // shutdown any registered servers that have not
       // already been shutdown manually
-      for (Database server : databases) {
+      for (Database server : new ArrayList<>(databases)) {
         try {
           server.shutdown();
         } catch (Exception ex) {

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

@@ -16,22 +16,6 @@ public interface MetaInfoManager {
    */
   ServerMetrics collectMetrics();
 
-  /**
-   * Deprecated migrate to collectMetrics().asJson().
-   */
-  @Deprecated
-  default ServerMetricsAsJson collectMetricsAsJson() {
-    return collectMetrics().asJson();
-  }
-
-  /**
-   * Deprecated migrate to collectMetrics().asData().
-   */
-  @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/MetaQueryPlan.java

@@ -2,6 +2,8 @@ package io.ebean.meta;
 
 import io.ebean.ProfileLocation;
 
+import java.time.Instant;
+
 /**
  * Meta data for captured query plan.
  */
@@ -51,4 +53,14 @@ public interface MetaQueryPlan {
    * Return the total count of times bind capture has occurred.
    */
   long captureCount();
+
+  /**
+   * Return the time taken to capture this plan in microseconds.
+   */
+  long captureMicros();
+
+  /**
+   * Return the instant when the bind values were captured.
+   */
+  Instant whenCaptured();
 }

ebean-api/src/main/java/io/ebean/util/StackWalkFilter.java

@@ -22,6 +22,7 @@ public final class StackWalkFilter {
     public boolean test(StackWalker.StackFrame stackFrame) {
       return !stackFrame.getClassName().startsWith("io.ebean")
         && !stackFrame.getClassName().startsWith("jdk.")
+        && !stackFrame.getClassName().startsWith("java.")
         && !stackFrame.getMethodName().startsWith("_ebean_");
     }
   }

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

@@ -3,10 +3,6 @@ package io.ebean.config;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.annotation.MutationDetection;
 import io.ebean.annotation.PersistBatch;
-import io.ebean.config.DatabaseConfig;
-import io.ebean.config.JsonConfig;
-import io.ebean.config.MatchingNamingConvention;
-import io.ebean.config.PlatformConfig;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.datasource.DataSourceConfig;
 import org.junit.jupiter.api.Assertions;
@@ -93,6 +89,7 @@ class DatabaseConfigTest {
     assertTrue(config.isDbOffline());
     assertTrue(config.isAutoReadOnlyDataSource());
     assertTrue(config.isAutoLoadModuleInfo());
+    assertTrue(config.isLoadModuleInfo());
     assertTrue(config.skipDataSourceCheck());
 
     assertTrue(config.isIdGeneratorAutomatic());
@@ -165,6 +162,7 @@ class DatabaseConfigTest {
     assertEquals(MutationDetection.HASH, config.getJsonMutationDetection());
     assertTrue(config.getPlatformConfig().isCaseSensitiveCollation());
     assertTrue(config.isAutoLoadModuleInfo());
+    assertTrue(config.isLoadModuleInfo());
 
     assertFalse(config.isQueryPlanEnable());
     assertEquals(Long.MAX_VALUE, config.getQueryPlanThresholdMicros());
@@ -175,6 +173,7 @@ class DatabaseConfigTest {
 
     config.setLoadModuleInfo(false);
     assertFalse(config.isAutoLoadModuleInfo());
+    assertFalse(config.isLoadModuleInfo());
     config.setAutoPersistUpdates(true);
     assertTrue(config.isAutoPersistUpdates());
     config.setSkipDataSourceCheck(true);

ebean-autotune/pom.xml

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>13.14.1</version>
-  </parent>
-<!--  <parent>-->
-<!--    <groupId>org.avaje</groupId>-->
-<!--    <artifactId>java8-oss</artifactId>-->
-<!--    <version>2.2</version>-->
-<!--  </parent>-->
-
-  <scm>
-    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
-  </scm>
-
-  <name>ebean autotune</name>
-  <description>ebean automatic query tuning module</description>
-  <artifactId>ebean-autotune</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>13.14.1</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- JAVAX-DEPENDENCY-START -->
-    <dependency>
-      <groupId>org.glassfish.jaxb</groupId>
-      <artifactId>jaxb-runtime</artifactId>
-      <version>2.3.6</version>
-      <scope>provided</scope>
-    </dependency>
-    <!-- JAVAX-DEPENDENCY-END -->
-    <!-- JAKARTA-DEPENDENCY-START ___
-    <dependency>
-      <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>
-    ____ JAKARTA-DEPENDENCY-END -->
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>junit</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.14.1</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.ebean.tile:enhancement:13.12.0</tile>
-          </tiles>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-</project>

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

@@ -1,133 +0,0 @@
-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 java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * Java class for anonymous complex type.
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/autotune}origin" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/autotune}profileDiff" minOccurs="0"/>
- *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/autotune}profileNew" minOccurs="0"/>
- *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/autotune}profileEmpty" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-  "origin",
-  "profileDiff",
-  "profileNew",
-  "profileEmpty"
-})
-@XmlRootElement(name = "autotune")
-public class Autotune {
-
-  protected List<Origin> origin;
-  protected ProfileDiff profileDiff;
-  protected ProfileNew profileNew;
-  protected ProfileEmpty profileEmpty;
-
-  /**
-   * Gets the value of the origin property.
-   * <p>
-   * <p>
-   * This accessor method returns a reference to the live list,
-   * not a snapshot. Therefore any modification you make to the
-   * returned list will be present inside the JAXB object.
-   * This is why there is not a <CODE>set</CODE> method for the origin property.
-   * <p>
-   * <p>
-   * For example, to add a new item, do as follows:
-   * <pre>
-   *    getOrigin().add(newItem);
-   * </pre>
-   * <p>
-   * <p>
-   * <p>
-   * Objects of the following type(s) are allowed in the list
-   * {@link Origin }
-   */
-  public List<Origin> getOrigin() {
-    if (origin == null) {
-      origin = new ArrayList<>();
-    }
-    return this.origin;
-  }
-
-  /**
-   * Gets the value of the profileDiff property.
-   *
-   * @return possible object is
-   * {@link ProfileDiff }
-   */
-  public ProfileDiff getProfileDiff() {
-    return profileDiff;
-  }
-
-  /**
-   * Sets the value of the profileDiff property.
-   *
-   * @param value allowed object is
-   *              {@link ProfileDiff }
-   */
-  public void setProfileDiff(ProfileDiff value) {
-    this.profileDiff = value;
-  }
-
-  /**
-   * Gets the value of the profileNew property.
-   *
-   * @return possible object is
-   * {@link ProfileNew }
-   */
-  public ProfileNew getProfileNew() {
-    return profileNew;
-  }
-
-  /**
-   * Sets the value of the profileNew property.
-   *
-   * @param value allowed object is
-   *              {@link ProfileNew }
-   */
-  public void setProfileNew(ProfileNew value) {
-    this.profileNew = value;
-  }
-
-  /**
-   * Gets the value of the profileEmpty property.
-   *
-   * @return possible object is
-   * {@link ProfileEmpty }
-   */
-  public ProfileEmpty getProfileEmpty() {
-    return profileEmpty;
-  }
-
-  /**
-   * Sets the value of the profileEmpty property.
-   *
-   * @param value allowed object is
-   *              {@link ProfileEmpty }
-   */
-  public void setProfileEmpty(ProfileEmpty value) {
-    this.profileEmpty = value;
-  }
-
-}

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

@@ -1,64 +0,0 @@
-package io.ebeaninternal.server.autotune.model;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the io.ebeaninternal.server.autotune.model package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups.  Factory methods for each of these are
- * provided in this class.
- */
-@XmlRegistry
-public class ObjectFactory {
-
-
-  /**
-   * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: io.ebeaninternal.server.autotune.model
-   */
-  public ObjectFactory() {
-  }
-
-  /**
-   * Create an instance of {@link ProfileNew }
-   */
-  public ProfileNew createProfileNew() {
-    return new ProfileNew();
-  }
-
-  /**
-   * Create an instance of {@link Origin }
-   */
-  public Origin createOrigin() {
-    return new Origin();
-  }
-
-  /**
-   * Create an instance of {@link ProfileEmpty }
-   */
-  public ProfileEmpty createProfileEmpty() {
-    return new ProfileEmpty();
-  }
-
-  /**
-   * Create an instance of {@link Autotune }
-   */
-  public Autotune createAutotune() {
-    return new Autotune();
-  }
-
-  /**
-   * Create an instance of {@link ProfileDiff }
-   */
-  public ProfileDiff createProfileDiff() {
-    return new ProfileDiff();
-  }
-
-}

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

@@ -1,148 +0,0 @@
-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;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * <p>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="callStack" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="beanType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="detail" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="original" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-  "callStack"
-})
-@XmlRootElement(name = "origin")
-public class Origin {
-
-  protected String callStack;
-  @XmlAttribute(name = "key", required = true)
-  protected String key;
-  @XmlAttribute(name = "beanType")
-  protected String beanType;
-  @XmlAttribute(name = "detail")
-  protected String detail;
-  @XmlAttribute(name = "original")
-  protected String original;
-
-  /**
-   * Gets the value of the callStack property.
-   *
-   * @return possible object is
-   * {@link String }
-   */
-  public String getCallStack() {
-    return callStack;
-  }
-
-  /**
-   * Sets the value of the callStack property.
-   *
-   * @param value allowed object is
-   *              {@link String }
-   */
-  public void setCallStack(String value) {
-    this.callStack = value;
-  }
-
-  /**
-   * Gets the value of the key property.
-   *
-   * @return possible object is
-   * {@link String }
-   */
-  public String getKey() {
-    return key;
-  }
-
-  /**
-   * Sets the value of the key property.
-   *
-   * @param value allowed object is
-   *              {@link String }
-   */
-  public void setKey(String value) {
-    this.key = value;
-  }
-
-  /**
-   * Gets the value of the beanType property.
-   *
-   * @return possible object is
-   * {@link String }
-   */
-  public String getBeanType() {
-    return beanType;
-  }
-
-  /**
-   * Sets the value of the beanType property.
-   *
-   * @param value allowed object is
-   *              {@link String }
-   */
-  public void setBeanType(String value) {
-    this.beanType = value;
-  }
-
-  /**
-   * Gets the value of the detail property.
-   *
-   * @return possible object is
-   * {@link String }
-   */
-  public String getDetail() {
-    return detail;
-  }
-
-  /**
-   * Sets the value of the detail property.
-   *
-   * @param value allowed object is
-   *              {@link String }
-   */
-  public void setDetail(String value) {
-    this.detail = value;
-  }
-
-  /**
-   * Gets the value of the original property.
-   *
-   * @return possible object is
-   * {@link String }
-   */
-  public String getOriginal() {
-    return original;
-  }
-
-  /**
-   * Sets the value of the original property.
-   *
-   * @param value allowed object is
-   *              {@link String }
-   */
-  public void setOriginal(String value) {
-    this.original = value;
-  }
-
-}

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

@@ -1,64 +0,0 @@
-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 java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * <p>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/autotune}origin" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-  "origin"
-})
-@XmlRootElement(name = "profileDiff")
-public class ProfileDiff {
-
-  protected List<Origin> origin;
-
-  /**
-   * Gets the value of the origin property.
-   * <p>
-   * <p>
-   * This accessor method returns a reference to the live list,
-   * not a snapshot. Therefore any modification you make to the
-   * returned list will be present inside the JAXB object.
-   * This is why there is not a <CODE>set</CODE> method for the origin property.
-   * <p>
-   * <p>
-   * For example, to add a new item, do as follows:
-   * <pre>
-   *    getOrigin().add(newItem);
-   * </pre>
-   * <p>
-   * <p>
-   * <p>
-   * Objects of the following type(s) are allowed in the list
-   * {@link Origin }
-   */
-  public List<Origin> getOrigin() {
-    if (origin == null) {
-      origin = new ArrayList<>();
-    }
-    return this.origin;
-  }
-
-}

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

@@ -1,64 +0,0 @@
-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 java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * <p>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/autotune}origin" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-  "origin"
-})
-@XmlRootElement(name = "profileEmpty")
-public class ProfileEmpty {
-
-  protected List<Origin> origin;
-
-  /**
-   * Gets the value of the origin property.
-   * <p>
-   * <p>
-   * This accessor method returns a reference to the live list,
-   * not a snapshot. Therefore any modification you make to the
-   * returned list will be present inside the JAXB object.
-   * This is why there is not a <CODE>set</CODE> method for the origin property.
-   * <p>
-   * <p>
-   * For example, to add a new item, do as follows:
-   * <pre>
-   *    getOrigin().add(newItem);
-   * </pre>
-   * <p>
-   * <p>
-   * <p>
-   * Objects of the following type(s) are allowed in the list
-   * {@link Origin }
-   */
-  public List<Origin> getOrigin() {
-    if (origin == null) {
-      origin = new ArrayList<>();
-    }
-    return this.origin;
-  }
-
-}

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

@@ -1,64 +0,0 @@
-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 java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * <p>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://ebean-orm.github.io/xml/ns/autotune}origin" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-  "origin"
-})
-@XmlRootElement(name = "profileNew")
-public class ProfileNew {
-
-  protected List<Origin> origin;
-
-  /**
-   * Gets the value of the origin property.
-   * <p>
-   * <p>
-   * This accessor method returns a reference to the live list,
-   * not a snapshot. Therefore any modification you make to the
-   * returned list will be present inside the JAXB object.
-   * This is why there is not a <CODE>set</CODE> method for the origin property.
-   * <p>
-   * <p>
-   * For example, to add a new item, do as follows:
-   * <pre>
-   *    getOrigin().add(newItem);
-   * </pre>
-   * <p>
-   * <p>
-   * <p>
-   * Objects of the following type(s) are allowed in the list
-   * {@link Origin }
-   */
-  public List<Origin> getOrigin() {
-    if (origin == null) {
-      origin = new ArrayList<>();
-    }
-    return this.origin;
-  }
-
-}

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

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

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

@@ -1,61 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import io.ebeaninternal.server.autotune.model.Autotune;
-
-import java.util.Collection;
-
-/**
- * Event where all tuned query information is collected.
- * <p>
- * This is for writing the "all" file on shutdown when using runtime tuning.
- * </p>
- */
-public class AutoTuneAllCollection {
-
-  final Autotune document = new Autotune();
-
-  final BaseQueryTuner queryTuner;
-
-  /**
-   * Construct to collect/report all tuned queries.
-   */
-  public AutoTuneAllCollection(BaseQueryTuner queryTuner) {
-    this.queryTuner = queryTuner;
-    loadAllTuned();
-  }
-
-  /**
-   * Return the number of origin elements in the document.
-   */
-  public int size() {
-    return document.getOrigin().size();
-  }
-
-  /**
-   * Return the Autotune document object.
-   */
-  public Autotune getDocument() {
-    return document;
-  }
-
-  /**
-   * Write the document as an xml file.
-   */
-  public void writeFile(String filePrefix, boolean withNow) {
-
-    AutoTuneXmlWriter writer = new AutoTuneXmlWriter();
-    writer.write(document, filePrefix, withNow);
-  }
-
-  /**
-   * Loads all the existing query tuning into the document.
-   */
-  private void loadAllTuned() {
-
-    Collection<TunedQueryInfo> all = queryTuner.getAll();
-    for (TunedQueryInfo tuned : all) {
-      document.getOrigin().add(tuned.getOrigin());
-    }
-  }
-
-}

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

@@ -1,115 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import io.ebean.bean.ObjectGraphOrigin;
-import io.ebeaninternal.server.querydefn.OrmQueryDetail;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Profiling information collected.
- */
-public class AutoTuneCollection {
-
-  final List<Entry> entries = new ArrayList<>();
-
-  public Entry add(ObjectGraphOrigin origin, OrmQueryDetail detail, String sourceQuery) {
-    Entry entry = new Entry(origin, detail, sourceQuery);
-    entries.add(entry);
-    return entry;
-  }
-
-  public List<Entry> getEntries() {
-    return entries;
-  }
-
-  /**
-   * Profiling entry at a given origin point.
-   */
-  public static class Entry {
-
-    /**
-     * Profiling origin point.
-     */
-    private final ObjectGraphOrigin origin;
-
-    /**
-     * The tuned query detail.
-     */
-    private final OrmQueryDetail detail;
-
-    /**
-     * The original/existing query detail.
-     */
-    private final String originalQuery;
-
-    /**
-     * Summary execution statistics for queries related to this origin point.
-     */
-    private final List<EntryQuery> queries = new ArrayList<>();
-
-    public Entry(ObjectGraphOrigin origin, OrmQueryDetail detail, String originalQuery) {
-      this.origin = origin;
-      this.detail = detail;
-      this.originalQuery = originalQuery;
-    }
-
-    public void addQuery(EntryQuery entryQuery) {
-      queries.add(entryQuery);
-    }
-
-    public ObjectGraphOrigin getOrigin() {
-      return origin;
-    }
-
-    public OrmQueryDetail getDetail() {
-      return detail;
-    }
-
-    public String getOriginalQuery() {
-      return originalQuery;
-    }
-
-    public List<EntryQuery> getQueries() {
-      return queries;
-    }
-
-  }
-
-  /**
-   * Summary query execution statistics for the origin point.
-   */
-  public static class EntryQuery {
-
-    final String path;
-    final long exeCount;
-    final long totalBeanLoaded;
-    final long totalMicros;
-
-    public EntryQuery(String path, long exeCount, long totalBeanLoaded, long totalMicros) {
-      this.path = path;
-      this.exeCount = exeCount;
-      this.totalBeanLoaded = totalBeanLoaded;
-      this.totalMicros = totalMicros;
-    }
-
-    /**
-     * Return the relative path with empty string for the origin query.
-     */
-    public String getPath() {
-      return path;
-    }
-
-    public long getExeCount() {
-      return exeCount;
-    }
-
-    public long getTotalBeanLoaded() {
-      return totalBeanLoaded;
-    }
-
-    public long getTotalMicros() {
-      return totalMicros;
-    }
-  }
-}

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

@@ -1,161 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import io.ebean.bean.ObjectGraphOrigin;
-import io.ebeaninternal.server.autotune.model.Autotune;
-import io.ebeaninternal.server.autotune.model.Origin;
-import io.ebeaninternal.server.autotune.model.ProfileDiff;
-import io.ebeaninternal.server.autotune.model.ProfileNew;
-import io.ebeaninternal.server.querydefn.OrmQueryDetail;
-
-/**
- * Event where profiling information is collected and processed for differences
- * relative to the current query tuning.
- */
-public class AutoTuneDiffCollection {
-
-  final Autotune document = new Autotune();
-
-  final AutoTuneCollection profiling;
-
-  final BaseQueryTuner queryTuner;
-
-  final boolean updateTuning;
-
-  int newCount;
-
-  int diffCount;
-
-  /**
-   * Construct to collect/report the new/diff query tuning entries.
-   */
-  public AutoTuneDiffCollection(AutoTuneCollection profiling, BaseQueryTuner queryTuner, boolean updateTuning) {
-    this.profiling = profiling;
-    this.queryTuner = queryTuner;
-    this.updateTuning = updateTuning;
-  }
-
-  /**
-   * Return true if there are no new or diff entries.
-   */
-  public boolean isEmpty() {
-    return newCount == 0 && diffCount == 0;
-  }
-
-  /**
-   * Return the underlying Autotune document object.
-   */
-  public Autotune getDocument() {
-    return document;
-  }
-
-  /**
-   * Return the number of diff entries.
-   */
-  public int getDiffCount() {
-    return diffCount;
-  }
-
-  /**
-   * Return the number of new entries.
-   */
-  public int getNewCount() {
-    return newCount;
-  }
-
-  /**
-   * Return the total new and diff entries.
-   */
-  public int getChangeCount() {
-    return newCount + diffCount;
-  }
-
-  /**
-   * Write the underlying document as an xml file.
-   */
-  public void writeFile(String filePrefix) {
-
-    AutoTuneXmlWriter writer = new AutoTuneXmlWriter();
-    writer.write(document, filePrefix, true);
-  }
-
-  /**
-   * Process checking profiling entries against existing query tuning.
-   */
-  public void process() {
-
-    for (AutoTuneCollection.Entry entry : profiling.getEntries()) {
-      addToDocument(entry);
-    }
-  }
-
-  /**
-   * Check if the entry is new or diff and add as necessary.
-   */
-  private void addToDocument(AutoTuneCollection.Entry entry) {
-
-    ObjectGraphOrigin point = entry.getOrigin();
-    OrmQueryDetail profileDetail = entry.getDetail();
-
-    // compare with the existing query tuning entry
-    OrmQueryDetail tuneDetail = queryTuner.get(point.getKey());
-    if (tuneDetail == null) {
-      addToDocumentNewEntry(entry, point);
-
-    } else if (!tuneDetail.isAutoTuneEqual(profileDetail)) {
-      addToDocumentDiffEntry(entry, point, tuneDetail);
-    }
-  }
-
-  /**
-   * Add as a diff entry.
-   */
-  private void addToDocumentDiffEntry(AutoTuneCollection.Entry entry, ObjectGraphOrigin point, OrmQueryDetail tuneDetail) {
-
-    diffCount++;
-
-    Origin origin = createOrigin(entry, point, tuneDetail.asString());
-    ProfileDiff diff = document.getProfileDiff();
-    if (diff == null) {
-      diff = new ProfileDiff();
-      document.setProfileDiff(diff);
-    }
-    diff.getOrigin().add(origin);
-  }
-
-  /**
-   * Add as a "new" entry.
-   */
-  private void addToDocumentNewEntry(AutoTuneCollection.Entry entry, ObjectGraphOrigin point) {
-
-    newCount++;
-
-    ProfileNew profileNew = document.getProfileNew();
-    if (profileNew == null) {
-      profileNew = new ProfileNew();
-      document.setProfileNew(profileNew);
-    }
-    Origin origin = createOrigin(entry, point, entry.getOriginalQuery());
-    profileNew.getOrigin().add(origin);
-  }
-
-
-  /**
-   * Create the XML Origin bean for the given entry and ObjectGraphOrigin.
-   */
-  private Origin createOrigin(AutoTuneCollection.Entry entry, ObjectGraphOrigin point, String query) {
-
-    Origin origin = new Origin();
-    origin.setKey(point.getKey());
-    origin.setBeanType(point.getBeanType());
-    origin.setDetail(entry.getDetail().asString());
-    origin.setCallStack(point.getCallOrigin().getFullDescription());
-    origin.setOriginal(query);
-
-    if (updateTuning) {
-      queryTuner.put(origin);
-    }
-
-    return origin;
-  }
-
-}

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

@@ -1,15 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import io.ebean.config.DatabaseConfig;
-import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.server.autotune.AutoTuneService;
-import io.ebeaninternal.server.autotune.AutoTuneServiceProvider;
-
-public class AutoTuneServiceFactory implements AutoTuneServiceProvider {
-
-  @Override
-  public AutoTuneService create(SpiEbeanServer server, DatabaseConfig config) {
-    return new DefaultAutoTuneService(server, config);
-  }
-
-}

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

@@ -1,52 +0,0 @@
-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 java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Reads a profiling xml document.
- */
-public class AutoTuneXmlReader {
-
-  /**
-   * Read and return a Profiling from an xml file.
-   */
-  public static Autotune read(File file) {
-    try {
-      return readFile(file);
-    } catch (IOException e) {
-      throw new IllegalStateException(e);
-    }
-  }
-
-  protected static Autotune readFile(File file) throws IOException {
-    if (!file.exists()) {
-      return new Autotune();
-    }
-    try (FileInputStream is = new FileInputStream(file)) {
-      return read(is);
-    }
-  }
-
-  /**
-   * Read and return a Profiling from an xml document.
-   */
-  public static Autotune read(InputStream is) {
-    try {
-      JAXBContext jaxbContext = JAXBContext.newInstance(Autotune.class);
-      Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-      return (Autotune) unmarshaller.unmarshal(is);
-    } catch (JAXBException e) {
-      throw new IllegalStateException(e);
-    }
-  }
-
-}

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

@@ -1,57 +0,0 @@
-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 java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * Simple writer for output of the AutoTune Profiling as an XML document.
- */
-public class AutoTuneXmlWriter {
-
-  /**
-   * Return 'now' as a string to second precision.
-   */
-  public static String now() {
-    SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd-HHmmss");
-    return df.format(new Date());
-  }
-
-  /**
-   * Write the document as xml file with the given prefix.
-   */
-  public void write(Autotune document, String fileName, boolean withNow) {
-
-    SortAutoTuneDocument.sort(document);
-
-    if (withNow) {
-      fileName += "-" + now() + ".xml";
-    }
-
-    // write the file with serverName and now suffix as we can output the profiling many times
-    write(document, new File(fileName));
-  }
-
-  /**
-   * Write Profiling to a file as xml.
-   */
-  public void write(Autotune profiling, File file) {
-
-    try {
-      JAXBContext jaxbContext = JAXBContext.newInstance(Autotune.class);
-      Marshaller marshaller = jaxbContext.createMarshaller();
-      marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
-      marshaller.marshal(profiling, file);
-
-    } catch (JAXBException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-}

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

@@ -1,204 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import io.ebean.bean.CallOrigin;
-import io.ebean.bean.ObjectGraphNode;
-import io.ebean.config.AutoTuneConfig;
-import io.ebean.config.AutoTuneMode;
-import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.autotune.ProfilingListener;
-import io.ebeaninternal.server.autotune.model.Origin;
-import io.ebeaninternal.server.querydefn.OrmQueryDetail;
-
-import javax.persistence.PersistenceException;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- *
- */
-public class BaseQueryTuner {
-
-  private final boolean queryTuning;
-
-  private final boolean profiling;
-
-  private final AutoTuneMode mode;
-
-  /**
-   * Map of the tuned query details per profile query point.
-   */
-  private final Map<String, TunedQueryInfo> tunedQueryInfoMap = new ConcurrentHashMap<>();
-
-  private final SpiEbeanServer server;
-
-  private final ProfilingListener profilingListener;
-
-  /**
-   * Flag set true when there is no profiling or query tuning.
-   */
-  private final boolean skipAll;
-
-  BaseQueryTuner(AutoTuneConfig config, SpiEbeanServer server, ProfilingListener profilingListener) {
-    this.server = server;
-    this.profilingListener = profilingListener;
-    this.mode = config.getMode();
-    this.queryTuning = config.isQueryTuning();
-    this.profiling = config.isProfiling();
-    this.skipAll = !queryTuning && !profiling;
-  }
-
-  /**
-   * Return all the current tuned query entries.
-   */
-  public Collection<TunedQueryInfo> getAll() {
-    return tunedQueryInfoMap.values();
-  }
-
-  /**
-   * Put a query tuning entry.
-   */
-  public void put(Origin origin) {
-
-    tunedQueryInfoMap.put(origin.getKey(), new TunedQueryInfo(origin));
-  }
-
-  /**
-   * Load the tuned query information.
-   */
-  public void load(String key, TunedQueryInfo queryInfo) {
-    tunedQueryInfoMap.put(key, queryInfo);
-  }
-
-  /**
-   * Return the detail currently used for tuning.
-   * This returns null if there is currently no matching tuning.
-   */
-  public OrmQueryDetail get(String key) {
-    TunedQueryInfo info = tunedQueryInfoMap.get(key);
-    return (info == null) ? null : info.getTunedDetail();
-  }
-
-  /**
-   * Auto tune the query and enable profiling.
-   */
-  boolean tuneQuery(SpiQuery<?> query) {
-
-    if (skipAll || !tunableQuery(query)) {
-      return false;
-    }
-
-    if (query.getProfilingListener() != null) {
-      // profiling secondary query
-      return false;
-    }
-
-    if (!useTuning(query)) {
-      if (profiling) {
-        profiling(query, server.createCallOrigin());
-      }
-      return false;
-    }
-
-    if (query.getParentNode() != null) {
-      // This is a +lazy/+query query with profiling on.
-      // We continue to collect the profiling information.
-      query.setProfilingListener(profilingListener);
-      return true;
-    }
-
-    // create a query point to identify the query
-    CallOrigin callOrigin = server.createCallOrigin();
-    ObjectGraphNode origin = query.setOrigin(callOrigin);
-
-    if (profiling) {
-      if (profilingListener.isProfileRequest(origin, query)) {
-        // collect more profiling based on profiling rate etc
-        query.setProfilingListener(profilingListener);
-      }
-    }
-
-    if (queryTuning) {
-      // get current "tuned fetch" for this query point
-      TunedQueryInfo tuneInfo = tunedQueryInfoMap.get(origin.getOriginQueryPoint().getKey());
-      return tuneInfo != null && tuneInfo.tuneQuery(query);
-    }
-    return false;
-  }
-
-  /**
-   * Return false for row count, find ids, subQuery, delete and Versions queries.
-   * <p>
-   * These queries are not applicable for autoTune in that they don't have a select/fetch (fetch group).
-   * </p>
-   * <p>
-   * We also exclude queries that are explicitly set to load the L2 bean cache as we want full beans
-   * in that case.
-   * </p>
-   */
-  private boolean tunableQuery(SpiQuery<?> query) {
-    SpiQuery.Type type = query.getType();
-    switch (type) {
-      case COUNT:
-      case ATTRIBUTE:
-      case ATTRIBUTE_SET:
-      case ID_LIST:
-      case UPDATE:
-      case DELETE:
-      case SQ_EXISTS:
-      case SQ_EX:
-        return false;
-      default:
-        // not using autoTune when explicitly loading the l2 bean cache
-        // or when using Versions query
-        return !query.isForceHitDatabase() && SpiQuery.TemporalMode.VERSIONS != query.getTemporalMode();
-    }
-  }
-
-  private void profiling(SpiQuery<?> query, CallOrigin call) {
-
-    // create a query point to identify the query
-    ObjectGraphNode origin = query.setOrigin(call);
-    if (profilingListener.isProfileRequest(origin, query)) {
-      // collect more profiling based on profiling rate etc
-      query.setProfilingListener(profilingListener);
-    }
-  }
-
-  /**
-   * Return true if we should try to tune this query.
-   */
-  private boolean useTuning(SpiQuery<?> query) {
-
-    Boolean autoTune = query.isAutoTune();
-    if (autoTune != null) {
-      // explicitly set...
-      return autoTune;
-
-    } else {
-      // determine using implicit mode...
-      switch (mode) {
-        case DEFAULT_ON:
-          return true;
-
-        case DEFAULT_OFF:
-          return false;
-
-        case DEFAULT_ONIFEMPTY:
-          return query.isDetailEmpty();
-
-        default:
-          throw new PersistenceException("Invalid AutoTuneMode " + mode);
-      }
-    }
-  }
-
-  /**
-   * Return the keys as a set.
-   */
-  public Set<String> keySet() {
-    return tunedQueryInfoMap.keySet();
-  }
-}

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

@@ -1,295 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import io.avaje.applog.AppLog;
-import io.ebean.config.AutoTuneConfig;
-import io.ebean.config.DatabaseConfig;
-import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.autotune.AutoTuneService;
-import io.ebeaninternal.server.autotune.model.Autotune;
-import io.ebeaninternal.server.autotune.model.Origin;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-
-import static java.lang.System.Logger.Level.*;
-
-/**
- * Implementation of the AutoTuneService which is comprised of profiling and query tuning.
- */
-public class DefaultAutoTuneService implements AutoTuneService {
-
-  private static final System.Logger logger = AppLog.getLogger(DefaultAutoTuneService.class);
-
-  private final ReentrantLock lock = new ReentrantLock();
-
-  private final SpiEbeanServer server;
-
-  private final long defaultGarbageCollectionWait;
-
-  private final boolean skipGarbageCollectionOnShutdown;
-
-  private final boolean skipProfileReportingOnShutdown;
-
-  private final BaseQueryTuner queryTuner;
-
-  private final ProfileManager profileManager;
-
-  private final boolean profiling;
-
-  private final boolean queryTuning;
-
-  private final String tuningFile;
-
-  private final String profilingFile;
-
-  private final String serverName;
-
-  private final int profilingUpdateFrequency;
-
-  private long runtimeChangeCount;
-
-  public DefaultAutoTuneService(SpiEbeanServer server, DatabaseConfig databaseConfig) {
-    AutoTuneConfig config = databaseConfig.getAutoTuneConfig();
-    this.server = server;
-    this.queryTuning = config.isQueryTuning();
-    this.profiling = config.isProfiling();
-    this.tuningFile = config.getQueryTuningFile();
-    this.profilingFile = config.getProfilingFile();
-    this.profilingUpdateFrequency = config.getProfilingUpdateFrequency();
-    this.serverName = server.name();
-    this.profileManager = new ProfileManager(config, server);
-    this.queryTuner = new BaseQueryTuner(config, server, profileManager);
-    this.skipGarbageCollectionOnShutdown = config.isSkipGarbageCollectionOnShutdown();
-    this.skipProfileReportingOnShutdown = config.isSkipProfileReportingOnShutdown();
-    this.defaultGarbageCollectionWait = config.getGarbageCollectionWait();
-  }
-
-  /**
-   * Load the query tuning information from it's data store.
-   */
-  @Override
-  public void startup() {
-
-    if (queryTuning) {
-      loadTuningFile();
-      if (isRuntimeTuningUpdates()) {
-        // periodically gather and update query tuning
-        server.backgroundExecutor().scheduleWithFixedDelay(new ProfilingUpdate(), profilingUpdateFrequency, profilingUpdateFrequency, TimeUnit.SECONDS);
-      }
-    }
-  }
-
-
-  /**
-   * Return true if the tuning should update periodically at runtime.
-   */
-  private boolean isRuntimeTuningUpdates() {
-    return profilingUpdateFrequency > 0;
-  }
-
-  private class ProfilingUpdate implements Runnable {
-
-    @Override
-    public void run() {
-      runtimeTuningUpdate();
-    }
-  }
-
-  /**
-   * Load tuning information from an existing tuning file.
-   */
-  private void loadTuningFile() {
-    File file = new File(tuningFile);
-    if (file.exists()) {
-      loadAutoTuneProfiling(AutoTuneXmlReader.read(file));
-    } else {
-      // look for autotune as a resource
-      try (InputStream stream = getClass().getResourceAsStream("/" + tuningFile)) {
-        if (stream != null) {
-          loadAutoTuneProfiling(AutoTuneXmlReader.read(stream));
-        } else {
-          logger.log(WARNING, "AutoTune file {0} not found - no initial automatic query tuning", tuningFile);
-        }
-      } catch (IOException e) {
-        throw new IllegalStateException("Error on auto close of " + tuningFile, e);
-      }
-    }
-  }
-
-  private void loadAutoTuneProfiling(Autotune profiling) {
-    logger.log(INFO, "AutoTune loading {0} tuning entries", profiling.getOrigin().size());
-    for (Origin origin : profiling.getOrigin()) {
-      queryTuner.put(origin);
-    }
-  }
-
-  /**
-   * Collect profiling, check for new/diff to existing tuning and apply changes.
-   */
-  private void runtimeTuningUpdate() {
-    lock.lock();
-    try {
-      try {
-        long start = System.currentTimeMillis();
-
-        AutoTuneCollection profiling = profileManager.profilingCollection(false);
-
-        AutoTuneDiffCollection event = new AutoTuneDiffCollection(profiling, queryTuner, true);
-        event.process();
-        if (event.isEmpty()) {
-          long exeMillis = System.currentTimeMillis() - start;
-          logger.log(DEBUG, "No query tuning updates for server:{0} executionMillis:{1}", serverName, exeMillis);
-
-        } else {
-          // report the query tuning changes that have been made
-          runtimeChangeCount += event.getChangeCount();
-          event.writeFile(profilingFile + "-" + serverName + "-update");
-          long exeMillis = System.currentTimeMillis() - start;
-          logger.log(INFO, "query tuning updates - new:{0} diff:{1} for server:{2} executionMillis:{3}", event.getNewCount(), event.getDiffCount(), serverName, exeMillis);
-        }
-      } catch (Throwable e) {
-        logger.log(ERROR, "Error collecting or applying automatic query tuning", e);
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  private void saveProfilingOnShutdown(boolean reset) {
-    lock.lock();
-    try {
-      if (isRuntimeTuningUpdates()) {
-        runtimeTuningUpdate();
-        outputAllTuning();
-
-      } else {
-
-        AutoTuneCollection profiling = profileManager.profilingCollection(reset);
-
-        AutoTuneDiffCollection event = new AutoTuneDiffCollection(profiling, queryTuner, false);
-        event.process();
-        if (event.isEmpty()) {
-          logger.log(INFO, "No new or diff entries for profiling server:{0}", serverName);
-
-        } else {
-          event.writeFile(profilingFile + "-" + serverName);
-          logger.log(INFO, "writing new:{0} diff:{1} profiling entries for server:{2}", event.getNewCount(), event.getDiffCount(), serverName);
-        }
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Output all the query tuning (the "all" file).
-   * <p>
-   * This is the originally loaded tuning plus any tuning changes picked up and applied at runtime.
-   * </p>
-   * <p>
-   * This "all" file can be used as the next "ebean-autotune.xml" file.
-   * </p>
-   */
-  private void outputAllTuning() {
-
-    if (runtimeChangeCount == 0) {
-      logger.log(INFO, "no runtime query tuning changes for server:{0}", serverName);
-
-    } else {
-      AutoTuneAllCollection event = new AutoTuneAllCollection(queryTuner);
-      int size = event.size();
-      File existingTuning = new File(tuningFile);
-      if (existingTuning.exists()) {
-        // rename the existing autotune.xml file (appending 'now')
-        if (!existingTuning.renameTo(new File(tuningFile + "." + AutoTuneXmlWriter.now()))) {
-          logger.log(WARNING, "Failed to rename autotune file [{0}]", tuningFile);
-        }
-      }
-
-      event.writeFile(tuningFile, false);
-      logger.log(INFO, "query tuning detected [{0}] changes, writing all [{1}] tuning entries for server:{2}", runtimeChangeCount, size, serverName);
-    }
-  }
-
-  /**
-   * Shutdown the listener.
-   * <p>
-   * We should try to collect the usage statistics by calling a System.gc().
-   * This is necessary for use with short lived applications where garbage
-   * collection may not otherwise occur at all.
-   * </p>
-   */
-  @Override
-  public void shutdown() {
-    if (profiling) {
-      if (!skipGarbageCollectionOnShutdown && !skipProfileReportingOnShutdown) {
-        // trigger GC to update profiling information on recently executed queries
-        collectProfiling(-1);
-      }
-      if (!skipProfileReportingOnShutdown) {
-        saveProfilingOnShutdown(false);
-      }
-    }
-  }
-
-  /**
-   * Output the profiling.
-   * <p>
-   * When profiling updates are applied to tuning at runtime this reports all tuning and profiling combined.
-   * When profiling is not applied at runtime then this reports the diff report with new and diff entries relative
-   * to the existing tuning.
-   * </p>
-   */
-  @Override
-  public void reportProfiling() {
-    saveProfilingOnShutdown(false);
-  }
-
-  /**
-   * Ask for a System.gc() so that we gather node usage information.
-   * <p>
-   * Really only want to do this sparingly but useful just prior to shutdown
-   * for short run application where garbage collection may otherwise not
-   * occur at all.
-   * </p>
-   * <p>
-   * waitMillis will do a thread sleep to give the garbage collection a little
-   * time to do its thing assuming we are shutting down the VM.
-   * </p>
-   * <p>
-   * If waitMillis is -1 then the defaultGarbageCollectionWait is used which
-   * defaults to 100 milliseconds.
-   * </p>
-   */
-  @Override
-  public void collectProfiling() {
-    collectProfiling(-1);
-  }
-
-  public void collectProfiling(long waitMillis) {
-    System.gc();
-    try {
-      if (waitMillis < 0) {
-        waitMillis = defaultGarbageCollectionWait;
-      }
-      Thread.sleep(waitMillis);
-    } catch (InterruptedException e) {
-      // restore the interrupted status
-      Thread.currentThread().interrupt();
-      logger.log(WARNING, "Error while sleeping after System.gc() request.", e);
-    }
-  }
-
-  /**
-   * Auto tune the query and enable profiling.
-   */
-  @Override
-  public boolean tuneQuery(SpiQuery<?> query) {
-    return queryTuner.tuneQuery(query);
-  }
-
-}

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

@@ -1,122 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import io.ebean.bean.NodeUsageCollector;
-import io.ebean.bean.ObjectGraphNode;
-import io.ebean.bean.ObjectGraphOrigin;
-import io.ebean.config.AutoTuneConfig;
-import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.autotune.ProfilingListener;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * Manages the collection of object graph usage profiling.
- */
-public class ProfileManager implements ProfilingListener {
-
-  private final ReentrantLock lock = new ReentrantLock();
-
-  private final boolean queryTuningAddVersion;
-
-  /**
-   * Converted from a 0-100 int to a double. Effectively a percentage rate at
-   * which to collect profiling information.
-   */
-  private final double profilingRate;
-
-  private final int profilingBase;
-
-  /**
-   * Map of the usage and query statistics gathered.
-   */
-  private final Map<String, ProfileOrigin> profileMap = new ConcurrentHashMap<>();
-
-  private final SpiEbeanServer server;
-
-  public ProfileManager(AutoTuneConfig config, SpiEbeanServer server) {
-    this.server = server;
-    this.profilingRate = config.getProfilingRate();
-    this.profilingBase = config.getProfilingBase();
-    this.queryTuningAddVersion = config.isQueryTuningAddVersion();
-  }
-
-  @Override
-  public boolean isProfileRequest(ObjectGraphNode origin, SpiQuery<?> query) {
-    ProfileOrigin profileOrigin = profileMap.get(origin.getOriginQueryPoint().getKey());
-    if (profileOrigin == null) {
-      profileMap.put(origin.getOriginQueryPoint().getKey(), createProfileOrigin(origin, query));
-      return true;
-    } else {
-      return profileOrigin.isProfile();
-    }
-  }
-
-  /**
-   * Create the profile origin noting the query detail currently being used.
-   * <p>
-   * For new profiling entries it is useful to compare the profiling against the current
-   * query detail that is specified in the code (as the query might already be manually optimised).
-   */
-  private ProfileOrigin createProfileOrigin(ObjectGraphNode origin, SpiQuery<?> query) {
-    ProfileOrigin profileOrigin = new ProfileOrigin(origin.getOriginQueryPoint(), queryTuningAddVersion, profilingBase, profilingRate);
-    // set the current query detail (fetch group) so that we can compare against profiling for new entries
-    profileOrigin.setOriginalQuery(query.getDetail().asString());
-    return profileOrigin;
-  }
-
-  /**
-   * Gather query execution statistics. This could either be the originating
-   * query in which case the parentNode will be null, or a lazy loading query
-   * resulting from traversal of the object graph.
-   */
-  @Override
-  public void collectQueryInfo(ObjectGraphNode node, long beans, long micros) {
-    if (node != null) {
-      ObjectGraphOrigin origin = node.getOriginQueryPoint();
-      if (origin != null) {
-        ProfileOrigin stats = getProfileOrigin(origin);
-        stats.collectQueryInfo(node, beans, micros);
-      }
-    }
-  }
-
-  /**
-   * Collect usage statistics from a node in the object graph.
-   * <p>
-   * This is sent to use from a EntityBeanIntercept when the finalise method
-   * is called on the bean.
-   */
-  @Override
-  public void collectNodeUsage(NodeUsageCollector.State usageCollector) {
-    ProfileOrigin profileOrigin = getProfileOrigin(usageCollector.node().getOriginQueryPoint());
-    profileOrigin.collectUsageInfo(usageCollector);
-  }
-
-  private ProfileOrigin getProfileOrigin(ObjectGraphOrigin originQueryPoint) {
-    lock.lock();
-    try {
-      return profileMap.computeIfAbsent(originQueryPoint.getKey(), k -> new ProfileOrigin(originQueryPoint, queryTuningAddVersion, profilingBase, profilingRate));
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Collect all the profiling information.
-   */
-  public AutoTuneCollection profilingCollection(boolean reset) {
-    AutoTuneCollection req = new AutoTuneCollection();
-    for (ProfileOrigin origin : profileMap.values()) {
-      BeanDescriptor<?> desc = server.descriptorById(origin.getOrigin().getBeanType());
-      if (desc != null) {
-        origin.profilingCollection(desc, req, reset);
-      }
-    }
-    return req;
-  }
-
-}

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

@@ -1,176 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import io.ebean.bean.NodeUsageCollector;
-import io.ebean.bean.ObjectGraphNode;
-import io.ebean.bean.ObjectGraphOrigin;
-import io.ebean.text.PathProperties;
-import io.ebean.text.PathProperties.Props;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.querydefn.OrmQueryDetail;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.ReentrantLock;
-
-public class ProfileOrigin {
-
-  private final ReentrantLock lock = new ReentrantLock();
-
-  private static final long RESET_COUNT = -1000000000L;
-
-  private final ObjectGraphOrigin origin;
-
-  private final boolean queryTuningAddVersion;
-
-  private final int profilingBase;
-
-  private final double profilingRate;
-
-  private final Map<String, ProfileOriginQuery> queryStatsMap = new ConcurrentHashMap<>();
-
-  private final Map<String, ProfileOriginNodeUsage> nodeUsageMap = new ConcurrentHashMap<>();
-
-  private final AtomicLong requestCount = new AtomicLong();
-
-  private final AtomicLong profileCount = new AtomicLong();
-
-  private String originalQuery;
-
-  public ProfileOrigin(ObjectGraphOrigin origin, boolean queryTuningAddVersion, int profilingBase, double profilingRate) {
-    this.origin = origin;
-    this.queryTuningAddVersion = queryTuningAddVersion;
-    this.profilingBase = profilingBase;
-    this.profilingRate = profilingRate;
-  }
-
-  public String getOriginalQuery() {
-    return originalQuery;
-  }
-
-  public void setOriginalQuery(String originalQuery) {
-    this.originalQuery = originalQuery;
-  }
-
-  /**
-   * Return true if this query should be profiled based on a percentage rate.
-   */
-  public boolean isProfile() {
-
-    long count = requestCount.incrementAndGet();
-    if (count < profilingBase) {
-      return true;
-    }
-    long hits = profileCount.get();
-    if (profilingRate > (double) hits / count) {
-      profileCount.incrementAndGet();
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  /**
-   * Collect profiling information with the option to reset the underlying profiling detail.
-   */
-  public void profilingCollection(BeanDescriptor<?> rootDesc, AutoTuneCollection req, boolean reset) {
-    lock.lock();
-    try {
-      if (nodeUsageMap.isEmpty()) {
-        return;
-      }
-
-      OrmQueryDetail detail = buildDetail(rootDesc);
-      AutoTuneCollection.Entry entry = req.add(origin, detail, originalQuery);
-
-      Collection<ProfileOriginQuery> values = queryStatsMap.values();
-      for (ProfileOriginQuery queryEntry : values) {
-        entry.addQuery(queryEntry.createEntryQuery(reset));
-      }
-      if (reset) {
-        nodeUsageMap.clear();
-        if (requestCount.get() > RESET_COUNT) {
-          requestCount.set(profilingBase);
-          profileCount.set(0);
-        }
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  OrmQueryDetail buildDetail(BeanDescriptor<?> rootDesc) {
-
-    PathProperties pathProps = new PathProperties();
-    for (ProfileOriginNodeUsage statsNode : nodeUsageMap.values()) {
-      statsNode.buildTunedFetch(pathProps, rootDesc, queryTuningAddVersion);
-    }
-
-    OrmQueryDetail detail = new OrmQueryDetail();
-
-    for (Props props : pathProps.getPathProps()) {
-      if (!props.isEmpty()) {
-        detail.fetch(props.getPath(), props.getPropertiesAsString(), null);
-      }
-    }
-
-    detail.sortFetchPaths(rootDesc);
-    return detail;
-  }
-
-  /**
-   * Return the origin.
-   */
-  public ObjectGraphOrigin getOrigin() {
-    return origin;
-  }
-
-  /**
-   * Collect query execution summary statistics.
-   * <p>
-   * This can give us a quick overview into bad lazy loading areas etc.
-   * </p>
-   */
-  public void collectQueryInfo(ObjectGraphNode node, long beansLoaded, long micros) {
-
-    String key = node.getPath();
-    if (key == null) {
-      key = "";
-    }
-
-    ProfileOriginQuery stats = queryStatsMap.get(key);
-    if (stats == null) {
-      // a race condition but we don't care
-      stats = new ProfileOriginQuery(key);
-      queryStatsMap.put(key, stats);
-    }
-    stats.add(beansLoaded, micros);
-  }
-
-  /**
-   * Collect the usage information for from a instance for this node.
-   */
-  public void collectUsageInfo(NodeUsageCollector.State profile) {
-    if (!profile.isEmpty()) {
-      getNodeStats(profile.node().getPath()).collectUsageInfo(profile);
-    }
-  }
-
-  private ProfileOriginNodeUsage getNodeStats(String path) {
-    lock.lock();
-    try {
-      // handle null paths as using ConcurrentHashMap
-      path = (path == null) ? "" : path;
-      ProfileOriginNodeUsage nodeStats = nodeUsageMap.get(path);
-      if (nodeStats == null) {
-        nodeStats = new ProfileOriginNodeUsage(path);
-        nodeUsageMap.put(path, nodeStats);
-      }
-      return nodeStats;
-    } finally {
-      lock.unlock();
-    }
-  }
-
-}

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

@@ -1,128 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import io.avaje.applog.AppLog;
-import io.ebean.bean.NodeUsageCollector;
-import io.ebean.text.PathProperties;
-import io.ebean.util.SplitName;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
-import io.ebeaninternal.server.el.ElPropertyValue;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.concurrent.locks.ReentrantLock;
-
-import static java.lang.System.Logger.Level.WARNING;
-
-/**
- * Collects usages statistics for a given node in the object graph.
- */
-public class ProfileOriginNodeUsage {
-
-  private static final System.Logger logger = AppLog.getLogger(ProfileOriginNodeUsage.class);
-
-  private final ReentrantLock lock = new ReentrantLock();
-
-  private final String path;
-
-  private int profileCount;
-
-  private int profileUsedCount;
-
-  private boolean modified;
-
-  private final Set<String> aggregateUsed = new LinkedHashSet<>();
-
-  public ProfileOriginNodeUsage(String path) {
-    // handle null paths as using ConcurrentHashMap
-    this.path = "".equals(path) ? null : path;
-  }
-
-  protected void buildTunedFetch(PathProperties pathProps, BeanDescriptor<?> rootDesc, boolean addVersionProperty) {
-    lock.lock();
-    try {
-      BeanDescriptor<?> desc = rootDesc;
-      if (path != null) {
-        ElPropertyValue elGetValue = rootDesc.elGetValue(path);
-        if (elGetValue == null) {
-          logger.log(WARNING, "AutoTune: Can't find join for path[" + path + "] for " + rootDesc.name());
-          return;
-        } else {
-          BeanProperty beanProperty = elGetValue.beanProperty();
-          if (beanProperty instanceof BeanPropertyAssoc<?>) {
-            desc = ((BeanPropertyAssoc<?>) beanProperty).targetDescriptor();
-          }
-        }
-      }
-
-      BeanProperty toOneIdProperty = null;
-      boolean addedToPath = false;
-
-      for (String propName : aggregateUsed) {
-        BeanProperty beanProp = desc.findPropertyFromPath(propName);
-        if (beanProp == null) {
-          logger.log(WARNING, "AutoTune: Can't find property[" + propName + "] for " + desc.name());
-
-        } else {
-          if (beanProp.isId()) {
-            // remember and maybe add ToOne property to parent path
-            toOneIdProperty = beanProp;
-          } else if (beanProp instanceof BeanPropertyAssoc<?>) {
-            // intentionally skip
-          } else {
-            //noinspection StatementWithEmptyBody
-            if (beanProp.isLob() && !beanProp.isFetchEager()) {
-              // AutoTune will not include Lob's marked FetchLazy
-              // (which is the default for Lob's so typical).
-            } else {
-              addedToPath = true;
-              pathProps.addToPath(path, beanProp.name());
-            }
-          }
-        }
-      }
-
-      if ((modified || addVersionProperty) && desc != null) {
-        BeanProperty versionProp = desc.versionProperty();
-        if (versionProp != null) {
-          addedToPath = true;
-          pathProps.addToPath(path, versionProp.name());
-        }
-      }
-
-      if (toOneIdProperty != null && !addedToPath) {
-        // add ToOne property to parent path
-        ElPropertyValue assocOne = rootDesc.elGetValue(path);
-        pathProps.addToPath(SplitName.parent(path), assocOne.name());
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Collect usage from a node.
-   */
-  protected void collectUsageInfo(NodeUsageCollector.State profile) {
-    lock.lock();
-    try {
-      Set<String> used = profile.used();
-      profileCount++;
-      if (!used.isEmpty()) {
-        profileUsedCount++;
-        aggregateUsed.addAll(used);
-      }
-      if (profile.isModified()) {
-        modified = true;
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  @Override
-  public String toString() {
-    return "path[" + path + "] profileCount[" + profileCount + "] used[" + profileUsedCount + "] props" + aggregateUsed;
-  }
-}

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

@@ -1,41 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import java.io.Serializable;
-import java.util.concurrent.atomic.LongAdder;
-
-/**
- * Used to accumulate query execution statistics for paths relative to the origin query.
- */
-public class ProfileOriginQuery implements Serializable {
-
-  private static final long serialVersionUID = -1133958958072778811L;
-
-  private final String path;
-
-  private final LongAdder exeCount = new LongAdder();
-
-  private final LongAdder totalBeanLoaded = new LongAdder();
-
-  private final LongAdder totalMicros = new LongAdder();
-
-  public ProfileOriginQuery(String path) {
-    this.path = path;
-  }
-
-  public void add(long beansLoaded, long micros) {
-    exeCount.increment();
-    totalBeanLoaded.add(beansLoaded);
-    totalMicros.add(micros);
-  }
-
-  public AutoTuneCollection.EntryQuery createEntryQuery(boolean reset) {
-
-    if (reset) {
-      return new AutoTuneCollection.EntryQuery(path, exeCount.sumThenReset(), totalBeanLoaded.sumThenReset(), totalMicros.sumThenReset());
-
-    } else {
-      return new AutoTuneCollection.EntryQuery(path, exeCount.sum(), totalBeanLoaded.sum(), totalMicros.sum());
-    }
-  }
-
-}

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

@@ -1,70 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import io.ebeaninternal.server.autotune.model.Autotune;
-import io.ebeaninternal.server.autotune.model.Origin;
-import io.ebeaninternal.server.autotune.model.ProfileDiff;
-import io.ebeaninternal.server.autotune.model.ProfileEmpty;
-import io.ebeaninternal.server.autotune.model.ProfileNew;
-
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * Sorts Autotune document by
- */
-public class SortAutoTuneDocument {
-
-
-  /**
-   * Set the diff and new entries by bean type followed by key.
-   */
-  public static void sort(Autotune document) {
-
-    ProfileDiff profileDiff = document.getProfileDiff();
-    if (profileDiff != null) {
-      profileDiff.getOrigin().sort(NAME_KEY_SORT);
-    }
-    ProfileNew profileNew = document.getProfileNew();
-    if (profileNew != null) {
-      profileNew.getOrigin().sort(NAME_KEY_SORT);
-    }
-    ProfileEmpty profileEmpty = document.getProfileEmpty();
-    if (profileEmpty != null) {
-      profileEmpty.getOrigin().sort(KEY_SORT);
-    }
-    List<Origin> origins = document.getOrigin();
-    if (!origins.isEmpty()) {
-      origins.sort(NAME_KEY_SORT);
-    }
-  }
-
-  private static final OriginNameKeySort NAME_KEY_SORT = new OriginNameKeySort();
-
-  private static final OriginKeySort KEY_SORT = new OriginKeySort();
-
-  /**
-   * Comparator sort by bean type then key.
-   */
-  private static class OriginNameKeySort implements Comparator<Origin> {
-
-    @Override
-    public int compare(Origin o1, Origin o2) {
-      int comp = o1.getBeanType().compareTo(o2.getBeanType());
-      if (comp == 0) {
-        comp = o1.getKey().compareTo(o2.getKey());
-      }
-      return comp;
-    }
-  }
-
-  /**
-   * Comparator sort by bean type then key.
-   */
-  private static class OriginKeySort implements Comparator<Origin> {
-
-    @Override
-    public int compare(Origin o1, Origin o2) {
-      return o1.getKey().compareTo(o2.getKey());
-    }
-  }
-}

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

@@ -1,71 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.autotune.model.Origin;
-import io.ebeaninternal.server.querydefn.OrmQueryDetail;
-import io.ebeaninternal.server.querydefn.OrmQueryDetailParser;
-
-import java.io.Serializable;
-
-/**
- * Holds tuned query information. Is immutable so this represents the tuning at
- * a given point in time.
- */
-public class TunedQueryInfo implements Serializable {
-
-  private static final long serialVersionUID = 8661702592481810396L;
-
-  private final Origin origin;
-
-  private final OrmQueryDetail tunedDetail;
-
-  public TunedQueryInfo(Origin origin) {
-    this.origin = origin;
-    this.tunedDetail = new OrmQueryDetailParser(origin.getDetail()).parse();
-  }
-
-  /**
-   * Return the origin entry (includes call stack and bean type).
-   */
-  public Origin getOrigin() {
-    return origin;
-  }
-
-  /**
-   * Return the tuned detail (for comparison with profiling information).
-   */
-  public OrmQueryDetail getTunedDetail() {
-    return tunedDetail;
-  }
-
-  /**
-   * Tune the query by replacing its OrmQueryDetail with a tuned one.
-   *
-   * @return true if the query was tuned, otherwise false.
-   */
-  public boolean tuneQuery(SpiQuery<?> query) {
-    if (tunedDetail == null) {
-      return false;
-    }
-
-    boolean tuned;
-    if (query.isDetailEmpty()) {
-      tuned = true;
-      // tune by 'replacement'
-      query.setDetail(tunedDetail.copy());
-    } else {
-      // tune by 'addition'
-      tuned = query.tuneFetchProperties(tunedDetail);
-    }
-    if (tuned) {
-      query.setAutoTuned(true);
-    }
-    return tuned;
-  }
-
-  @Override
-  public String toString() {
-    return tunedDetail.asString();
-  }
-
-}

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

@@ -1,15 +0,0 @@
-import io.ebeaninternal.server.autotune.AutoTuneServiceProvider;
-import io.ebeaninternal.server.autotune.service.AutoTuneServiceFactory;
-
-/**
- * Provider of AutoTuneServiceProvider
- */
-module io.ebean.autotune {
-
-  provides AutoTuneServiceProvider with AutoTuneServiceFactory;
-
-  requires io.ebean.api;
-  requires io.ebean.core;
-  requires java.xml;
-  requires java.xml.bind;
-}

ebean-autotune/src/main/resources/META-INF/services/io.ebeaninternal.server.autotune.AutoTuneServiceProvider

@@ -1 +0,0 @@
-io.ebeaninternal.server.autotune.service.AutoTuneServiceFactory

ebean-autotune/src/main/resources/ebean-autotune-1.0.xsd

@@ -1,55 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://ebean-orm.github.io/xml/ns/autotune"
-            targetNamespace="http://ebean-orm.github.io/xml/ns/autotune" elementFormDefault="qualified">
-
-
-  <!-- Root level type : profiling -->
-
-  <xsd:element name="autotune">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="origin" minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element ref="profileDiff" minOccurs="0" maxOccurs="1"/>
-        <xsd:element ref="profileNew" minOccurs="0" maxOccurs="1"/>
-        <xsd:element ref="profileEmpty" minOccurs="0" maxOccurs="1"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="origin">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="callStack" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-      </xsd:sequence>
-      <xsd:attribute name="key" type="xsd:string" use="required"/>
-      <xsd:attribute name="beanType" type="xsd:string"/>
-      <xsd:attribute name="detail" type="xsd:string"/>
-      <xsd:attribute name="original" type="xsd:string"/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="profileDiff">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="origin" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="profileNew">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="origin" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="profileEmpty">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="origin" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-</xsd:schema>

ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java

@@ -1,31 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import io.ebeaninternal.server.autotune.model.Autotune;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.io.InputStream;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class AutoTuneXmlReaderTest {
-
-  @Test
-  public void read_file() {
-
-    File testFile = new File("src/test/resources/autotune/test-autotune.xml");
-
-    Autotune tuneInfo = AutoTuneXmlReader.read(testFile);
-    assertThat(tuneInfo.getOrigin()).isNotEmpty();
-  }
-
-  @Test
-  public void read_inputStream() {
-
-    InputStream is = getClass().getResourceAsStream("/autotune/test-autotune.xml");
-
-    Autotune tuneInfo = AutoTuneXmlReader.read(is);
-    assertThat(tuneInfo.getOrigin()).isNotEmpty();
-  }
-
-}

ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java

@@ -1,149 +0,0 @@
-package io.ebeaninternal.server.autotune.service;
-
-import io.ebean.bean.NodeUsageCollector;
-import io.ebean.bean.NodeUsageListener;
-import io.ebean.bean.ObjectGraphNode;
-import io.ebean.bean.ObjectGraphOrigin;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.querydefn.OrmQueryDetail;
-import org.junit.jupiter.api.Test;
-import org.tests.autofetch.BaseTestCase;
-import org.tests.model.basic.Order;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class ProfileOriginTest extends BaseTestCase {
-
-  static class Noop implements NodeUsageListener {
-    @Override
-    public void collectNodeUsage(NodeUsageCollector.State state) {
-      // do nothing
-    }
-  }
-
-  private final NodeUsageListener listener = new Noop();
-
-  private final BeanDescriptor<Order> desc = getBeanDescriptor(Order.class);
-
-  @Test
-  public void buildDetail() {
-
-    NodeUsageCollector c = node("customer");
-    c.addUsed("id");
-    c.addUsed("name");
-
-    ProfileOrigin po = new ProfileOrigin(null, false, 1, 1);
-    po.collectUsageInfo(c.state());
-
-    OrmQueryDetail detail = po.buildDetail(desc);
-
-    assertThat(detail.asString().trim()).isEqualTo("fetch customer (name)");
-  }
-
-  @Test
-  public void buildDetail_selectFetch() {
-
-    NodeUsageCollector c = node("customer");
-    c.addUsed("id");
-    c.addUsed("name");
-
-    ProfileOrigin po = new ProfileOrigin(null, false, 1, 1);
-    po.collectUsageInfo(c.state());
-
-    c = node(null);
-    c.addUsed("orderDate");
-    po.collectUsageInfo(c.state());
-
-    OrmQueryDetail detail = po.buildDetail(desc);
-
-    assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (name)");
-  }
-
-  @Test
-  public void buildDetail_expect_mergeFetchToSelect() {
-
-    NodeUsageCollector c = node("customer");
-    c.addUsed("id");
-
-    ProfileOrigin po = new ProfileOrigin(null, false, 1, 1);
-    po.collectUsageInfo(c.state());
-
-    c = node(null);
-    c.addUsed("orderDate");
-    po.collectUsageInfo(c.state());
-
-    OrmQueryDetail detail = po.buildDetail(desc);
-
-    assertThat(detail.asString().trim()).isEqualTo("select (orderDate,customer)");
-  }
-
-  @Test
-  public void buildDetail_expect_mergeFetchToParentFetch() {
-
-    ProfileOrigin po = new ProfileOrigin(null, false, 1, 1);
-
-    NodeUsageCollector c = node(null);
-    c.addUsed("orderDate");
-    c.addUsed("customer");
-    po.collectUsageInfo(c.state());
-
-    c = node("customer");
-    c.addUsed("billingAddress");
-    po.collectUsageInfo(c.state());
-
-    c = node("customer.billingAddress");
-    c.addUsed("id");
-    po.collectUsageInfo(c.state());
-
-    OrmQueryDetail detail = po.buildDetail(desc);
-
-    assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (billingAddress)");
-  }
-
-
-  @Test
-  public void buildDetail_expect_mergeMulit() {
-
-    ProfileOrigin po = new ProfileOrigin(null, false, 1, 1);
-
-    //fetch details (id,orderQty,shipQty,unitPrice)
-
-    NodeUsageCollector c = node(null);
-    c.addUsed("customer");
-    po.collectUsageInfo(c.state());
-
-    c = node("customer");
-    c.addUsed("id");
-    c.addUsed("name");
-    c.addUsed("note");
-    c.addUsed("billingAddress");
-    po.collectUsageInfo(c.state());
-
-    //fetch details.product (id,name)
-    c = node("customer.billingAddress");
-    c.addUsed("id");
-    c.addUsed("line1");
-    po.collectUsageInfo(c.state());
-
-    OrmQueryDetail detail = po.buildDetail(desc);
-    assertThat(detail.asString()).isEqualTo("fetch customer (name,note) fetch customer.billingAddress (line1)");
-  }
-
-  private NodeUsageCollector node(String path) {
-    ObjectGraphNode node = new ObjectGraphNode((ObjectGraphOrigin)null, path);
-    return new NodeUsageCollector(node, listener);
-  }
-
-//  @Test
-//  public void testQueries() {
-//
-//    ResetBasicData.reset();
-//
-//    //DB.createQuery(Order.class, "select (orderDate) fetch customer (billingAddress)").findList();
-//
-//    // we prefer this first query other the second one
-//    DB.createQuery(Order.class, "select (orderDate,customer)").findList();
-//    DB.createQuery(Order.class, "select (orderDate) fetch customer (id)").findList();
-//
-//  }
-}

ebean-autotune/src/test/java/org/tests/autofetch/BaseTestCase.java

@@ -1,16 +0,0 @@
-package org.tests.autofetch;
-
-import io.ebean.DB;
-import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-
-public class BaseTestCase {
-
-  protected SpiEbeanServer spiEbeanServer() {
-    return (SpiEbeanServer) DB.getDefault();
-  }
-
-  protected <T> BeanDescriptor<T> getBeanDescriptor(Class<T> cls) {
-    return spiEbeanServer().descriptor(cls);
-  }
-}

ebean-autotune/src/test/java/org/tests/autofetch/MainAutoFetchExcludeLazyLobs.java

@@ -1,32 +0,0 @@
-package org.tests.autofetch;
-
-//import io.ebean.Ebean;
-//import org.tests.model.basic.EBasicClob;
-
-//import java.util.List;
-
-public class MainAutoFetchExcludeLazyLobs {
-
-//  public static void main(String[] args) {
-//
-//    EBasicClob a = new EBasicClob();
-//    a.setName("name 1");
-//    a.setTitle("a title");
-//    a.setDescription("not that meaningful");
-//
-//    Ebean.save(a);
-//
-//    List<EBasicClob> list = Ebean.find(EBasicClob.class)
-//      .setAutoTune(true)
-//      .findList();
-//
-//    for (EBasicClob bean : list) {
-//      bean.getName();
-//      // although we read the description
-//      // autofetch will not include it later
-//      bean.getDescription();
-//    }
-//
-//
-//  }
-}

ebean-autotune/src/test/java/org/tests/autofetch/MainAutoQueryTune1.java

@@ -1,28 +0,0 @@
-package org.tests.autofetch;
-
-public class MainAutoQueryTune1 {
-
-//  public static void main(String[] args) {
-//
-//    ResetBasicData.reset();
-//
-//    MainAutoQueryTune1 me = new MainAutoQueryTune1();
-//    me.tuneJoin();
-//  }
-//
-//  private void tuneJoin() {
-//    List<Order> list = Ebean.find(Order.class)
-//      .setAutoTune(true)
-//      .fetch("customer")
-//      .where()
-//      .eq("status", Order.Status.NEW)
-//      .eq("customer.name", "Rob")
-//      .order().asc("id")
-//      .findList();
-//
-//    for (Order order : list) {
-//      order.getId();
-//      order.getOrderDate();
-//    }
-//  }
-}

ebean-autotune/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java

@@ -1,172 +0,0 @@
-package org.tests.autofetch;
-
-//import io.ebean.BaseTestCase;
-//import io.ebean.Ebean;
-//import io.ebean.EbeanServer;
-//import io.ebean.Query;
-//import io.ebean.bean.EntityBean;
-//import io.ebean.bean.EntityBeanIntercept;
-//import io.ebean.cache.ServerCacheManager;
-//import io.ebeaninternal.api.SpiQuery;
-//import io.ebeaninternal.server.autotune.model.Origin;
-//import io.ebeaninternal.server.autotune.service.TunedQueryInfo;
-//import io.ebeaninternal.server.querydefn.OrmQueryDetail;
-//import org.ebeantest.LoggedSqlCollector;
-//import org.junit.Assert;
-//import org.junit.Test;
-//import org.tests.model.basic.Order;
-//import org.tests.model.basic.ResetBasicData;
-//
-//import java.util.List;
-//import java.util.Set;
-
-public class TunedQueryInfoTest extends BaseTestCase {
-
-//  private void init() {
-//
-//    ResetBasicData.reset();
-//
-//    ServerCacheManager serverCacheManager = Ebean.getServer(null).getServerCacheManager();
-//    serverCacheManager.clearAll();
-//  }
-//
-//  @Test
-//  public void withSelectEmpty() {
-//
-//    init();
-//
-//    OrmQueryDetail tunedDetail = new OrmQueryDetail();
-//    tunedDetail.select("");
-//
-//    TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail);
-//
-//    Query<Order> query = server.find(Order.class).setId(1);
-//
-//    tunedInfo.tuneQuery((SpiQuery<?>) query);
-//
-//    Order order = query.findOne();
-//    EntityBean eb = (EntityBean) order;
-//    EntityBeanIntercept ebi = eb._ebean_getIntercept();
-//
-//    Assert.assertTrue(ebi.isFullyLoadedBean());
-//
-//    Set<String> loadedPropertyNames = ebi.getLoadedPropertyNames();
-//    Assert.assertNull(loadedPropertyNames);
-//
-//    // invoke lazy loading
-//    order.getCustomer();
-//  }
-//
-//  @Test
-//  public void withSelectSomethingThatDoesNotExist() {
-//
-//    init();
-//
-//    OrmQueryDetail tunedDetail = new OrmQueryDetail();
-//    tunedDetail.select("somethingThatDoesNotExist");
-//
-//    TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail);
-//
-//    Query<Order> query = server.find(Order.class).setId(1);
-//
-//    tunedInfo.tuneQuery((SpiQuery<?>) query);
-//
-//    LoggedSqlCollector.start();
-//
-//    Order order = query.findOne();
-//    EntityBean eb = (EntityBean) order;
-//    EntityBeanIntercept ebi = eb._ebean_getIntercept();
-//
-//    Assert.assertFalse(ebi.isFullyLoadedBean());
-//
-//    // id and any ToMany relationships
-//    Set<String> loadedPropertyNames = ebi.getLoadedPropertyNames();
-//    Assert.assertNotNull(loadedPropertyNames);
-//
-//    // invoke lazy loading
-//    order.getCustomer();
-//
-//    List<String> loggedSql = LoggedSqlCollector.stop();
-//    Assert.assertEquals(2, loggedSql.size());
-//
-//    Assert.assertTrue(trimSql(loggedSql.get(0), 1).contains("select t0.id, t0.id from o_order t0 where t0.id = ?"));
-//    Assert.assertTrue(trimSql(loggedSql.get(1), 1).contains("select t0.id, t0.status,"));
-//  }
-//
-//  private TunedQueryInfo createTunedQueryInfo(OrmQueryDetail tunedDetail) {
-//    Origin origin = new Origin();
-//    origin.setDetail(tunedDetail.asString());
-//    return new TunedQueryInfo(origin);
-//  }
-//
-//  @Test
-//  public void withSelectSomeIncludeLazyLoaded() {
-//
-//    init();
-//
-//    OrmQueryDetail tunedDetail = new OrmQueryDetail();
-//    tunedDetail.select("status, customer");
-//
-//    TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail);
-//
-//    Query<Order> query = server.find(Order.class).setId(1);
-//
-//    tunedInfo.tuneQuery((SpiQuery<?>) query);
-//
-//    LoggedSqlCollector.start();
-//
-//    Order order = query.findOne();
-//    EntityBean eb = (EntityBean) order;
-//    EntityBeanIntercept ebi = eb._ebean_getIntercept();
-//
-//    Assert.assertFalse(ebi.isFullyLoadedBean());
-//
-//    Set<String> loadedPropertyNames = ebi.getLoadedPropertyNames();
-//    Assert.assertNotNull(loadedPropertyNames);
-//
-//    Assert.assertTrue(loadedPropertyNames.contains("status"));
-//    Assert.assertTrue(loadedPropertyNames.contains("customer"));
-//
-//    // no lazy loading expected here
-//    order.getCustomer();
-//
-//    List<String> loggedSql = LoggedSqlCollector.stop();
-//    Assert.assertEquals(1, loggedSql.size());
-//  }
-//
-//  @Test
-//  public void withSelectSome() {
-//
-//    init();
-//
-//    OrmQueryDetail tunedDetail = new OrmQueryDetail();
-//    tunedDetail.select("status");
-//
-//    TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail);
-//
-//    Query<Order> query = server.find(Order.class).setId(1);
-//
-//    tunedInfo.tuneQuery((SpiQuery<?>) query);
-//
-//    LoggedSqlCollector.start();
-//
-//    Order order = query.findOne();
-//    EntityBean eb = (EntityBean) order;
-//    EntityBeanIntercept ebi = eb._ebean_getIntercept();
-//
-//    Assert.assertFalse(ebi.isFullyLoadedBean());
-//
-//    Set<String> loadedPropertyNames = ebi.getLoadedPropertyNames();
-//    Assert.assertNotNull(loadedPropertyNames);
-//
-//    Assert.assertTrue(loadedPropertyNames.contains("status"));
-//    Assert.assertFalse(loadedPropertyNames.contains("customer"));
-//
-//    // no lazy loading expected here
-//    order.getCustomer();
-//
-//    List<String> loggedSql = LoggedSqlCollector.stop();
-//    Assert.assertEquals(2, loggedSql.size());
-//  }
-
-}

ebean-autotune/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java

@@ -1,69 +0,0 @@
-package org.tests.autofetch;
-
-//import io.ebean.BaseTestCase;
-//import io.ebean.Ebean;
-//import io.ebean.EbeanServer;
-//import io.ebean.Query;
-//import io.ebean.bean.EntityBean;
-//import io.ebean.bean.EntityBeanIntercept;
-//import org.ebeantest.LoggedSqlCollector;
-//import org.junit.Assert;
-//import org.junit.Test;
-//import org.tests.model.basic.Address;
-//import org.tests.model.basic.Customer;
-//import org.tests.model.basic.ResetBasicData;
-
-import java.util.List;
-import java.util.Set;
-
-public class TunedQueryWithNullFetchedBeanTest extends BaseTestCase {
-
-//  EbeanServer server = Ebean.getServer(null);
-//
-//  @Test
-//  public void withFetchOfNullBeanJoin() {
-//
-//    ResetBasicData.reset();
-//
-//    Customer newCustomer = new Customer();
-//    newCustomer.setName("TestFetchBillingAddress");
-//    server.save(newCustomer);
-//
-//    Query<Customer> query = server.find(Customer.class)
-//      .setId(newCustomer.getId())
-//      .fetch("billingAddress", "id");
-//
-//    LoggedSqlCollector.start();
-//
-//    Customer customer = query.findOne();
-//    EntityBean eb = (EntityBean) customer;
-//    EntityBeanIntercept ebi = eb._ebean_getIntercept();
-//
-//    Assert.assertTrue(ebi.isFullyLoadedBean());
-//
-//    // find the internal property index for "billingAddress"
-//    String[] propNames = eb._ebean_getPropertyNames();
-//    int pos = 0;
-//    for (int i = 0; i < propNames.length; i++) {
-//      if (propNames[i].equals("billingAddress")) {
-//        pos = i;
-//      }
-//    }
-//
-//    // The billing address is loaded (but value null)
-//    Assert.assertTrue(ebi.isLoadedProperty(pos));
-//
-//    Set<String> loadedPropertyNames = ebi.getLoadedPropertyNames();
-//    Assert.assertNull(loadedPropertyNames);
-//
-//    // no lazy loading expected here, value is null
-//    Address billingAddress = customer.getBillingAddress();
-//    Assert.assertNull(billingAddress);
-//
-//    // assert only one query executed
-//    List<String> loggedSql = LoggedSqlCollector.stop();
-//    Assert.assertEquals(1, loggedSql.size());
-//
-//    Ebean.delete(newCustomer);
-//  }
-}

ebean-autotune/src/test/java/org/tests/model/basic/Address.java

@@ -1,38 +0,0 @@
-package org.tests.model.basic;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "address")
-public class Address extends BaseModel {
-
-  String line1;
-  String line2;
-  String city;
-
-  public String getLine1() {
-    return line1;
-  }
-
-  public void setLine1(String line1) {
-    this.line1 = line1;
-  }
-
-  public String getLine2() {
-    return line2;
-  }
-
-  public void setLine2(String line2) {
-    this.line2 = line2;
-  }
-
-  public String getCity() {
-    return city;
-  }
-
-  public void setCity(String city) {
-    this.city = city;
-  }
-}