#1966 Remove sequence batching - postgres opps

Remove Sequence batching in favour of JPA increment 50
Also remove h2sqldb in favour of always using H2
2024-04-21 10:51:47 +00:00 · 2020-03-05 00:34:05 +13:00 · 2020-03-05 00:22:20 +13:00
5626 changed files with 161096 additions and 244771 deletions
@@ -1,3 +1,9 @@
+
+GITHUB ISSUES ARE STRICTLY CONTROLLED FOR THIS PROJECT.
+
+Refer to http://ebean-orm.github.io/support for the policies controlling the use of github issues.
+Please post issues to the Ebean group https://groups.google.com/forum/#!forum/ebean first.
+
 ## Expected behavior

 ## Actual behavior
@@ -1,43 +0,0 @@
-
-name: Build
-
-on:
-  pull_request:
-  push:
-    branches: master
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11]
-        os: [ubuntu-latest]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Java
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java_version }}
-        distribution: 'zulu'
-    - name: Maven cache
-      uses: actions/cache@v3
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: Maven version
-      run: mvn --version
-#    - name: Maven single test
-#      run: mvn --batch-mode clean verify -Dtest="io.ebeaninternal.server.core.DefaultServer_getReferenceTest" -DfailIfNoTests=false
-    - name: Build with Maven
-      run: mvn -T 8 clean test
-
@@ -1,38 +0,0 @@
-
-name: DB2 LUW
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '10 8 * * 2,5'
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11]
-        os: [ubuntu-latest]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Java
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java_version }}
-        distribution: 'adopt'
-    - name: Maven cache
-      uses: actions/cache@v3
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: db2
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-db2.properties
@@ -1,41 +0,0 @@
-
-name: H2Database
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '10 1 * * *'
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11]
-        os: [ubuntu-latest]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Java
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java_version }}
-        distribution: 'zulu'
-    - name: Maven cache
-      uses: actions/cache@v3
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: Maven version
-      run: mvn --version
-    - name: H2Database
-      run: mvn -T 8 clean package
-
@@ -1,41 +0,0 @@
-
-name: ebean EA
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '39 6 * * 1,3,5'
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [GA,EA]
-        os: [ubuntu-latest]
-
-    steps:
-    - 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@v3
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: Maven version
-      run: mvn --version
-    - name: Build with Maven
-      run: mvn -T 8 test
-
@@ -1,38 +0,0 @@
-
-name: MariaDB
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '10 7 * * 1,4'
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11]
-        os: [ubuntu-latest]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Java
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java_version }}
-        distribution: 'adopt'
-    - name: Maven cache
-      uses: actions/cache@v3
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: mariadb 10.6
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-mariadb.properties
@@ -1,51 +0,0 @@
-
-name: Multi-database platform
-
-on: [workflow_dispatch]
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11]
-        os: [ubuntu-latest]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Java
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java_version }}
-        distribution: 'adopt'
-    - name: Maven cache
-      uses: actions/cache@v3
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: h2database
-      run: mvn clean test
-    - name: postgres
-      run: mvn clean test -Dprops.file=testconfig/ebean-postgres.properties
-    - name: mysql
-      run: mvn clean test -Dprops.file=testconfig/ebean-mysql.properties
-    - name: mariadb
-      run: mvn clean test -Dprops.file=testconfig/ebean-mariadb.properties
-    - name: yugabyte
-      run: mvn clean test -Dprops.file=testconfig/ebean-yugabyte.properties
-    - name: sqlserver
-      run: mvn clean test -Dprops.file=testconfig/ebean-sqlserver17.properties
-#    - name: sqlserver19
-#      run: mvn clean test -Dprops.file=testconfig/ebean-sqlserver19.properties
-#    - name: db2
-#      run: mvn clean test -Dprops.file=testconfig/ebean-db2.properties
-#    - name: oracle
-#      run: mvn clean test -Dprops.file=testconfig/ebean-oracle.properties
@@ -1,41 +0,0 @@
-
-name: Multi-JDK Build
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '30 6 * * *'
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11, 17, 21]
-        os: [ubuntu-latest]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Java
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java_version }}
-        distribution: 'zulu'
-    - name: Maven cache
-      uses: actions/cache@v3
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: Maven version
-      run: mvn --version
-    - name: Build with Maven
-      run: mvn package
-
@@ -1,38 +0,0 @@
-
-name: MySql
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '20 6 * * *'
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11]
-        os: [ubuntu-latest]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Java
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java_version }}
-        distribution: 'adopt'
-    - name: Maven cache
-      uses: actions/cache@v3
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: mysql
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-mysql.properties
@@ -1,38 +0,0 @@
-
-name: Oracle
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '10 6 * * 1,4'
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11]
-        os: [ubuntu-latest]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Java
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java_version }}
-        distribution: 'zulu'
-    - name: Maven cache
-      uses: actions/cache@v3
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: oracle
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-oracle.properties
@@ -1,38 +0,0 @@
-
-name: Postgres
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '10 6 * * *'
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11]
-        os: [ubuntu-latest]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Java
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java_version }}
-        distribution: 'adopt'
-    - name: Maven cache
-      uses: actions/cache@v3
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: postgres
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-postgres.properties
@@ -1,35 +0,0 @@
-
-name: SqlServer 2019
-
-on: [workflow_dispatch]
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11]
-        os: [ubuntu-latest]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Java
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java_version }}
-        distribution: 'adopt'
-    - name: Maven cache
-      uses: actions/cache@v3
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: sqlserver 2019 latest
-      run: mvn clean test -Dprops.file=testconfig/ebean-sqlserver19.properties
@@ -1,38 +0,0 @@
-
-name: SqlServer
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '10 7 * * 2,5'
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11]
-        os: [ubuntu-latest]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Java
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java_version }}
-        distribution: 'adopt'
-    - name: Maven cache
-      uses: actions/cache@v3
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: sqlserver 2017
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-sqlserver17.properties
@@ -1,38 +0,0 @@
-
-name: Yugabyte
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '10 3 * * *'
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        java_version: [11]
-        os: [ubuntu-latest]
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Java
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java_version }}
-        distribution: 'adopt'
-    - name: Maven cache
-      uses: actions/cache@v3
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: yugabyte
-      run: mvn clean test -Dprops.file=testconfig/ebean-yugabyte.properties
@@ -1,4 +1,6 @@
 *.autofetch
+*create-all.sql
+*drop-all.sql
 *.orig
 .classpath
 .project
@@ -10,12 +12,12 @@ ebean-autotune.xml
 ebean-profiling*.xml
 /db
 /mydb.db
+!src/test/ddl-review/*.sql
 profiling/
-.DS_Store

 # Intellij project files
 *.iml
 *.ipr
 *.iws
 .idea/
-*uuid.state
+*uuid.state
@@ -34,7 +34,7 @@ env:
 install: true

 script:
-  - mvn -T 1C clean test
+  - mvn clean test

 after_failure:
  - ./.travis/print_surefire_reports
@@ -7,11 +7,4 @@ do
    echo ${file}
    cat ${file}
    echo
-done
-
-for file in ebean-autotune/target/surefire-reports/*.txt
-do
-    echo ${file}
-    cat ${file}
-    echo
-done
+done
@@ -4,13 +4,13 @@ Overview of ebean.properties file

 ### DbMigration options

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

 `ebean.autostart`
 Should the server start all
@@ -292,6 +293,6 @@ ebean.tenant.schemaProvider
 ebean.updateAllPropertiesInBatch
 ebean.updateChangesOnly
 ebean.updatesDeleteMissingChildren
-ebean.useValidationNotNull
+ebean.useJavaxValidationNotNull
 ebean.useJtaTransactionManager

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2012 Authors
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
@@ -0,0 +1,15 @@
+EbeanORM
+
+Copyright 2012 Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
@@ -1,55 +1,6 @@
-
-[![Build](https://github.com/ebean-orm/ebean/actions/workflows/build.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/build.yml)
+[![Build Status](https://travis-ci.org/ebean-orm/ebean.svg?branch=master)](https://travis-ci.org/ebean-orm/ebean)
 [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean)
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/ebean-orm/ebean/blob/master/LICENSE)
-[![Multi-JDK Build](https://github.com/ebean-orm/ebean/actions/workflows/multi-jdk-build.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/multi-jdk-build.yml)

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

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

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

-## Maven central
-[Maven central - g:io.ebean](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.ebean%22%20)

-## Building Ebean from source
+## Maven cental links:
+[Maven central - ebean](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.ebean%22%20AND%20a%3A%22ebean%22 "maven central ebean")

- JDK 11 or higher installed
- Maven installed
- `git clone git@github.com:ebean-orm/ebean.git`
- `mvn clean install`
+[Maven central - all related projects](http://search.maven.org/#search%7Cga%7C1%7Cebean "maven central all related projects")

-Ebean 13 uses Java modules with module-info. This means that there are stricter compilation
-rules in place now than when building with classpath pre version 13.
-
-For Maven Surefire testing we use `<surefire.useModulePath>false</surefire.useModulePath>` such
-that tests run using classpath and not module-path. We are doing this until all the tooling
-(Maven, IDE) improves in the area of testing with module-info.
-
-#### Eclipse IDE
-
-Right now we can't use Eclipse IDE to build Ebean and run its tests due to its poor support
-for java modules. See [ebean/issues/2653](https://github.com/ebean-orm/ebean/issues/2653)
-
-The current recommendation is to use IntelliJ IDEA as the IDE to build and hack Ebean.
-
-
-#### IntelliJ IDEA
-
-We want to get IntelliJ to run tests using classpath similar to Maven Surefire. To do this set:
-`JUnit -> modify options -> Do not use module-path option`
-
-To set this option as the global default for IntelliJ use:
-
-`Run - Edit Configurations -> Edit configuration templates -> JUnit -> modify options - Do not use module-path option`
-
-
-end
+## Other versions
+* [![Maven Central : ebean-agent](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-agent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-agent) - ebean-agent
+* [![Maven Central : ebean-maven-plugin](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-maven-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-maven-plugin) - ebean-maven-plugin
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-clickhouse</name>
-  <description>ebean-clickhouse composite</description>
-  <artifactId>ebean-clickhouse</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.clickhouse.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.clickhouse {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.clickhouse;
-
-}
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-cockroach</name>
-  <description>ebean-cockroach composite</description>
-  <artifactId>ebean-cockroach</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.cockroach.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.cockroach {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.postgres;
-
-}
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-db2</name>
-  <description>ebean-db2 composite</description>
-  <artifactId>ebean-db2</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-db2</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.db2.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.db2 {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.db2;
-
-}
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-h2</name>
-  <description>ebean-h2 composite</description>
-  <artifactId>ebean-h2</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.h2.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.h2 {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.h2;
-
-}
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-hana</name>
-  <description>ebean-hana composite</description>
-  <artifactId>ebean-hana</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-hana</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.hana.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.hana {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.hana;
-
-}
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-mariadb</name>
-  <description>ebean-mariadb composite</description>
-  <artifactId>ebean-mariadb</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.mariadb.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.mariadb {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.mariadb;
-
-}
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-mysql</name>
-  <description>ebean-mysql composite</description>
-  <artifactId>ebean-mysql</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.mysql.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.mysql {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.mysql;
-
-}
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-nuodb</name>
-  <description>ebean-nuodb composite</description>
-  <artifactId>ebean-nuodb</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.nuodb.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.nuodb {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.nuodb;
-
-}
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-oracle</name>
-  <description>ebean-oracle composite</description>
-  <artifactId>ebean-oracle</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.oracle.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.oracle {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.oracle;
-
-}
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-postgis</name>
-  <description>ebean-postgis composite</description>
-  <artifactId>ebean-postgis</artifactId>
-
-  <properties>
-    <postgis.jdbc.version>2.5.1</postgis.jdbc.version>
-    <postgres.jdbc.version>42.7.2</postgres.jdbc.version>
-  </properties>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-postgis-types</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <version>${postgres.jdbc.version}</version>
-      <exclusions>
-        <!-- exclude unnecessary checker framework -->
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>net.postgis</groupId>
-      <artifactId>postgis-jdbc</artifactId>
-      <version>${postgis.jdbc.version}</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.postgis.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,10 +0,0 @@
-module io.ebean.postgis {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.postgres;
-  // requires transitive io.ebean.postgis.types;
-
-}
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-postgres</name>
-  <description>ebean-postgres composite</description>
-  <artifactId>ebean-postgres</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.postgres.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.postgres {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.postgres;
-
-}
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-sqlite</name>
-  <description>ebean-sqlite composite</description>
-  <artifactId>ebean-sqlite</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.sqlite.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.sqlite {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.sqlite;
-
-}
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-sqlserver</name>
-  <description>ebean-sqlserver composite</description>
-  <artifactId>ebean-sqlserver</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.sqlserver.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.sqlserver {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.sqlserver;
-
-}
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-yugabyte</name>
-  <description>ebean-yugabyte composite</description>
-  <artifactId>ebean-yugabyte</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.yugabyte.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.yugabyte {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.postgres;
-
-}
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean (all platforms)</name>
-  <description>composite of common runtime dependencies for all platforms</description>
-  <artifactId>ebean</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-joda-time</artifactId>
-      <version>14.0.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>14.0.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-all</artifactId>
-      <version>14.0.2</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.assembly;
-
-/**
- * Nothing interesting here - look at ebean-api.
- */
-public class Assembly {
-}
@@ -1,8 +0,0 @@
-module io.ebean {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.all;
-}
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-  </parent>
-
-  <artifactId>composites</artifactId>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>ebean</module>
-    <module>ebean-clickhouse</module>
-    <module>ebean-cockroach</module>
-    <module>ebean-db2</module>
-    <module>ebean-h2</module>
-    <module>ebean-hana</module>
-<!--    <module>hsqldb</module>-->
-    <module>ebean-mariadb</module>
-    <module>ebean-mysql</module>
-    <module>ebean-nuodb</module>
-    <module>ebean-oracle</module>
-    <module>ebean-postgres</module>
-    <module>ebean-postgis</module>
-<!--    <module>sqlanywhere</module>-->
-    <module>ebean-sqlite</module>
-    <module>ebean-sqlserver</module>
-    <module>ebean-yugabyte</module>
-  </modules>
-
-</project>
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
-  </parent>
-
-  <name>ebean api</name>
-  <description>ebean api</description>
-  <artifactId>ebean-api</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-applog</artifactId>
-      <version>1.0</version>
-    </dependency>
-
-    <!-- exclude avaje-applog-slf4j to direct logging to something else -->
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-applog-slf4j</artifactId>
-      <version>1.0</version>
-    </dependency>
-
-    <!--
-    Class retention Nonnull and Nullable annotations
-    to assist with IDE auto-completion with Ebean API
-    -->
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-lang</artifactId>
-      <version>1.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-config</artifactId>
-      <version>3.12</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>jakarta-persistence-api</artifactId>
-      <version>${ebean-persistence-api.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-annotation</artifactId>
-      <version>${ebean-annotation.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-types</artifactId>
-      <version>${ebean-types.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource-api</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <!-- Support MdcBackgroundExecutorWrapper -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.36</version>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- Jackson core used internally by Ebean -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- provided scope for JsonNode support -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- JAVAX-DEPENDENCY-START ___
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <optional>true</optional>
-    </dependency>
-    ____ JAVAX-DEPENDENCY-END -->
-    <!-- JAKARTA-DEPENDENCY-START -->
-    <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
-      <version>6.0.0</version>
-      <optional>true</optional>
-    </dependency>
-    <!-- JAKARTA-DEPENDENCY-END -->
-
-  </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>**/ebean-maven-version.txt</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>false</filtering>
-        <excludes>
-          <exclude>**/ebean-maven-version.txt</exclude>
-        </excludes>
-      </resource>
-    </resources>
-  </build>
-
-</project>
@@ -1,92 +0,0 @@
-package io.ebean;
-
-import io.avaje.lang.NonNullApi;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Background executor service for executing of tasks asynchronously.
- * <p>
- * This service can be used to execute tasks in the background.
- * <p>
- * This service is managed by Ebean and will perform a clean shutdown
- * waiting for background tasks to complete with a default 30 second
- * timeout. Shutdown occurs prior to DataSource shutdown.
- * <p>
- * This also propagates MDC context from the current thread to the
- * background task if defined.
- */
-@NonNullApi
-public interface BackgroundExecutor {
-
-  /**
-   * Execute a callable task in the background returning the Future.
-   */
-  <T> Future<T> submit(Callable<T> task);
-
-  /**
-   * Execute a runnable task in the background returning the Future.
-   */
-  Future<?> submit(Runnable task);
-
-  /**
-   * Execute a task in the background. Effectively the same as
-   * {@link BackgroundExecutor#submit(Runnable)} but returns void.
-   */
-  void execute(Runnable task);
-
-  /**
-   * Execute a task periodically with a given delay.
-   *
-   * @param task         the task to execute
-   * @param initialDelay the time to delay first execution
-   * @param delay        the delay between the termination of one
-   *                     execution and the commencement of the next
-   * @param unit         the time unit of the initialDelay and delay parameters
-   * @return a ScheduledFuture representing pending completion of
-   * the series of repeated tasks.  The future's {@link
-   * Future#get() get()} method will never return normally,
-   * and will throw an exception upon task cancellation or
-   * abnormal termination of a task execution.
-   */
-  ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, long initialDelay, long delay, TimeUnit unit);
-
-  /**
-   * Execute a task periodically with a given period.
-   *
-   * <p>If any execution of this task takes longer than its period, then
-   * subsequent executions may start late, but will not concurrently
-   * execute.
-   *
-   * @param task         the task to execute
-   * @param initialDelay the time to delay first execution
-   * @param period       the period between successive executions
-   * @param unit         the time unit of the initialDelay and period parameters
-   * @return a ScheduledFuture representing pending completion of
-   * the series of repeated tasks.  The future's {@link
-   * Future#get() get()} method will never return normally,
-   * and will throw an exception upon task cancellation or
-   * abnormal termination of a task execution.
-   */
-  ScheduledFuture<?> scheduleAtFixedRate(Runnable task, long initialDelay, long period, TimeUnit unit);
-
-  /**
-   * Schedules a Runnable for one-shot action that becomes enabled after the given delay.
-   *
-   * @return a ScheduledFuture representing pending completion of the task and
-   * whose get() method will return null upon completion
-   */
-  ScheduledFuture<?> schedule(Runnable task, long delay, TimeUnit unit);
-
-  /**
-   * Schedules a Callable for one-shot action that becomes enabled after the given delay.
-   *
-   * @return a ScheduledFuture that can be used to extract result or cancel
-   */
-  <V> ScheduledFuture<V> schedule(Callable<V> task, long delay, TimeUnit unit);
-
-}
@@ -1,19 +0,0 @@
-package io.ebean;
-
-/**
- * Defines a cancelable query.
- * <p>
- * Typically holds a representation of the PreparedStatement to perform the
- * actual cancel.
- * </p>
- */
-public interface CancelableQuery {
-
-  /**
-   * Cancel the query.
-   * <p>
-   * For JDBC this translates to calling cancel on the PreparedStatement.
-   * </p>
-   */
-  void cancel();
-}
@@ -1,49 +0,0 @@
-package io.ebean;
-
-import io.ebean.service.SpiInTuples;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Default implementation of SpiInTuples.
- */
-final class DInTuples implements SpiInTuples {
-
-  private final String[] properties;
-  private final int propertyCount;
-  private final List<Object[]> entries = new ArrayList<>();
-
-
-  DInTuples(String[] properties) {
-    this.properties = properties;
-    this.propertyCount = properties.length;
-  }
-
-  @Override
-  public InTuples add(Object... values) {
-    if (values.length != propertyCount) {
-      throw new IllegalArgumentException("Require " + propertyCount + " values but got " + values.length);
-    }
-    entries.add(values);
-    return this;
-  }
-
-  /**
-   * Return the first property name.
-   */
-  @Override
-  public String[] properties() {
-    return properties;
-  }
-
-  /**
-   * Return all the value pairs.
-   */
-  @Override
-  public List<Object[]> entries() {
-    return Collections.unmodifiableList(entries);
-  }
-
-}
@@ -1,104 +0,0 @@
-package io.ebean;
-
-final class DInsertOptionsBuilder implements InsertOptions.Builder {
-
-  private Boolean getGeneratedKeys;
-  private boolean onConflictUpdate;
-  private boolean onConflictNothing;
-  private String constraint;
-  private String uniqueColumns;
-  private String updateSet;
-
-  @Override
-  public InsertOptions.Builder onConflictNothing() {
-    this.onConflictNothing = true;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder onConflictUpdate() {
-    this.onConflictUpdate = true;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder constraint(String constraint) {
-    this.constraint = constraint;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder uniqueColumns(String uniqueColumns) {
-    this.uniqueColumns = uniqueColumns;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder updateSet(String updateSet) {
-    this.updateSet = updateSet;
-    return this;
-  }
-
-  @Override
-  public InsertOptions.Builder getGeneratedKeys(boolean getGeneratedKeys) {
-    this.getGeneratedKeys = getGeneratedKeys;
-    return this;
-  }
-
-  @Override
-  public InsertOptions build() {
-    return new Options(constraint, uniqueColumns, updateSet, onConflictUpdate, onConflictNothing, getGeneratedKeys);
-  }
-
-  static final class Options implements InsertOptions {
-
-    private static final String UPDATE = "U";
-    private static final String NOTHING = "N";
-    private static final String NORMAL = "_";
-    private final String key;
-    private final Boolean getGeneratedKeys;
-    private final String constraint;
-    private final String uniqueColumns;
-    private final String updateSet;
-
-    Options(String constraint, String uniqueColumns, String updateSet, boolean onConflictUpdate, boolean onConflictNothing, Boolean getGeneratedKeys) {
-      this.constraint = constraint;
-      this.uniqueColumns = uniqueColumns;
-      this.updateSet = updateSet;
-      this.getGeneratedKeys = getGeneratedKeys;
-      this.key = (onConflictUpdate ? UPDATE : onConflictNothing ? NOTHING : NORMAL)
-        + '+' + plus(constraint)
-        + '+' + plus(uniqueColumns)
-        + '+' + plus(updateSet);
-    }
-
-    private String plus(String val) {
-      return val == null ? "" : val;
-    }
-
-    @Override
-    public String key() {
-      return key;
-    }
-
-    @Override
-    public String constraint() {
-      return constraint;
-    }
-
-    @Override
-    public String uniqueColumns() {
-      return uniqueColumns;
-    }
-
-    @Override
-    public String updateSet() {
-      return updateSet;
-    }
-
-    @Override
-    public Boolean getGetGeneratedKeys() {
-      return getGeneratedKeys;
-    }
-  }
-}
@@ -1,24 +0,0 @@
-package io.ebean;
-
-import jakarta.persistence.PersistenceException;
-
-/**
- * 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;
-
-  /**
-   * Create with a message and cause.
-   */
-  public DataIntegrityException(String message, Throwable cause) {
-    super(message, cause);
-  }
-
-  /**
-   * Create with message only.
-   */
-  public DataIntegrityException(String message) {
-    super(message);
-  }
-}
@@ -1,166 +0,0 @@
-package io.ebean;
-
-import io.ebean.config.ContainerConfig;
-import io.ebean.service.SpiContainer;
-import io.ebean.service.SpiContainerFactory;
-import jakarta.persistence.PersistenceException;
-
-import java.util.Iterator;
-import java.util.ServiceLoader;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * Creates Database instances.
- * <p>
- * This uses either DatabaseConfig or properties in the application.properties file to
- * configure and create a Database instance.
- * <p>
- * The Database instance can either be registered with the DB singleton or
- * not. The DB singleton effectively holds a map of Database by a name.
- * If the Database is registered with the DB singleton you can retrieve it
- * later via {@link DB#byName(String)}.
- * <p>
- * One Database can be nominated as the 'default/primary' Database. Many
- * methods on the DB singleton such as {@link DB#find(Class)} are just a
- * convenient way of using the 'default/primary' Database.
- */
-public final class DatabaseFactory {
-
-  private static final ReentrantLock lock = new ReentrantLock();
-  private static SpiContainer container;
-  private static String defaultServerName;
-
-  static {
-    EbeanVersion.getVersion();
-  }
-
-  /**
-   * Initialise the container with clustering configuration.
-   * <p>
-   * Call this prior to creating any Database instances or alternatively set the
-   * ContainerConfig on the DatabaseConfig when creating the first Database instance.
-   */
-  public static void initialiseContainer(ContainerConfig containerConfig) {
-    lock.lock();
-    try {
-      container(containerConfig);
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Create using properties to configure the database.
-   */
-  public static Database create(String name) {
-    lock.lock();
-    try {
-      return container(null).createServer(name);
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Create using the DatabaseConfig object to configure the database.
-   *
-   * <pre>{@code
-   *
-   *   DatabaseConfig config = new DatabaseConfig();
-   *   config.setName("db");
-   *   config.loadProperties();
-   *
-   *   Database database = DatabaseFactory.create(config);
-   *
-   * }</pre>
-   */
-  public static Database create(DatabaseBuilder builder) {
-    lock.lock();
-    try {
-      var config = builder.settings();
-      if (config.getName() == null) {
-        throw new PersistenceException("The name is null (it is required)");
-      }
-      Database server = createInternal(config);
-      if (config.isRegister()) {
-        if (config.isDefaultServer()) {
-          if (defaultServerName != null && !defaultServerName.equals(config.getName())) {
-            throw new IllegalStateException("Registering [" + config.getName() + "] as the default server but [" + defaultServerName + "] is already registered as the default");
-          }
-          defaultServerName = config.getName();
-        }
-        DbPrimary.setSkip(true);
-        DbContext.getInstance().register(server, config.isDefaultServer());
-      }
-      return server;
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Create using the DatabaseConfig additionally specifying a classLoader to use as the context class loader.
-   */
-  public static Database createWithContextClassLoader(DatabaseBuilder config, ClassLoader classLoader) {
-    lock.lock();
-    try {
-      ClassLoader currentContextLoader = Thread.currentThread().getContextClassLoader();
-      Thread.currentThread().setContextClassLoader(classLoader);
-      try {
-        return DatabaseFactory.create(config);
-      } finally {
-        // set the currentContextLoader back
-        Thread.currentThread().setContextClassLoader(currentContextLoader);
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Shutdown gracefully all Database instances cleaning up any resources as required.
-   * <p>
-   * This is typically invoked via JVM shutdown hook and not explicitly called.
-   */
-  public static void shutdown() {
-    lock.lock();
-    try {
-      container.shutdown();
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  private static Database createInternal(DatabaseBuilder.Settings config) {
-    return container(config.getContainerConfig()).createServer(config);
-  }
-
-  /**
-   * Return the SpiContainer initialising it if necessary.
-   *
-   * @param containerConfig the configuration controlling clustering communication
-   */
-  private static SpiContainer container(ContainerConfig containerConfig) {
-    // thread safe in that all calling methods hold lock
-    if (container != null) {
-      return container;
-    }
-    if (containerConfig == null) {
-      // effectively load configuration from ebean.properties
-      containerConfig = new ContainerConfig();
-    }
-    container = createContainer(containerConfig);
-    return container;
-  }
-
-  /**
-   * Create the container instance using the configuration.
-   */
-  private static SpiContainer createContainer(ContainerConfig containerConfig) {
-    Iterator<SpiContainerFactory> factories = ServiceLoader.load(SpiContainerFactory.class).iterator();
-    if (factories.hasNext()) {
-      return factories.next().create(containerConfig);
-    }
-    throw new IllegalStateException("Service loader didn't find a SpiContainerFactory?");
-  }
-}
@@ -1,135 +0,0 @@
-package io.ebean;
-
-import io.ebean.config.BeanNotEnhancedException;
-import io.ebean.datasource.DataSourceConfigurationException;
-
-import jakarta.persistence.PersistenceException;
-import java.util.HashMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReentrantLock;
-
-import static java.lang.System.Logger.Level.ERROR;
-
-/**
- * Holds Database instances.
- */
-final class DbContext {
-
-  private static final System.Logger log = EbeanVersion.log;
-  static {
-    EbeanVersion.getVersion();
-  }
-
-  private static final DbContext INSTANCE = new DbContext();
-
-  private final ConcurrentHashMap<String, Database> concMap = new ConcurrentHashMap<>();
-  private final HashMap<String, Database> syncMap = new HashMap<>();
-  private final ReentrantLock lock = new ReentrantLock();
-
-  private Database defaultDatabase;
-
-  private DbContext() {
-    try {
-      if (!DbPrimary.isSkip()) {
-        // look to see if there is a default server defined
-        String defaultName = DbPrimary.getDefaultServerName();
-        if (defaultName != null && !defaultName.trim().isEmpty()) {
-          defaultDatabase = getWithCreate(defaultName.trim());
-        }
-      }
-    } catch (BeanNotEnhancedException e) {
-      String msg = "Bean is not enhanced? See https://ebean.io/docs/trouble-shooting#not-enhanced";
-      log.log(ERROR, msg, e);
-      throw e;
-
-    } catch (DataSourceConfigurationException e) {
-      String msg = "Configuration error creating DataSource for the default Database." +
-        " This typically means a missing application-test.yaml or missing ebean-test dependency." +
-        " See https://ebean.io/docs/trouble-shooting#datasource";
-      log.log(ERROR, msg, e);
-      throw new DataSourceConfigurationException(msg, e);
-
-    } catch (Throwable e) {
-      log.log(ERROR, "Error trying to create the default Database", e);
-      throw new RuntimeException(e);
-    }
-  }
-
-  /**
-   * Return the shared singleton instance.
-   */
-  static DbContext getInstance() {
-    return INSTANCE;
-  }
-
-  /**
-   * Return the default database.
-   */
-  Database getDefault() {
-    if (defaultDatabase == null) {
-      String msg = "The default Database has not been defined?"
-        + " This is normally set via the ebean.datasource.default property."
-        + " Otherwise it should be registered programmatically via registerServer()";
-      throw new PersistenceException(msg);
-    }
-    return defaultDatabase;
-  }
-
-  /**
-   * Return the database by name.
-   */
-  Database get(String name) {
-    if (name == null || name.isEmpty()) {
-      return defaultDatabase;
-    }
-    Database server = concMap.get(name);
-    if (server != null) {
-      return server;
-    }
-    return getWithCreate(name);
-  }
-
-  /**
-   * Read, create and put of Databases.
-   */
-  private Database getWithCreate(String name) {
-    lock.lock();
-    try {
-      Database server = syncMap.get(name);
-      if (server == null) {
-        // register when creating server this way
-        server = DatabaseFactory.create(name);
-        register(server, false);
-      }
-      return server;
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Register a server so we can get it by its name.
-   */
-  void register(Database server, boolean isDefault) {
-    registerWithName(server.name(), server, isDefault);
-  }
-
-  private void registerWithName(String name, Database server, boolean isDefault) {
-    lock.lock();
-    try {
-      concMap.put(name, server);
-      syncMap.put(name, server);
-      if (isDefault) {
-        defaultDatabase = server;
-      }
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  Database mock(String name, Database server, boolean defaultServer) {
-    Database originalPrimaryServer = this.defaultDatabase;
-    registerWithName(name, server, defaultServer);
-    return originalPrimaryServer;
-  }
-}
@@ -1,83 +0,0 @@
-package io.ebean;
-
-import io.avaje.config.Config;
-
-import java.util.Properties;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * Provides singleton state for the default database.
- * <p/>
- * Intended for internal use as part of bootup, construction, registration of the default database.
- */
-final class DbPrimary {
-
-  private static final ReentrantLock lock = new ReentrantLock();
-  private static String defaultServerName;
-  private static boolean skip;
-
-  /**
-   * Set whether to skip automatically creating the primary database.
-   */
-  static void setSkip(boolean skip) {
-    lock.lock();
-    try {
-      DbPrimary.skip = skip;
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Return true to skip automatically creating the primary database.
-   */
-  static boolean isSkip() {
-    lock.lock();
-    try {
-      return skip;
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Return the default database name.
-   */
-  static String getDefaultServerName() {
-    lock.lock();
-    try {
-      if (defaultServerName == null) {
-        defaultServerName = determineDefaultServerName();
-      }
-      return defaultServerName;
-    } finally {
-      lock.unlock();
-    }
-  }
-
-  /**
-   * Determine and return the default server name checking system environment variables and then global properties.
-   */
-  private static String determineDefaultServerName() {
-    String defaultServerName = System.getenv("EBEAN_DB");
-    defaultServerName = System.getProperty("db", defaultServerName);
-    defaultServerName = System.getProperty("ebean_db", defaultServerName);
-    if (isEmpty(defaultServerName)) {
-      defaultServerName = Config.getOptional("datasource.default").orElse(null);
-      if (isEmpty(defaultServerName)) {
-        defaultServerName = Config.getOptional("ebean.default.datasource").orElse(null);
-      }
-    }
-    if (defaultServerName == null) {
-      defaultServerName = "db";
-    }
-    return defaultServerName;
-  }
-
-  /**
-   * Return true if the string is null or empty.
-   */
-  private static boolean isEmpty(String value) {
-    return value == null || value.trim().isEmpty();
-  }
-}
@@ -1,227 +0,0 @@
-package io.ebean;
-
-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-/**
- * Query for performing native SQL queries that return DTO Bean's.
- * <p>
- * These beans are just normal classes. They must have public constructors
- * and setters.
- * <p>
- * Constructors with arguments are used if the number of constructor arguments
- * matches the number of columns in the resultSet.
- * </p>
- * <p>
- * If the number of columns in the resultSet is greater than the largest constructor
- * then the largest constructor is used for the first columns and remaining columns
- * are mapped by setter methods.
- * </p>
- *
- * <pre>{@code
- *
- *   // CustomerDto is just a 'bean like' class
- *   // with public constructor(s) and public setter methods
- *
- *   String sql = "select id, name from customer where name like :name and status_code = :status";
- *
- *   List<CustomerDto> beans =
- *     DB.findDto(CustomerDto.class, sql)
- *     .setParameter("name", "Acme%")
- *     .setParameter("status", "ACTIVE")
- *     .findList();
- *
- * }</pre>
- */
-@NonNullApi
-public interface DtoQuery<T> extends CancelableQuery {
-
-  /**
-   * Execute the query returning a list.
-   */
-  List<T> findList();
-
-  /**
-   * Execute the query iterating a row at a time.
-   * <p>
-   * Note that the QueryIterator holds resources related to the underlying
-   * resultSet and potentially connection and MUST be closed. We should use
-   * QueryIterator in a <em>try with resource block</em>.
-   */
-  QueryIterator<T> findIterate();
-
-  /**
-   * Execute the query returning a Stream.
-   * <p>
-   * Note that the Stream holds resources related to the underlying
-   * resultSet and potentially connection and MUST be closed. We should use
-   * the Stream in a <em>try with resource block</em>.
-   */
-  Stream<T> findStream();
-
-  /**
-   * Execute the query iterating a row at a time.
-   * <p>
-   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
-   * </p>
-   */
-  void findEach(Consumer<T> consumer);
-
-  /**
-   * Execute the query iterating the results and batching them for the consumer.
-   * <p>
-   * This runs like findEach streaming results from the database but just collects the results
-   * into batches to pass to the consumer.
-   *
-   * @param batch    The number of dto beans to collect before given them to the consumer
-   * @param consumer The consumer to process the batch of DTO beans
-   */
-  void findEach(int batch, Consumer<List<T>> consumer);
-
-  /**
-   * Execute the query iterating a row at a time with the ability to stop consuming part way through.
-   * <p>
-   * Returning false after processing a row stops the iteration through the query results.
-   * </p>
-   * <p>
-   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
-   * </p>
-   */
-  void findEachWhile(Predicate<T> consumer);
-
-  /**
-   * Execute the query returning a single bean.
-   */
-  @Nullable
-  T findOne();
-
-  /**
-   * Execute the query returning an optional bean.
-   */
-  Optional<T> findOneOrEmpty();
-
-  /**
-   * Bind all the parameters using index positions.
-   * <p>
-   * Binds each parameter moving the index position each time.
-   * <p>
-   * A convenience for multiple calls to {@link #setParameter(Object)}
-   */
-  DtoQuery<T> setParameters(Object... value);
-
-  /**
-   * Bind the next parameter using index position.
-   * <p>
-   * Bind the parameter using index position starting at 1 and incrementing.
-   * <p>
-   */
-  DtoQuery<T> setParameter(Object value);
-
-  /**
-   * Bind the named parameter.
-   */
-  DtoQuery<T> setParameter(String name, Object value);
-
-  /**
-   * Bind the named parameter to SQL NULL.
-   */
-  DtoQuery<T> setNullParameter(String name, int jdbcType);
-
-  /**
-   * Bind the named multi-value array parameter which we would use with Postgres ANY.
-   * <p>
-   * For Postgres this binds an ARRAY rather than expands into multiple bind values.
-   */
-  DtoQuery<T> setArrayParameter(String name, Collection<?> values);
-
-  /**
-   * Bind the parameter by its index position (1 based like JDBC).
-   */
-  DtoQuery<T> setParameter(int position, Object value);
-
-  /**
-   * Set a positioned parameter to SQL NULL.
-   */
-  DtoQuery<T> setNullParameter(int position, int jdbcType);
-
-  /**
-   * Set the index of the first row of the results to return.
-   */
-  DtoQuery<T> setFirstRow(int firstRow);
-
-  /**
-   * Set the maximum number of query results to return.
-   */
-  DtoQuery<T> setMaxRows(int maxRows);
-
-  /**
-   * When resultSet columns are not able to be mapped to a bean property then instead of
-   * throwing effectively skip reading that column.
-   */
-  DtoQuery<T> setRelaxedMode();
-
-  /**
-   * Set a label on the query to make it easier to identify queries related to query execution statistics.
-   *
-   * @param label A label that is unique to the DTO bean type.
-   */
-  DtoQuery<T> setLabel(String label);
-
-  /**
-   * Set the profile location of this query. This is used to relate query execution metrics
-   * back to a location like a specific line of code.
-   */
-  DtoQuery<T> setProfileLocation(ProfileLocation profileLocation);
-
-  /**
-   * Set a timeout on this query.
-   * <p>
-   * This will typically result in a call to setQueryTimeout() on a
-   * preparedStatement. If the timeout occurs an exception will be thrown - this
-   * will be a SQLException wrapped up in a PersistenceException.
-   * </p>
-   *
-   * @param secs the query timeout limit in seconds. Zero means there is no limit.
-   */
-  DtoQuery<T> setTimeout(int secs);
-
-  /**
-   * A hint which for JDBC translates to the Statement.fetchSize().
-   * <p>
-   * Gives the JDBC driver a hint as to the number of rows that should be
-   * fetched from the database when more rows are needed for ResultSet.
-   * </p>
-   */
-  DtoQuery<T> setBufferFetchSizeHint(int bufferFetchSizeHint);
-
-  /**
-   * Use the explicit transaction to execute the query.
-   */
-  DtoQuery<T> usingTransaction(Transaction transaction);
-
-  /**
-   * Execute the query using the given connection.
-   */
-  DtoQuery<T> usingConnection(Connection connection);
-
-  /**
-   * Ensure that the master DataSource is used if there is a read only data source
-   * being used (that is using a read replica database potentially with replication lag).
-   * <p>
-   * When the database is configured with a read-only DataSource via
-   * say {@link io.ebean.DatabaseBuilder#readOnlyDataSource(DataSource)} then
-   * by default when a query is run without an active transaction, it uses the read-only data
-   * source. We use {@code usingMaster()} to instead ensure that the query is executed
-   * against the master data source.
-   */
-  DtoQuery<T> usingMaster();
-}
@@ -1,37 +0,0 @@
-package io.ebean;
-
-/**
- * Thrown when a duplicate is attempted on a unique constraint.
- * <p>
- * In terms of catching this exception with the view of continuing processing
- * using the same transaction look to use {@link Transaction#rollbackAndContinue()}.
- *
- * <pre>{@code
- *
- *   try (Transaction txn = database.beginTransaction()) {
- *
- *     try {
- *       ...
- *       database.save(bean);
- *       database.flush();
- *     } catch (DuplicateKeyException e) {
- *       // carry on processing using the transaction
- *       txn.rollbackAndContinue();
- *       ...
- *     }
- *
- *     txn.commit();
- *   }
- *
- * }</pre>
- */
-public class DuplicateKeyException extends DataIntegrityException {
-  private static final long serialVersionUID = -4771932723285724817L;
-
-  /**
-   * Create with a message and cause.
-   */
-  public DuplicateKeyException(String message, Throwable cause) {
-    super(message, cause);
-  }
-}
@@ -1,103 +0,0 @@
-package io.ebean;
-
-import io.avaje.applog.AppLog;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.util.Properties;
-
-import static java.lang.System.Logger.Level.*;
-
-/**
- * Class to determine the ebean version.
- *
- * @author Roland Praml, FOCONIS AG
- */
-public final class EbeanVersion {
-
-  public static final System.Logger log = AppLog.getLogger("io.ebean");
-
-  /**
-   * Maintain the minimum ebean-agent version manually based on required ebean-agent bug fixes.
-   */
-  private static final int MIN_AGENT_MAJOR_VERSION = 12;
-  private static final int MIN_AGENT_MINOR_VERSION = 12;
-  private static String version = "unknown";
-
-  static {
-    readVersion();
-    checkAgentVersion();
-  }
-
-  private static void readVersion() {
-    try {
-      try (InputStream in = ClassLoader.getSystemResourceAsStream("META-INF/ebean-maven-version.txt")) {
-        if (in != null) {
-          try (LineNumberReader reader = new LineNumberReader(new InputStreamReader(in))) {
-            version = reader.readLine();
-            log.log(INFO, "ebean version: {0}", version);
-          }
-        }
-      }
-    } catch (IOException e) {
-      log.log(WARNING, "Could not determine ebean version: {0}", e.getMessage());
-    }
-  }
-
-  private static void checkAgentVersion() {
-    try {
-      try (InputStream in = ClassLoader.getSystemResourceAsStream("META-INF/maven/io.ebean/ebean-agent/pom.properties")) {
-        // often we only have ebean-agent during development (with build time enhancement), null is expected
-        if (in != null) {
-          String agentVersion = readVersion(in);
-          if (agentVersion != null) {
-            if (checkMinAgentVersion(agentVersion)) {
-              log.log(ERROR, "Expected minimum ebean-agent version {0}.{1}.0 but we have {2}, please update the ebean-agent", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, agentVersion);
-            }
-          }
-        }
-      }
-    } catch (IOException e) {
-      log.log(WARNING, "Could not check minimum ebean-agent version {0}.{1}.0 required due to - {2}", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, e.getMessage());
-    }
-  }
-
-  /**
-   * Return true if ebean-agent is NOT at our minimum version.
-   */
-  static boolean checkMinAgentVersion(String agentVersion) {
-    String[] versionSegments = agentVersion.split("\\.");
-    if (versionSegments.length != 3) {
-      return true;
-    } else {
-      int major = Integer.parseInt(versionSegments[0]);
-      int minor = Integer.parseInt(versionSegments[1]);
-      if (major < MIN_AGENT_MAJOR_VERSION) {
-        return true;
-      } else {
-        return major == MIN_AGENT_MAJOR_VERSION && minor < MIN_AGENT_MINOR_VERSION;
-      }
-    }
-  }
-
-  private static String readVersion(InputStream in) throws IOException {
-    Properties prop = new Properties();
-    prop.load(in);
-    in.close();
-    return prop.getProperty("version");
-  }
-
-  private EbeanVersion() {
-    // hide
-  }
-
-  /**
-   * Returns the ebean version (read from META-INF/ebean-maven-version.txt)
-   */
-  public static String getVersion() {
-    return version;
-  }
-
-}
@@ -1,704 +0,0 @@
-package io.ebean;
-
-import io.ebean.search.*;
-
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * Expression factory for creating standard expressions.
- * <p>
- * Creates standard common expressions for using in a Query Where or Having
- * clause.
- * </p>
- * <p>
- * You will often not use this class directly but instead just add expressions
- * via the methods on ExpressionList such as
- * {@link ExpressionList#gt(String, Object)}.
- * </p>
- * <p>
- * The ExpressionList is returned from {@link Query#where()}.
- * </p>
- * <pre>{@code
- * // Example: fetch orders where status equals new or orderDate > lastWeek.
- *
- * Expression newOrLastWeek =
- *     Expr.or(Expr.eq("status", Order.Status.NEW),
- *             Expr.gt("orderDate", lastWeek));
- *
- * List<Order> list = DB.find(Order.class)
- *   .where().add(newOrLastWeek)
- *   .findList();
- * ...
- * }</pre>
- *
- * @see Query#where()
- */
-public interface ExpressionFactory {
-
-  /**
-   * Return a new ExpressionList.
-   */
-  <T> ExpressionList<T> expressionList();
-
-  /**
-   * Path exists - for the given path in a JSON document.
-   */
-  Expression jsonExists(String propertyName, String path);
-
-  /**
-   * Path does not exist - for the given path in a JSON document.
-   */
-  Expression jsonNotExists(String propertyName, String path);
-
-  /**
-   * Equal to - for the given path in a JSON document.
-   */
-  Expression jsonEqualTo(String propertyName, String path, Object val);
-
-  /**
-   * Not Equal to - for the given path in a JSON document.
-   */
-  Expression jsonNotEqualTo(String propertyName, String path, Object val);
-
-  /**
-   * Greater than - for the given path in a JSON document.
-   */
-  Expression jsonGreaterThan(String propertyName, String path, Object val);
-
-  /**
-   * Greater than or equal to - for the given path in a JSON document.
-   */
-  Expression jsonGreaterOrEqual(String propertyName, String path, Object val);
-
-  /**
-   * Less than - for the given path in a JSON document.
-   */
-  Expression jsonLessThan(String propertyName, String path, Object val);
-
-  /**
-   * Less than or equal to - for the given path in a JSON document.
-   */
-  Expression jsonLessOrEqualTo(String propertyName, String path, Object val);
-
-  /**
-   * Between - for the given path in a JSON document.
-   */
-  Expression jsonBetween(String propertyName, String path, Object lowerValue, Object upperValue);
-
-  /**
-   * Array contains all the given values.
-   * <p>
-   * Array support is effectively limited to Postgres at this time.
-   * </p>
-   */
-  Expression arrayContains(String propertyName, Object... values);
-
-  /**
-   * Array does not contain the given values.
-   * <p>
-   * Array support is effectively limited to Postgres at this time.
-   * </p>
-   */
-  Expression arrayNotContains(String propertyName, Object... values);
-
-  /**
-   * Array is empty - for the given array property.
-   * <p>
-   * Array support is effectively limited to Postgres at this time.
-   * </p>
-   */
-  Expression arrayIsEmpty(String propertyName);
-
-  /**
-   * Array is not empty - for the given array property.
-   * <p>
-   * Array support is effectively limited to Postgres at this time.
-   * </p>
-   */
-  Expression arrayIsNotEmpty(String propertyName);
-
-  /**
-   * Equal To the result of a sub-query.
-   */
-  Expression eq(String propertyName, Query<?> subQuery);
-
-  /**
-   * Equal To - property equal to the given value.
-   */
-  Expression eq(String propertyName, Object value);
-
-  /**
-   * Equal To or Null - property equal to the given value or null.
-   */
-  Expression eqOrNull(String propertyName, Object value);
-
-  /**
-   * Not Equal To the result of a sub-query.
-   */
-  Expression ne(String propertyName, Query<?> subQuery);
-
-  /**
-   * Not Equal To - property not equal to the given value.
-   */
-  Expression ne(String propertyName, Object value);
-
-  /**
-   * Case Insensitive Equal To - property equal to the given value (typically
-   * using a lower() function to make it case insensitive).
-   */
-  Expression ieq(String propertyName, String value);
-
-  /**
-   * Case Insensitive Not Equal To - property not equal to the given value (typically
-   * using a lower() function to make it case insensitive).
-   */
-  Expression ine(String propertyName, String value);
-
-  /**
-   * Case Insensitive Equal To that allows for named parameter use.
-   */
-  Expression ieqObject(String propertyName, Object value);
-
-  /**
-   * Case Insensitive Not Equal To that allows for named parameter use.
-   */
-  Expression ineObject(String propertyName, Object value);
-
-  /**
-   * In Range - {@code property >= value1 and property < value2}.
-   * <p>
-   * Unlike Between inRange is "half open" and usually more useful for use with dates or timestamps.
-   * </p>
-   */
-  Expression inRange(String propertyName, Object value1, Object value2);
-
-  /**
-   * Value in Range between 2 properties.
-   *
-   * <pre>{@code
-   *
-   *    .startDate.inRangeWith(endDate, now)
-   *
-   *    // which equates to
-   *    startDate <= now and (endDate > now or endDate is null)
-   *
-   * }</pre>
-   *
-   * <p>
-   * This is a convenience expression combining a number of simple expressions.
-   * The most common use of this could be called "effective dating" where 2 date or
-   * timestamp columns represent the date range in which
-   */
-  Expression inRangeWith(String lowProperty, String highProperty, Object value);
-
-  /**
-   * A Property is in Range between 2 properties.
-   *
-   * <pre>{@code
-   *
-   *    .orderDate.inRangeWith(QOrder.Alias.product.startDate, QOrder.Alias.product.endDate)
-   *
-   *    // which equates to
-   *    product.startDate <= orderDate and (orderDate < product.endDate or product.endDate is null)
-   *
-   * }</pre>
-   *
-   * <p>
-   * This is a convenience expression combining a number of simple expressions.
-   */
-  Expression inRangeWithProperties(String propertyName, String lowProperty, String highProperty);
-
-  /**
-   * Between - property between the two given values.
-   */
-  Expression between(String propertyName, Object value1, Object value2);
-
-  /**
-   * Between - value between two given properties.
-   */
-  Expression betweenProperties(String lowProperty, String highProperty, Object value);
-
-  /**
-   * Greater Than Or Null - property greater than the given value or null.
-   * <p>
-   * A convenient expression combining GT and Is Null.  Most often useful for range
-   * expressions where the top range value is nullable.
-   */
-  Expression gtOrNull(String propertyName, Object value);
-
-  /**
-   * Greater than or Equal to OR Null ({@code >= or null })
-   * <p>
-   * A convenient expression combining GE and Is Null.  Most often useful for range
-   * expressions where the top range value is nullable.
-   */
-  Expression geOrNull(String propertyName, Object value);
-
-  /**
-   * Greater Than the result of a sub-query.
-   */
-  Expression gt(String propertyName, Query<?> subQuery);
-
-  /**
-   * Greater Than - property greater than the given value.
-   */
-  Expression gt(String propertyName, Object value);
-
-  /**
-   * Greater Than or Equal to the result of a sub-query.
-   */
-  Expression ge(String propertyName, Query<?> subQuery);
-
-  /**
-   * Greater Than or Equal to - property greater than or equal to the given
-   * value.
-   */
-  Expression ge(String propertyName, Object value);
-
-  /**
-   * Less Than or Null - property less than the given value or null.
-   * <p>
-   * A convenient expression combining LT and Is Null.  Most often useful for range
-   * expressions where the bottom range value is nullable.
-   */
-  Expression ltOrNull(String propertyName, Object value);
-
-  /**
-   * Less Than or Equal to OR Null ({@code <= or null })
-   * <p>
-   * A convenient expression combining LE and Is Null.  Most often useful for range
-   * expressions where the bottom range value is nullable.
-   */
-  Expression leOrNull(String propertyName, Object value);
-
-  /**
-   * Less Than the result of a sub-query.
-   */
-  Expression lt(String propertyName, Query<?> subQuery);
-
-  /**
-   * Less Than - property less than the given value.
-   */
-  Expression lt(String propertyName, Object value);
-
-  /**
-   * Less Than or Equal to the result of a sub-query.
-   */
-  Expression le(String propertyName, Query<?> subQuery);
-
-  /**
-   * Less Than or Equal to - property less than or equal to the given value.
-   */
-  Expression le(String propertyName, Object value);
-
-  /**
-   * Is Null - property is null.
-   */
-  Expression isNull(String propertyName);
-
-  /**
-   * Is Not Null - property is not null.
-   */
-  Expression isNotNull(String propertyName);
-
-  /**
-   * Case insensitive {@link #exampleLike(Object)}
-   */
-  ExampleExpression iexampleLike(Object example);
-
-  /**
-   * Create the query by Example expression which is case sensitive and using
-   * LikeType.RAW (you need to add you own wildcards % and _).
-   */
-  ExampleExpression exampleLike(Object example);
-
-  /**
-   * Create the query by Example expression specifying more options.
-   */
-  ExampleExpression exampleLike(Object example, boolean caseInsensitive, LikeType likeType);
-
-  /**
-   * Like with support for named parameters.
-   */
-  Expression like(String propertyName, Object value, boolean caseInsensitive, LikeType likeType);
-
-  /**
-   * Like - property like value where the value contains the SQL wild card
-   * characters % (percentage) and _ (underscore).
-   */
-  Expression like(String propertyName, String value);
-
-  /**
-   * Case insensitive Like - property like value where the value contains the
-   * SQL wild card characters % (percentage) and _ (underscore). Typically uses
-   * a lower() function to make the expression case insensitive.
-   */
-  Expression ilike(String propertyName, String value);
-
-  /**
-   * Starts With - property like value%.
-   */
-  Expression startsWith(String propertyName, String value);
-
-  /**
-   * Case insensitive Starts With - property like value%. Typically uses a
-   * lower() function to make the expression case insensitive.
-   */
-  Expression istartsWith(String propertyName, String value);
-
-  /**
-   * Ends With - property like %value.
-   */
-  Expression endsWith(String propertyName, String value);
-
-  /**
-   * Case insensitive Ends With - property like %value. Typically uses a lower()
-   * function to make the expression case insensitive.
-   */
-  Expression iendsWith(String propertyName, String value);
-
-  /**
-   * Contains - property like %value%.
-   */
-  Expression contains(String propertyName, String value);
-
-  /**
-   * Case insensitive Contains - property like %value%. Typically uses a lower()
-   * function to make the expression case insensitive.
-   */
-  Expression icontains(String propertyName, String value);
-
-  /**
-   * In expression using pairs of value objects.
-   */
-  Expression inPairs(Pairs pairs);
-
-  /**
-   * In expression using multiple columns.
-   */
-  Expression inTuples(InTuples pairs);
-
-  /**
-   * In - property has a value in the array of values.
-   */
-  Expression in(String propertyName, Object[] values);
-
-  /**
-   * In - using a subQuery.
-   */
-  Expression in(String propertyName, Query<?> subQuery);
-
-  /**
-   * In - property has a value in the collection of values.
-   */
-  Expression in(String propertyName, Collection<?> values);
-
-  /**
-   * In where null or empty values means that no predicate is added to the query.
-   * <p>
-   * That is, only add the IN predicate if the values are not null or empty.
-   * <p>
-   * Without this we typically need to code an <code>if</code> block to only add
-   * the IN predicate if the collection is not empty like:
-   * </p>
-   *
-   * <h3>Without inOrEmpty()</h3>
-   * <pre>{@code
-   *
-   *   query.where() // add some predicates
-   *     .eq("status", Status.NEW);
-   *
-   *   if (ids != null && !ids.isEmpty()) {
-   *     query.where().in("customer.id", ids);
-   *   }
-   *
-   *   query.findList();
-   *
-   * }</pre>
-   *
-   * <h3>Using inOrEmpty()</h3>
-   * <pre>{@code
-   *
-   *   query.where()
-   *     .eq("status", Status.NEW)
-   *     .inOrEmpty("customer.id", ids)
-   *     .findList();
-   *
-   * }</pre>
-   */
-  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.
-   */
-  Expression notIn(String propertyName, Object[] values);
-
-  /**
-   * Not In - property has a value in the collection of values.
-   */
-  Expression notIn(String propertyName, Collection<?> values);
-
-  /**
-   * Not In - using a subQuery.
-   */
-  Expression notIn(String propertyName, Query<?> subQuery);
-
-  /**
-   * Exists expression
-   */
-  Expression exists(Query<?> subQuery);
-
-  /**
-   * Not exists expression
-   */
-  Expression notExists(Query<?> subQuery);
-
-  /**
-   * Is empty expression for collection properties.
-   */
-  Expression isEmpty(String propertyName);
-
-  /**
-   * Is not empty expression for collection properties.
-   */
-  Expression isNotEmpty(String propertyName);
-
-  /**
-   * Id Equal to - ID property is equal to the value.
-   */
-  Expression idEq(Object value);
-
-  /**
-   * Id IN a list of Id values.
-   */
-  Expression idIn(Object... idValues);
-
-  /**
-   * Id IN a collection of Id values.
-   */
-  Expression idIn(Collection<?> idCollection);
-
-  /**
-   * All Equal - Map containing property names and their values.
-   * <p>
-   * Expression where all the property names in the map are equal to the
-   * corresponding value.
-   * </p>
-   *
-   * @param propertyMap a map keyed by property names.
-   */
-  Expression allEq(Map<String, Object> propertyMap);
-
-  /**
-   * Add expression for ANY of the given bit flags to be set.
-   *
-   * @param propertyName The property that holds the flags value
-   * @param flags        The flags we are looking for
-   */
-  Expression bitwiseAny(String propertyName, long flags);
-
-  /**
-   * Add expression for ALL of the given bit flags to be set.
-   *
-   * @param propertyName The property that holds the flags value
-   * @param flags        The flags we are looking for
-   */
-  Expression bitwiseAll(String propertyName, long flags);
-
-  /**
-   * Add bitwise AND expression of the given bit flags to compare with the match/mask.
-   *
-   * @param propertyName The property that holds the flags value
-   * @param flags        The flags we are looking for
-   */
-  Expression bitwiseAnd(String propertyName, long flags, long match);
-
-  /**
-   * Add raw expression with a single parameter.
-   * <p>
-   * The raw expression should contain a single ? at the location of the
-   * parameter.
-   * </p>
-   */
-  Expression raw(String raw, Object value);
-
-  /**
-   * Add raw expression with an array of parameters.
-   * <p>
-   * The raw expression should contain the same number of ? as there are
-   * parameters.
-   * </p>
-   */
-  Expression raw(String raw, Object[] values);
-
-  /**
-   * Add raw expression with no parameters.
-   */
-  Expression raw(String raw);
-
-  /**
-   * Create a Text Match expression (currently doc store/Elastic only).
-   */
-  Expression textMatch(String propertyName, String search, Match options);
-
-  /**
-   * Create a Text Multi match expression (currently doc store/Elastic only).
-   */
-  Expression textMultiMatch(String query, MultiMatch options);
-
-  /**
-   * Create a text simple query expression (currently doc store/Elastic only).
-   */
-  Expression textSimple(String search, TextSimple options);
-
-  /**
-   * Create a text query string expression (currently doc store/Elastic only).
-   */
-  Expression textQueryString(String search, TextQueryString options);
-
-  /**
-   * Create a text common terms expression (currently doc store/Elastic only).
-   */
-  Expression textCommonTerms(String search, TextCommonTerms options);
-
-  /**
-   * And - join two expressions with a logical and.
-   */
-  Expression and(Expression expOne, Expression expTwo);
-
-  /**
-   * Or - join two expressions with a logical or.
-   */
-  Expression or(Expression expOne, Expression expTwo);
-
-  /**
-   * Negate the expression (prefix it with NOT).
-   */
-  Expression not(Expression exp);
-
-  /**
-   * Return a list of expressions that will be joined by AND's.
-   */
-  <T> Junction<T> conjunction(Query<T> query);
-
-  /**
-   * Return a list of expressions that will be joined by OR's.
-   */
-  <T> Junction<T> disjunction(Query<T> query);
-
-  /**
-   * Return a list of expressions that will be joined by AND's.
-   */
-  <T> Junction<T> conjunction(Query<T> query, ExpressionList<T> parent);
-
-  /**
-   * Return a list of expressions that will be joined by OR's.
-   */
-  <T> Junction<T> disjunction(Query<T> query, ExpressionList<T> parent);
-
-  /**
-   * Return a Text query junction for MUST, SHOULD or MUST NOT.
-   * <p>
-   * This is doc store Elastic only.
-   * </p>
-   */
-  <T> Junction<T> junction(Junction.Type type, Query<T> query, ExpressionList<T> parent);
-
-  /**
-   * Add the expressions to the given expression list.
-   *
-   * @param where       The expression list to add the expressions to
-   * @param expressions The expressions that are parsed
-   * @param params      Bind parameters to match ? or ?1 bind positions.
-   */
-  <T> void where(ExpressionList<T> where, String expressions, Object[] params);
-}
@@ -1,21 +0,0 @@
-package io.ebean;
-
-import java.time.Clock;
-
-/**
- * The extended API for Database.
- */
-public interface ExtendedServer {
-
-  /**
-   * Deprecated but no yet determined suitable replacement (to support testing only change of clock).
-   * <p>
-   * Set the Clock to use for <code>@WhenCreated</code> and <code>@WhenModified</code>.
-   * <p>
-   * Note that we only expect to change the Clock for testing purposes.
-   * </p>
-   */
-  @Deprecated
-  void setClock(Clock clock);
-
-}
@@ -1,139 +0,0 @@
-package io.ebean;
-
-import java.io.Serializable;
-
-/**
- * Defines how a relationship is fetched via either normal SQL join,
- * a eager secondary query, via lazy loading or via eagerly hitting L2 cache.
- * <p>
- * <pre>{@code
- * // Normal fetch join results in a single SQL query
- * List<Order> list = DB.find(Order.class).fetch("details").findList();
- *
- * }</pre>
- * <p>
- * Example: Using a "query join" instead of a "fetch join" we instead use 2 SQL queries
- *
- * <pre>{@code
- *
- * // This will use 2 SQL queries to build this object graph
- * List<Order> list =
- *     DB.find(Order.class)
- *         .fetch("details", FetchConfig.ofQuery())
- *         .findList();
- *
- * // query 1) find order
- * // query 2) find orderDetails where order.id in (?,?...) // first 100 order id's
- *
- * }</pre>
- */
-public final class FetchConfig implements Serializable {
-
-  private static final long serialVersionUID = 1L;
-
-  private static final int JOIN_MODE = 0;
-  private static final int QUERY_MODE = 1;
-  private static final int LAZY_MODE = 2;
-  private static final int CACHE_MODE = 3;
-
-  private final int mode;
-  private final int batchSize;
-  private final int hashCode;
-
-  private FetchConfig(int mode, int batchSize) {
-    this.mode = mode;
-    this.batchSize = batchSize;
-    this.hashCode = mode + 10 * batchSize;
-  }
-
-  /**
-   * Return FetchConfig to eagerly fetch the relationship using L2 cache.
-   * <p>
-   * Any cache misses will be loaded by secondary query to the database.
-   */
-  public static FetchConfig ofCache() {
-    return new FetchConfig(CACHE_MODE, 100);
-  }
-
-  /**
-   * Return FetchConfig to eagerly fetch the relationship using a secondary query.
-   */
-  public static FetchConfig ofQuery() {
-    return new FetchConfig(QUERY_MODE, 100);
-  }
-
-  /**
-   * Return FetchConfig to eagerly fetch the relationship using a secondary with a given batch size.
-   */
-  public static FetchConfig ofQuery(int batchSize) {
-    return new FetchConfig(QUERY_MODE, batchSize);
-  }
-
-  /**
-   * Return FetchConfig to lazily load the relationship.
-   */
-  public static FetchConfig ofLazy() {
-    return new FetchConfig(LAZY_MODE, 0);
-  }
-
-  /**
-   * Return FetchConfig to lazily load the relationship specifying the batch size.
-   */
-  public static FetchConfig ofLazy(int batchSize) {
-    return new FetchConfig(LAZY_MODE, batchSize);
-  }
-
-  /**
-   * Return FetchConfig to fetch the relationship using SQL join.
-   */
-  public static FetchConfig ofDefault() {
-    return new FetchConfig(JOIN_MODE, 100);
-  }
-
-  /**
-   * Return the batch size for fetching.
-   */
-  public int getBatchSize() {
-    return batchSize;
-  }
-
-  /**
-   * Return true if the fetch should use the L2 cache.
-   */
-  public boolean isCache() {
-    return mode == CACHE_MODE;
-  }
-
-  /**
-   * Return true if the fetch should be a eager secondary query.
-   */
-  public boolean isQuery() {
-    return mode == QUERY_MODE;
-  }
-
-  /**
-   * Return true if the fetch should be a lazy query.
-   */
-  public boolean isLazy() {
-    return mode == LAZY_MODE;
-  }
-
-  /**
-   * Return true if the fetch should try to use SQL join.
-   */
-  public boolean isJoin() {
-    return mode == JOIN_MODE;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    return (hashCode == ((FetchConfig) o).hashCode);
-  }
-
-  @Override
-  public int hashCode() {
-    return hashCode;
-  }
-}
@@ -1,36 +0,0 @@
-package io.ebean;
-
-/**
- * IN expression using multiple columns.
- * <p>
- * Currently this is not supported with SQLServer or DB2.
- * <p>
- * Produces SQL expression in the form of (A,B,C) IN ((a0,b0,c0), (a1,b1,c1), ... )
- * where A,B,C are the properties in the tuples.
- */
-public interface InTuples {
-
-  /**
-   * Create given the properties in the tuples.
-   */
-  static InTuples of(String... properties) {
-    return new DInTuples(properties);
-  }
-
-  /**
-   * Create given the properties in the tuples.
-   */
-  static InTuples of(Query.Property<?>... properties) {
-    String[] props = new String[properties.length];
-    for (int i = 0; i < properties.length; i++) {
-      props[i] = properties[i].toString();
-    }
-    return new DInTuples(props);
-  }
-
-  /**
-   * Add a tuple entry. All values must be non-null.
-   */
-  InTuples add(Object... values);
-
-}
@@ -1,119 +0,0 @@
-package io.ebean;
-
-import io.avaje.lang.Nullable;
-
-/**
- * Options to be used with insert such as ON CONFLICT DO UPDATE | NOTHING.
- */
-public interface InsertOptions {
-
-  /**
-   * Use ON CONFLICT UPDATE with automatic determination of the unique columns to conflict on.
-   * <p>
-   * Uses mapping to determine the unique columns - {@code @Column(unique=true)} and {@code @Index(unique=true)} .
-   */
-  InsertOptions ON_CONFLICT_UPDATE = InsertOptions.builder()
-    .onConflictUpdate()
-    .build();
-
-  /**
-   * Use ON CONFLICT DO NOTHING with automatic determination of the unique columns to conflict on.
-   * <p>
-   * Uses mapping to determine the unique columns - {@code @Column(unique=true)} and {@code @Index(unique=true)} .
-   */
-  InsertOptions ON_CONFLICT_NOTHING = InsertOptions.builder()
-    .onConflictNothing()
-    .build();
-
-  /**
-   * Return a builder for InsertOptions.
-   */
-  static Builder builder() {
-    return new DInsertOptionsBuilder();
-  }
-
-  /**
-   * Return the constraint name that is used for ON CONFLICT.
-   */
-  @Nullable
-  String constraint();
-
-  /**
-   * Return the unique columns that is used for ON CONFLICT.
-   * <p>
-   * When not explicitly set will use mapping like {@code @Column(unique=true)} to determine the
-   * non-unique columns.
-   */
-  @Nullable
-  String uniqueColumns();
-
-  /**
-   * Return the ON CONFLICT UPDATE SET clause.
-   * <p>
-   * When not set will use the non-unique columns.
-   */
-  @Nullable
-  String updateSet();
-
-  /**
-   * Return if GetGeneratedKeys should be used to fetch the generated keys after insert.
-   */
-  @Nullable
-  Boolean getGetGeneratedKeys();
-
-  /**
-   * Return the key for these build options.
-   */
-  String key();
-
-  /**
-   * The builder for InsertOptions.
-   */
-  interface Builder {
-
-    /**
-     * Use a ON CONFLICT UPDATE automatically determining the unique columns.
-     */
-    Builder onConflictUpdate();
-
-    /**
-     * Use a ON CONFLICT DO NOTHING automatically determining the unique columns.
-     */
-    Builder onConflictNothing();
-
-    /**
-     * Specify an explicit conflict constraint name.
-     * <p>
-     * When this is used then unique columns will not be used.
-     */
-    Builder constraint(String constraint);
-
-    /**
-     * Specify the unique columns for the conflict target.
-     * <p>
-     * When not specified and constraint is also not specified then
-     * it will automatically determine the unique columns
-     * based on mapping like {@code @Column(unique=true)} and
-     * {@code @Index(unique=true)} .
-     */
-    Builder uniqueColumns(String uniqueColumns);
-
-    /**
-     * Specify the ON CONFLICT DO UPDATE SET clause.
-     * <p>
-     * When not specified ebean will include all the non-unique columns.
-     */
-    Builder updateSet(String updateSet);
-
-    /**
-     * Specify if GetGeneratedKeys should be used to return generated keys.
-     */
-    Builder getGeneratedKeys(boolean getGeneratedKeys);
-
-    /**
-     * Build and return the insert options.
-     */
-    InsertOptions build();
-
-  }
-}
@@ -1,42 +0,0 @@
-package io.ebean;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Helper methods for Lists.
- */
-public final class Lists {
-
-  private Lists() {
-  }
-
-  /**
-   * Partition the source List into sub-lists with a maximum size.
-   * <p>
-   * The sub-lists will all be the max size except for the last sub-list
-   * which can potentially be smaller.
-   *
-   * @param source The source list
-   * @param max    The max size of each partition
-   * @param <T>    The list element type
-   * @return List of sub-list partitions
-   */
-  public static <T> List<List<T>> partition(List<T> source, int max) {
-    final int totalCount = source.size();
-    if (totalCount == 0) {
-      return Collections.emptyList();
-    } else if (totalCount <= max) {
-      return List.of(source);
-    }
-    final int numOfPartitions = (totalCount + max - 1) / max;  // round up
-    final var dest = new ArrayList<List<T>>(numOfPartitions);
-    for (int i = 0; i < numOfPartitions; i++) {
-      final int from = i * max;
-      final int to = Math.min(from + max, totalCount);
-      dest.add(source.subList(from, to));
-    }
-    return dest;
-  }
-}
@@ -1,19 +0,0 @@
-package io.ebean;
-
-/**
- * Owner object notified when a modification is detected.
- */
-public interface ModifyAwareType {
-
-  /**
-   * Return true if the value is considered dirty.
-   * Note that this resets the dirty status back to clean.
-   */
-  boolean isMarkedDirty();
-
-  /**
-   * Marks the object as modified.
-   */
-  void setMarkedDirty(boolean markedDirty);
-
-}
@@ -1,15 +0,0 @@
-package io.ebean;
-
-final class SimpleProperty<T> implements Query.Property<T> {
-
-  private final String expression;
-
-  SimpleProperty(String expression) {
-    this.expression = expression;
-  }
-
-  @Override
-  public String toString() {
-    return expression;
-  }
-}
@@ -1,351 +0,0 @@
-package io.ebean;
-
-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
-
-import javax.sql.DataSource;
-import java.io.Serializable;
-import java.sql.Connection;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-/**
- * Query object for performing native SQL queries that return SqlRow or directly read
- * ResultSet using a RowMapper.
- * <p>
- * The returned SqlRow objects are similar to a LinkedHashMap with some type
- * conversion support added.
- * </p>
- * <p>
- * Refer to {@link DtoQuery} for native sql queries returning DTO beans.
- * </p>
- * <p>
- * Refer to {@link Database#findNative(Class, String)} for native sql queries returning entity beans.
- * </p>
- *
- * <pre>{@code
- *
- *   // example using named parameters
- *
- *   String sql = "select id, name from customer where name like :name and status_code = :status";
- *
- *   List<SqlRow> list =
- *     DB.sqlQuery(sql)
- *       .setParameter("name", "Acme%")
- *       .setParameter("status", "ACTIVE")
- *       .findList();
- *
- * }</pre>
- */
-@NonNullApi
-public interface SqlQuery extends Serializable, CancelableQuery {
-
-  /**
-   * Execute the query using the given transaction.
-   */
-  SqlQuery usingTransaction(Transaction transaction);
-
-  /**
-   * Execute the query using the given connection.
-   */
-  SqlQuery usingConnection(Connection connection);
-
-  /**
-   * Ensure that the master DataSource is used if there is a read only data source
-   * being used (that is using a read replica database potentially with replication lag).
-   * <p>
-   * When the database is configured with a read-only DataSource via
-   * say {@link io.ebean.DatabaseBuilder#readOnlyDataSource(DataSource)}then
-   * by default when a query is run without an active transaction, it uses the read-only data
-   * source. We use {@code usingMaster()} to instead ensure that the query is executed
-   * against the master data source.
-   */
-  SqlQuery usingMaster();
-
-  /**
-   * Execute the query returning a list.
-   */
-  List<SqlRow> findList();
-
-  /**
-   * Execute the SqlQuery iterating a row at a time.
-   * <p>
-   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
-   * </p>
-   */
-  void findEach(Consumer<SqlRow> consumer);
-
-  /**
-   * Execute the SqlQuery iterating a row at a time with the ability to stop consuming part way through.
-   * <p>
-   * Returning false after processing a row stops the iteration through the query results.
-   * </p>
-   * <p>
-   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
-   * </p>
-   */
-  void findEachWhile(Predicate<SqlRow> consumer);
-
-  /**
-   * Execute the query returning a single row or null.
-   * <p>
-   * If this query finds 2 or more rows then it will throw a
-   * PersistenceException.
-   * </p>
-   */
-  @Nullable
-  SqlRow findOne();
-
-  /**
-   * Execute the query reading each row from ResultSet using the RowConsumer.
-   * <p>
-   * This provides a low level option that reads directly from the JDBC ResultSet
-   * and is good for processing very large results where (unlike findList) we don't
-   * hold all the results in memory but instead can process row by row.
-   * </p>
-   *
-   * <pre>{@code
-   *
-   *  String sql = "select id, name, status from customer order by name desc";
-   *
-   *  DB.sqlQuery(sql)
-   *    .findEachRow((resultSet, rowNum) -> {
-   *
-   *      // read directly from ResultSet
-   *
-   *      long id = resultSet.getLong(1);
-   *      String name = resultSet.getString(2);
-   *
-   *      // do something interesting with the data
-   *
-   *    });
-   *
-   * }</pre>
-   *
-   * @param consumer Used to read and process each ResultSet row.
-   */
-  void findEachRow(RowConsumer consumer);
-
-  /**
-   * Execute the query returning an optional row.
-   */
-  Optional<SqlRow> findOneOrEmpty();
-
-  /**
-   * Set one of more positioned parameters.
-   * <p>
-   * This is a convenient alternative to multiple calls to {@link #setParameter(Object)}.
-   *
-   * <pre>{@code
-   *
-   *   String sql = "select id, name from customer where name like ? and status = ?";
-   *
-   *   List<SqlRow> list =
-   *     DB.sqlQuery(sql)
-   *       .setParameters("Rob", Status.NEW)
-   *       .findList();
-   *
-   *
-   *   // effectively the same as ...
-   *
-   *       .setParameter("Rob")
-   *       .setParameter("Status.NEW)
-   *
-   *   // and ...
-   *
-   *       .setParameter(1, "Rob")
-   *       .setParameter(2, "Status.NEW)
-   *
-   * }</pre>
-   */
-  SqlQuery setParameters(Object... values);
-
-  /**
-   * Set the next bind parameter by position.
-   * <pre>{@code
-   *
-   *   String sql = "select id, name from customer where name like ? and status = ?";
-   *
-   *   List<SqlRow> list =
-   *     DB.sqlQuery(sql)
-   *       .setParameter("Rob")
-   *       .setParameter("Status.NEW)
-   *       .findList();
-   *
-   *   // the same as ...
-   *
-   *       .setParameters("Rob", Status.NEW)
-   *
-   *   // and ...
-   *
-   *       .setParameter(1, "Rob")
-   *       .setParameter(2, "Status.NEW)
-   *
-   * }</pre>
-   *
-   * <p>
-   * When binding a collection of values into a IN expression we should use
-   * indexed parameters like ?1, ?2, ?3 etc rather than just ?.
-   * </p>
-   *
-   * <pre>{@code
-   *
-   *   String sql = "select c.id, c.name from customer c where c.name in (?1)";
-   *
-   *   List<SqlRow> rows = DB.sqlQuery(sql)
-   *       .setParameter(asList("Rob", "Fiona", "Jack"))
-   *       .findList();
-   *
-   *
-   *   List<SqlRow> rows = DB.sqlQuery(sql)
-   *       .setParameter(1, asList("Rob", "Fiona", "Jack"))
-   *       .findList();
-   * }</pre>
-   *
-   * @param value The value to bind
-   */
-  SqlQuery setParameter(Object value);
-
-  /**
-   * Set a null parameter by position.
-   */
-  SqlQuery setNullParameter(int position, int jdbcType);
-
-  /**
-   * Set a null parameter by name.
-   */
-  SqlQuery setNullParameter(String name, int jdbcType);
-
-  /**
-   * Bind the parameter by its index position (1 based like JDBC).
-   * <p>
-   * When binding a collection of values into a IN expression we should use
-   * indexed parameters like ?1, ?2, ?3 etc rather than just ?.
-   * </p>
-   *
-   * <pre>{@code
-   *
-   *   String sql = "select c.id, c.name from customer c where c.name in (?1)";
-   *
-   *   List<SqlRow> rows = DB.sqlQuery(sql)
-   *       .setParameter(asList("Rob", "Fiona", "Jack"))
-   *       .findList();
-   *
-   *
-   *   List<SqlRow> rows = DB.sqlQuery(sql)
-   *       .setParameter(1, asList("Rob", "Fiona", "Jack"))
-   *       .findList();
-   * }</pre>
-   */
-  SqlQuery setParameter(int position, Object value);
-
-  /**
-   * Bind the named parameter value.
-   */
-  SqlQuery setParameter(String name, Object value);
-
-  /**
-   * Set the index of the first row of the results to return.
-   */
-  SqlQuery setFirstRow(int firstRow);
-
-  /**
-   * Set the maximum number of query results to return.
-   */
-  SqlQuery setMaxRows(int maxRows);
-
-  /**
-   * Set a timeout on this query.
-   * <p>
-   * This will typically result in a call to setQueryTimeout() on a
-   * preparedStatement. If the timeout occurs an exception will be thrown - this
-   * will be a SQLException wrapped up in a PersistenceException.
-   * </p>
-   *
-   * @param secs the query timeout limit in seconds. Zero means there is no limit.
-   */
-  SqlQuery setTimeout(int secs);
-
-  /**
-   * Set a label that can be put on performance metrics that are collected.
-   */
-  SqlQuery setLabel(String label);
-
-  /**
-   * A hint which for JDBC translates to the Statement.fetchSize().
-   * <p>
-   * Gives the JDBC driver a hint as to the number of rows that should be
-   * fetched from the database when more rows are needed for ResultSet.
-   * </p>
-   */
-  SqlQuery setBufferFetchSizeHint(int bufferFetchSizeHint);
-
-  /**
-   * The query result maps to a single scalar value like Long, BigDecimal,
-   * String, UUID, OffsetDateTime etc.
-   * <p>
-   * Any scalar type Ebean is aware of can be used including java time
-   * types like Instant, LocalDate, OffsetDateTime, UUID, Inet, Cdir etc.
-   *
-   * <pre>{@code
-   *
-   *   String sql = " select min(updtime) from o_order_detail " +
-   *                " where unit_price > ? and updtime is not null ";
-   *
-   *   OffsetDateTime minCreated = DB.sqlQuery(sql)
-   *     .setParameter(42)
-   *     .mapToScalar(OffsetDateTime.class)
-   *     .findOne();
-   *
-   * }</pre>
-   *
-   * @param attributeType The type the result is returned as
-   * @return The query to execute via findOne() findList() etc
-   */
-  <T> TypeQuery<T> mapToScalar(Class<T> attributeType);
-
-  /**
-   * Use a RowMapper to map the result to beans.
-   *
-   * @param mapper Maps rows to beans
-   * @param <T>    The type of beans mapped to
-   * @return The query to execute by findOne() findList() etc
-   */
-  <T> TypeQuery<T> mapTo(RowMapper<T> mapper);
-
-  /**
-   * Query mapping to single scalar values.
-   *
-   * @param <T> The type of the scalar values
-   */
-  interface TypeQuery<T> {
-
-    /**
-     * Execute the query using the given transaction.
-     */
-    TypeQuery<T> usingTransaction(Transaction transaction);
-
-    /**
-     * Return the single value.
-     */
-    @Nullable
-    T findOne();
-
-    /**
-     * Return the single value that is optional.
-     */
-    Optional<T> findOneOrEmpty();
-
-    /**
-     * Return the list of values.
-     */
-    List<T> findList();
-
-    /**
-     * Find streaming the result effectively consuming a row at a time.
-     */
-    void findEach(Consumer<T> consumer);
-  }
-}
@@ -1,331 +0,0 @@
-package io.ebean;
-
-import io.ebean.Query.Property;
-
-import java.util.Collection;
-
-/**
- * Standard Operators for use with strongly typed query construction.
- * <p>
- * This is currently deemed to be experimental and subject to change.
- */
-public final class StdOperators {
-
-  // ---- Functions ---- //
-
-  /**
-   * Sum of the given property.
-   */
-  public static Property<Number> sum(Property<? extends Number> property) {
-    return Property.of("sum(" + property + ")");
-  }
-
-  /**
-   * Count of the given property.
-   */
-  public static Property<Number> count(Property<?> property) {
-    return Property.of("count(" + property + ")");
-  }
-
-  /**
-   * Average of the given property.
-   */
-  public static <T> Property<T> avg(Property<T> property) {
-    return Property.of("avg(" + property + ")");
-  }
-
-  /**
-   * Max of the given property.
-   */
-  public static <T> Property<T> max(Property<T> property) {
-    return Property.of("max(" + property + ")");
-  }
-
-  /**
-   * Min of the given property.
-   */
-  public static <T> Property<T> min(Property<T> property) {
-    return Property.of("min(" + property + ")");
-  }
-
-  /**
-   * Coalesce of the property and value.
-   */
-  public static <T> Property<T> coalesce(Property<T> property, Object value) {
-    return Property.of("coalesce(" + property.toString() + "," + sqlValue(value) + ")");
-  }
-
-  /**
-   * Lower of the given property.
-   */
-  public static Property<String> lower(Property<String> property) {
-    return Property.of("lower(" + property + ")");
-  }
-
-  /**
-   * Upper of the given property.
-   */
-  public static Property<String> upper(Property<String> property) {
-    return Property.of("upper(" + property + ")");
-  }
-
-  /**
-   * Concat of the given property and values or other properties.
-   */
-  public static Property<String> concat(Property<?> property, Object... values) {
-    StringBuilder expression = new StringBuilder(50);
-    expression.append("concat(").append(property.toString());
-    for (Object value : values) {
-      expression.append(',').append(sqlConcatString(value));
-    }
-    expression.append(')');
-    return Property.of(expression.toString());
-  }
-
-  private static String sqlConcatString(Object value) {
-    if (value instanceof Property) {
-      return value.toString();
-    } else {
-      return sqlQuote(value);
-    }
-  }
-
-  /**
-   * Allows numbers to be unquoted.
-   */
-  private static String sqlValue(Object value) {
-    if (value instanceof Property || value instanceof Number) {
-      return value.toString();
-    } else {
-      return sqlQuote(value);
-    }
-  }
-
-  /**
-   * SQL quoted escaping single quotes.
-   */
-  private static String sqlQuote(Object value) {
-    return "'" + String.valueOf(value).replace("'", "''") + "'";
-  }
-
-  // ---- Operators ---- //
-
-  /**
-   * Equal to - for a property and value.
-   */
-  public static <T> Expression eq(Property<T> property, T value) {
-    return Expr.eq(property.toString(), value);
-  }
-
-  /**
-   * Equal to - for a property and sub-query.
-   */
-  public static <T> Expression eq(Property<T> property, Query<?> subQuery) {
-    return Expr.in(property.toString(), subQuery);
-  }
-
-  /**
-   * Equal to or null - for a property and value.
-   */
-  public static <T> Expression eqOrNull(Property<T> property, T value) {
-    return Expr.factory().eqOrNull(property.toString(), value);
-  }
-
-  /**
-   * Not equal to - for a property and value.
-   */
-  public static <T> Expression ne(Property<T> property, T value) {
-    return Expr.ne(property.toString(), value);
-  }
-
-  /**
-   * Not equal to - for a property and sub-query.
-   */
-  public static <T> Expression ne(Property<T> property, Query<?> subQuery) {
-    return Expr.ne(property.toString(), subQuery);
-  }
-
-  /**
-   * Greater than - for a property and value.
-   */
-  public static <T> Expression gt(Property<T> property, T value) {
-    return Expr.gt(property.toString(), value);
-  }
-
-  /**
-   * Greater than - for a property and sub-query.
-   */
-  public static <T> Expression gt(Property<T> property, Query<?> subQuery) {
-    return Expr.gt(property.toString(), subQuery);
-  }
-
-  /**
-   * Greater than or null - for a property and value.
-   */
-  public static <T> Expression gtOrNull(Property<T> property, T value) {
-    return Expr.factory().gtOrNull(property.toString(), value);
-  }
-
-  /**
-   * Greater than or equal to - for a property and value.
-   */
-  public static <T> Expression ge(Property<T> property, T value) {
-    return Expr.ge(property.toString(), value);
-  }
-
-  /**
-   * Greater than or equal to - for a property and sub-query.
-   */
-  public static <T> Expression ge(Property<T> property, Query<?> subQuery) {
-    return Expr.ge(property.toString(), subQuery);
-  }
-
-  /**
-   * Greater than or null - for a property and value.
-   */
-  public static <T> Expression geOrNull(Property<T> property, T value) {
-    return Expr.factory().geOrNull(property.toString(), value);
-  }
-
-  /**
-   * Less than - for a property and value.
-   */
-  public static <T> Expression lt(Property<T> property, T value) {
-    return Expr.lt(property.toString(), value);
-  }
-
-  /**
-   * Less than - for a property and sub-query.
-   */
-  public static <T> Expression lt(Property<T> property, Query<?> subQuery) {
-    return Expr.lt(property.toString(), subQuery);
-  }
-
-  /**
-   * Less than or null - for a property and value.
-   */
-  public static <T> Expression ltOrNull(Property<T> property, T value) {
-    return Expr.factory().ltOrNull(property.toString(), value);
-  }
-
-  /**
-   * Greater than or equal to - for a property and value.
-   */
-  public static <T> Expression le(Property<T> property, T value) {
-    return Expr.le(property.toString(), value);
-  }
-
-  /**
-   * Greater than or equal to - for a property and sub-query.
-   */
-  public static <T> Expression le(Property<T> property, Query<?> subQuery) {
-    return Expr.le(property.toString(), subQuery);
-  }
-
-  /**
-   * Greater than or equal to or null - for a property and value.
-   */
-  public static <T> Expression leOrNull(Property<T> property, T value) {
-    return Expr.factory().leOrNull(property.toString(), value);
-  }
-
-  /**
-   * In range - for a property and values.
-   */
-  public static <T> Expression inRange(Property<T> property, T lowValue, T highValue) {
-    return Expr.factory().inRange(property.toString(), lowValue, highValue);
-  }
-
-  /**
-   * In range - for properties and a value.
-   */
-  public static <T> Expression inRange(Property<T> lowProperty, Property<T> highProperty, T value) {
-    return Expr.factory().inRangeWith(lowProperty.toString(), highProperty.toString(), value);
-  }
-
-  /**
-   * In range - for properties.
-   */
-  public static <T> Expression inRange(Property<T> lowProperty, Property<T> property, Property<T> highProperty) {
-    return Expr.factory().inRangeWithProperties(lowProperty.toString(), property.toString(), highProperty.toString());
-  }
-
-  /**
-   * In - for a given property and collection of values.
-   */
-  public static <T> Expression in(Property<T> property, Collection<T> value) {
-    return Expr.in(property.toString(), value);
-  }
-
-  /**
-   * In - for a given property and sub-query.
-   */
-  public static <T> Expression in(Property<T> property, Query<?> subQuery) {
-    return Expr.in(property.toString(), subQuery);
-  }
-
-  /**
-   * In or empty - for a given property and collection of values.
-   */
-  public static <T> Expression inOrEmpty(Property<T> property, Collection<T> value) {
-    return Expr.inOrEmpty(property.toString(), value);
-  }
-
-  /**
-   * Not In - for a given property and collection of values.
-   */
-  public static <T> Expression notIn(Property<T> property, Collection<T> value) {
-    return Expr.factory().notIn(property.toString(), value);
-  }
-
-  /**
-   * Not In - for a given property and sub-query.
-   */
-  public static <T> Expression notIn(Property<T> property, Query<?> subQuery) {
-    return Expr.factory().notIn(property.toString(), subQuery);
-  }
-
-  // ---- String operators ---- //
-
-  /**
-   * Like - for a given property and value.
-   */
-  public static Expression like(Property<String> property, String value) {
-    return Expr.like(property.toString(), value);
-  }
-
-  /**
-   * Case-insensitive Like - for a given property and value.
-   */
-  public static Expression ilike(Property<String> property, String value) {
-    return Expr.ilike(property.toString(), value);
-  }
-
-  /**
-   * Starts with - for a given property and value.
-   */
-  public static Expression startsWith(Property<String> property, String value) {
-    return Expr.startsWith(property.toString(), value);
-  }
-
-  /**
-   * Case-insensitive starts with - for a given property and value.
-   */
-  public static Expression istartsWith(Property<String> property, String value) {
-    return Expr.istartsWith(property.toString(), value);
-  }
-
-  /**
-   * Contains - for a given property and value.
-   */
-  public static Expression contains(Property<String> property, String value) {
-    return Expr.contains(property.toString(), value);
-  }
-
-  /**
-   * Case-insensitive contains - for a given property and value.
-   */
-  public static Expression icontains(Property<String> property, String value) {
-    return Expr.icontains(property.toString(), value);
-  }
-}
@@ -1,28 +0,0 @@
-package io.ebean.bean;
-
-import java.util.concurrent.locks.Lock;
-
-/**
- * Loads a entity bean.
- * <p>
- * Typically invokes lazy loading for a single or batch of entity beans.
- * </p>
- */
-public interface BeanLoader {
-
-  /**
-   * Return the name of the associated Database.
-   */
-  String name();
-
-  /**
-   * Invoke the lazy loading for this bean.
-   */
-  void loadBean(EntityBeanIntercept ebi);
-
-  /**
-   * Obtain a lock on the loader.
-   */
-  Lock lock();
-
-}
@@ -1,555 +0,0 @@
-package io.ebean.bean;
-
-import io.ebean.ValuePair;
-
-import java.io.Serializable;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * This is the object associated to every entity bean using byte code enhancement.
- * <p>
- * This provides per property state such as loaded state, changed state, original values
- * as well as bean level dirty state etc.
- */
-public interface EntityBeanIntercept extends Serializable {
-
-  /**
-   * Return the 'owning' entity bean.
-   */
-  EntityBean owner();
-
-  /**
-   * Return the persistenceContext.
-   */
-  PersistenceContext persistenceContext();
-
-  /**
-   * Set the persistenceContext.
-   */
-  void setPersistenceContext(PersistenceContext persistenceContext);
-
-  /**
-   * Turn on profile collection.
-   */
-  void setNodeUsageCollector(NodeUsageCollector usageCollector);
-
-  /**
-   * Return the ownerId (IdClass).
-   */
-  Object ownerId();
-
-  /**
-   * Set the ownerId (IdClass).
-   */
-  void setOwnerId(Object ownerId);
-
-  /**
-   * Return the owning bean for an embedded bean.
-   */
-  Object embeddedOwner();
-
-  /**
-   * Return the property index (for the parent) of this embedded bean.
-   */
-  int embeddedOwnerIndex();
-
-  /**
-   * Clear the getter callback.
-   */
-  void clearGetterCallback();
-
-  /**
-   * Register the callback to be triggered when getter is called.
-   * This is used primarily to automatically flush the JDBC batch.
-   */
-  void registerGetterCallback(PreGetterCallback getterCallback);
-
-  /**
-   * Set the embedded beans owning bean.
-   */
-  void setEmbeddedOwner(EntityBean parentBean, int embeddedOwnerIndex);
-
-  /**
-   * Set the BeanLoader with PersistenceContext.
-   */
-  void setBeanLoader(BeanLoader beanLoader, PersistenceContext ctx);
-
-  /**
-   * Set the BeanLoader.
-   */
-  void setBeanLoader(BeanLoader beanLoader);
-
-  /**
-   * Return true if the bean is fully loaded (not a partial).
-   */
-  boolean isFullyLoadedBean();
-
-  /**
-   * Set true when the bean is fully loaded (not a partial).
-   */
-  void setFullyLoadedBean(boolean fullyLoadedBean);
-
-  /**
-   * Return true if the bean is partially loaded.
-   */
-  boolean isPartial();
-
-  /**
-   * Return true if this bean has been directly modified (it has oldValues) or
-   * if any embedded beans are either new or dirty (and hence need saving).
-   */
-  boolean isDirty();
-
-  /**
-   * Called by an embedded bean onto its owner.
-   */
-  void setEmbeddedDirty(int embeddedProperty);
-
-  /**
-   * Marks the bean as dirty.
-   */
-  void setDirty(boolean dirty);
-
-  /**
-   * Return true if this entity bean is new and not yet saved.
-   */
-  boolean isNew();
-
-  /**
-   * Return true if the entity bean is new or dirty (and should be saved).
-   */
-  boolean isNewOrDirty();
-
-  /**
-   * Return true if only the Id property has been loaded.
-   */
-  boolean hasIdOnly(int idIndex);
-
-  /**
-   * Return true if the entity is a reference.
-   */
-  boolean isReference();
-
-  /**
-   * Set this as a reference object.
-   */
-  void setReference(int idPos);
-
-  /**
-   * Set true when the bean has been loaded from L2 bean cache.
-   * The effect of this is that we should skip the cache if there
-   * is subsequent lazy loading (bean cache partially populated).
-   */
-  void setLoadedFromCache(boolean loadedFromCache);
-
-  /**
-   * Return true if this bean was loaded from L2 bean cache.
-   */
-  boolean isLoadedFromCache();
-
-  /**
-   * Return true if the bean should be treated as readOnly. If a setter method
-   * is called when it is readOnly an Exception is thrown.
-   */
-  boolean isReadOnly();
-
-  /**
-   * Set the readOnly status. If readOnly then calls to setter methods through
-   * an exception.
-   */
-  void setReadOnly(boolean readOnly);
-
-  /**
-   * Set the bean to be updated when persisted (for merge).
-   */
-  void setForceUpdate(boolean forceUpdate);
-
-  /**
-   * Return true if the entity should be updated.
-   */
-  boolean isUpdate();
-
-  /**
-   * Return true if the entity has been loaded.
-   */
-  boolean isLoaded();
-
-  /**
-   * Set the bean into NEW state.
-   */
-  void setNew();
-
-  /**
-   * Set the loaded state to true.
-   * <p>
-   * Calls to setter methods after the bean is loaded can result in
-   * 'Old Values' being created.
-   * <p>
-   * Worth noting that this is also set after a insert/update. By doing so it
-   * 'resets' the bean for making further changes and saving again.
-   */
-  void setLoaded();
-
-  /**
-   * When finished loading for lazy or refresh on an already partially populated bean.
-   */
-  void setLoadedLazy();
-
-  /**
-   * Set lazy load failure flag.
-   */
-  void setLazyLoadFailure(Object ownerId);
-
-  /**
-   * Return true if the bean is marked as having failed lazy loading.
-   */
-  boolean isLazyLoadFailure();
-
-  /**
-   * Return true if lazy loading is disabled.
-   */
-  boolean isDisableLazyLoad();
-
-  /**
-   * Set true to turn off lazy loading.
-   */
-  void setDisableLazyLoad(boolean disableLazyLoad);
-
-  /**
-   * Set the loaded status for the embedded bean.
-   */
-  void setEmbeddedLoaded(Object embeddedBean);
-
-  /**
-   * Return true if the embedded bean is new or dirty and hence needs saving.
-   */
-  boolean isEmbeddedNewOrDirty(Object embeddedBean);
-
-  /**
-   * Return the original value that was changed via an update.
-   */
-  Object origValue(int propertyIndex);
-
-  /**
-   * Finds the index position of a given property. Returns -1 if the
-   * property can not be found.
-   */
-  int findProperty(String propertyName);
-
-  /**
-   * Return the property name for the given property.
-   */
-  String property(int propertyIndex);
-
-  /**
-   * Return the number of properties.
-   */
-  int propertyLength();
-
-  /**
-   * Set the loaded state of the property given it's name.
-   */
-  void setPropertyLoaded(String propertyName, boolean loaded);
-
-  /**
-   * Set the property to be treated as unloaded. Used for properties initialised in default constructor.
-   */
-  void setPropertyUnloaded(int propertyIndex);
-
-  /**
-   * Set the property to be loaded.
-   */
-  void setLoadedProperty(int propertyIndex);
-
-  /**
-   * Set all properties to be loaded (post insert).
-   */
-  void setLoadedPropertyAll();
-
-  /**
-   * Return true if the property is loaded.
-   */
-  boolean isLoadedProperty(int propertyIndex);
-
-  /**
-   * Return true if the property is considered changed.
-   */
-  boolean isChangedProperty(int propertyIndex);
-
-  /**
-   * Return true if the property was changed or if it is embedded and one of its
-   * embedded properties is dirty.
-   */
-  boolean isDirtyProperty(int propertyIndex);
-
-  /**
-   * Explicitly mark a property as having been changed.
-   */
-  void markPropertyAsChanged(int propertyIndex);
-
-  /**
-   * Set the changed state for the given property.
-   */
-  void setChangedProperty(int propertyIndex);
-
-  /**
-   * Set the changed and loaded state for the given property.
-   */
-  void setChangeLoaded(int propertyIndex);
-
-  /**
-   * Set that an embedded bean has had one of its properties changed.
-   */
-  void setEmbeddedPropertyDirty(int propertyIndex);
-
-  /**
-   * Set the original value for the property.
-   */
-  void setOriginalValue(int propertyIndex, Object value);
-
-  /**
-   * Set old value but force it to be set regardless if it already has a value.
-   */
-  void setOriginalValueForce(int propertyIndex, Object value);
-
-  /**
-   * For forced update on a 'New' bean set all the loaded properties to changed.
-   */
-  void setNewBeanForUpdate();
-
-  /**
-   * Return the set of property names for a partially loaded bean.
-   */
-  Set<String> loadedPropertyNames();
-
-  /**
-   * Return the array of flags indicating the dirty properties.
-   */
-  boolean[] dirtyProperties();
-
-  /**
-   * Return the set of dirty properties.
-   */
-  Set<String> dirtyPropertyNames();
-
-  /**
-   * Recursively add dirty properties.
-   */
-  void addDirtyPropertyNames(Set<String> props, String prefix);
-
-  /**
-   * Return true if any of the given property names are dirty.
-   */
-  boolean hasDirtyProperty(Set<String> propertyNames);
-
-  /**
-   * Return a map of dirty properties with their new and old values.
-   */
-  Map<String, ValuePair> dirtyValues();
-
-  /**
-   * Recursively add dirty properties.
-   */
-  void addDirtyPropertyValues(Map<String, ValuePair> dirtyValues, String prefix);
-
-  /**
-   * Recursively add dirty properties.
-   */
-  void addDirtyPropertyValues(BeanDiffVisitor visitor);
-
-  /**
-   * Return a dirty property hash taking into account embedded beans.
-   */
-  StringBuilder dirtyPropertyKey();
-
-  /**
-   * Add and return a dirty property hash.
-   */
-  void addDirtyPropertyKey(StringBuilder sb);
-
-  /**
-   * Return a loaded property hash.
-   */
-  StringBuilder loadedPropertyKey();
-
-  /**
-   * Return the loaded state for all the properties.
-   */
-  boolean[] loaded();
-
-  /**
-   * Return the index of the property that triggered the lazy load.
-   */
-  int lazyLoadPropertyIndex();
-
-  /**
-   * Return the property that triggered the lazy load.
-   */
-  String lazyLoadProperty();
-
-  /**
-   * Load the bean when it is a reference.
-   */
-  void loadBean(int loadProperty);
-
-  /**
-   * Invoke the lazy loading. This method is synchronised externally.
-   */
-  void loadBeanInternal(int loadProperty, BeanLoader loader);
-
-  /**
-   * Called when a BeanCollection is initialised automatically.
-   */
-  void initialisedMany(int propertyIndex);
-
-  /**
-   * Invoke the PreGetterCallback if it has been set due to getter for the given property.
-   */
-  void preGetterCallback(int propertyIndex);
-
-  /**
-   * Called prior to Id property getter.
-   */
-  void preGetId();
-
-  /**
-   * Method that is called prior to a getter method on the actual entity.
-   */
-  void preGetter(int propertyIndex);
-
-  /**
-   * OneToMany and ManyToMany only set loaded state.
-   */
-  void preSetterMany(boolean interceptField, int propertyIndex, Object oldValue, Object newValue);
-
-  /**
-   * Set the property changed state, bean dirtyState and property original value.
-   */
-  void setChangedPropertyValue(int propertyIndex, boolean setDirtyState, Object origValue);
-
-  /**
-   * Set the dirty state on the bean.
-   */
-  void setDirtyStatus();
-
-  /**
-   * Check to see if the values are not equal. If they are not equal then create
-   * the old values for use with ConcurrencyMode.ALL.
-   */
-  void preSetter(boolean intercept, int propertyIndex, Object oldValue, Object newValue);
-
-  /**
-   * Check for primitive boolean.
-   */
-  void preSetter(boolean intercept, int propertyIndex, boolean oldValue, boolean newValue);
-
-  /**
-   * Check for primitive int.
-   */
-  void preSetter(boolean intercept, int propertyIndex, int oldValue, int newValue);
-
-  /**
-   * Check for primitive long.
-   */
-  void preSetter(boolean intercept, int propertyIndex, long oldValue, long newValue);
-
-  /**
-   * Check for primitive double.
-   */
-  void preSetter(boolean intercept, int propertyIndex, double oldValue, double newValue);
-
-  /**
-   * Check for primitive float.
-   */
-  void preSetter(boolean intercept, int propertyIndex, float oldValue, float newValue);
-
-  /**
-   * Check for primitive short.
-   */
-  void preSetter(boolean intercept, int propertyIndex, short oldValue, short newValue);
-
-  /**
-   * Check for primitive char.
-   */
-  void preSetter(boolean intercept, int propertyIndex, char oldValue, char newValue);
-
-  /**
-   * Check for primitive byte.
-   */
-  void preSetter(boolean intercept, int propertyIndex, byte oldValue, byte newValue);
-
-  /**
-   * Check for primitive char array.
-   */
-  void preSetter(boolean intercept, int propertyIndex, char[] oldValue, char[] newValue);
-
-  /**
-   * Check for primitive byte array.
-   */
-  void preSetter(boolean intercept, int propertyIndex, byte[] oldValue, byte[] newValue);
-
-  /**
-   * Explicitly set an old value with force (the old value is forced even it is already set).
-   */
-  void setOldValue(int propertyIndex, Object oldValue);
-
-  /**
-   * Return the sort order value for an order column.
-   */
-  int sortOrder();
-
-  /**
-   * Set the sort order value for an order column.
-   */
-  void setSortOrder(int sortOrder);
-
-  /**
-   * Set if the entity was deleted from a BeanCollection.
-   */
-  void setDeletedFromCollection(boolean deletedFromCollection);
-
-  /**
-   * Return true if the bean was orphan deleted from a collection.
-   */
-  boolean isOrphanDelete();
-
-  /**
-   * Set the load error that happened on this property.
-   */
-  void setLoadError(int propertyIndex, Exception t);
-
-  /**
-   * Returns the loadErrors.
-   */
-  Map<String, Exception> loadErrors();
-
-  /**
-   * Return true if the property has its changed state set.
-   */
-  boolean isChangedProp(int propertyIndex);
-
-  /**
-   * Return the MutableValueInfo for the given property or null.
-   */
-  MutableValueInfo mutableInfo(int propertyIndex);
-
-  /**
-   * Set the MutableValueInfo for the given property.
-   */
-  void mutableInfo(int propertyIndex, MutableValueInfo info);
-
-  /**
-   * Dirty detection set the next mutable property content and info .
-   * <p>
-   * Set here as the mutable property dirty detection is based on json content comparison.
-   * We only want to perform the json serialisation once so storing it here as part of
-   * dirty detection so that we can get it back to bind in insert or update etc.
-   */
-  void mutableNext(int propertyIndex, MutableValueNext next);
-
-  /**
-   * Update the 'next' mutable info returning the content that was obtained via dirty detection.
-   */
-  String mutableNext(int propertyIndex);
-}
@@ -1,551 +0,0 @@
-package io.ebean.bean;
-
-import io.ebean.ValuePair;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * EntityBeanIntercept optimised for read only use.
- * <p>
- * For the read only use this intercept doesn't need to hold any state that is normally
- * required for updates such as per property changed, loaded, dirty state, original values
- * bean state etc.
- */
-public class InterceptReadOnly implements EntityBeanIntercept {
-
-  private final EntityBean owner;
-
-  /**
-   * Create with a given entity.
-   */
-  public InterceptReadOnly(Object ownerBean) {
-    this.owner = (EntityBean) ownerBean;
-  }
-
-  @Override
-  public String toString() {
-    return "InterceptReadOnly{" + owner + '}';
-  }
-
-  @Override
-  public EntityBean owner() {
-    return owner;
-  }
-
-  @Override
-  public PersistenceContext persistenceContext() {
-    return null;
-  }
-
-  @Override
-  public void setPersistenceContext(PersistenceContext persistenceContext) {
-
-  }
-
-  @Override
-  public void setNodeUsageCollector(NodeUsageCollector usageCollector) {
-
-  }
-
-  @Override
-  public Object ownerId() {
-    return null;
-  }
-
-  @Override
-  public void setOwnerId(Object ownerId) {
-
-  }
-
-  @Override
-  public Object embeddedOwner() {
-    return null;
-  }
-
-  @Override
-  public int embeddedOwnerIndex() {
-    return 0;
-  }
-
-  @Override
-  public void clearGetterCallback() {
-
-  }
-
-  @Override
-  public void registerGetterCallback(PreGetterCallback getterCallback) {
-
-  }
-
-  @Override
-  public void setEmbeddedOwner(EntityBean parentBean, int embeddedOwnerIndex) {
-
-  }
-
-  @Override
-  public void setBeanLoader(BeanLoader beanLoader, PersistenceContext ctx) {
-
-  }
-
-  @Override
-  public void setBeanLoader(BeanLoader beanLoader) {
-
-  }
-
-  @Override
-  public boolean isFullyLoadedBean() {
-    return false;
-  }
-
-  @Override
-  public void setFullyLoadedBean(boolean fullyLoadedBean) {
-
-  }
-
-  @Override
-  public boolean isPartial() {
-    return false;
-  }
-
-  @Override
-  public boolean isDirty() {
-    return false;
-  }
-
-  @Override
-  public void setEmbeddedDirty(int embeddedProperty) {
-
-  }
-
-  @Override
-  public void setDirty(boolean dirty) {
-
-  }
-
-  @Override
-  public boolean isNew() {
-    return false;
-  }
-
-  @Override
-  public boolean isNewOrDirty() {
-    return false;
-  }
-
-  @Override
-  public boolean hasIdOnly(int idIndex) {
-    return false;
-  }
-
-  @Override
-  public boolean isReference() {
-    return false;
-  }
-
-  @Override
-  public void setReference(int idPos) {
-
-  }
-
-  @Override
-  public void setLoadedFromCache(boolean loadedFromCache) {
-
-  }
-
-  @Override
-  public boolean isLoadedFromCache() {
-    return false;
-  }
-
-  @Override
-  public boolean isReadOnly() {
-    return true;
-  }
-
-  @Override
-  public void setReadOnly(boolean readOnly) {
-
-  }
-
-  @Override
-  public void setForceUpdate(boolean forceUpdate) {
-
-  }
-
-  @Override
-  public boolean isUpdate() {
-    return false;
-  }
-
-  @Override
-  public boolean isLoaded() {
-    return true;
-  }
-
-  @Override
-  public void setNew() {
-
-  }
-
-  @Override
-  public void setLoaded() {
-
-  }
-
-  @Override
-  public void setLoadedLazy() {
-
-  }
-
-  @Override
-  public void setLazyLoadFailure(Object ownerId) {
-
-  }
-
-  @Override
-  public boolean isLazyLoadFailure() {
-    return false;
-  }
-
-  @Override
-  public boolean isDisableLazyLoad() {
-    return false;
-  }
-
-  @Override
-  public void setDisableLazyLoad(boolean disableLazyLoad) {
-
-  }
-
-  @Override
-  public void setEmbeddedLoaded(Object embeddedBean) {
-
-  }
-
-  @Override
-  public boolean isEmbeddedNewOrDirty(Object embeddedBean) {
-    return false;
-  }
-
-  @Override
-  public Object origValue(int propertyIndex) {
-    return null;
-  }
-
-  @Override
-  public int findProperty(String propertyName) {
-    return 0;
-  }
-
-  @Override
-  public String property(int propertyIndex) {
-    return null;
-  }
-
-  @Override
-  public int propertyLength() {
-    return 0;
-  }
-
-  @Override
-  public void setPropertyLoaded(String propertyName, boolean loaded) {
-
-  }
-
-  @Override
-  public void setPropertyUnloaded(int propertyIndex) {
-
-  }
-
-  @Override
-  public void setLoadedProperty(int propertyIndex) {
-
-  }
-
-  @Override
-  public void setLoadedPropertyAll() {
-
-  }
-
-  @Override
-  public boolean isLoadedProperty(int propertyIndex) {
-    return false;
-  }
-
-  @Override
-  public boolean isChangedProperty(int propertyIndex) {
-    return false;
-  }
-
-  @Override
-  public boolean isDirtyProperty(int propertyIndex) {
-    return false;
-  }
-
-  @Override
-  public void markPropertyAsChanged(int propertyIndex) {
-
-  }
-
-  @Override
-  public void setChangedProperty(int propertyIndex) {
-
-  }
-
-  @Override
-  public void setChangeLoaded(int propertyIndex) {
-
-  }
-
-  @Override
-  public void setEmbeddedPropertyDirty(int propertyIndex) {
-
-  }
-
-  @Override
-  public void setOriginalValue(int propertyIndex, Object value) {
-
-  }
-
-  @Override
-  public void setOriginalValueForce(int propertyIndex, Object value) {
-
-  }
-
-  @Override
-  public void setNewBeanForUpdate() {
-
-  }
-
-  @Override
-  public Set<String> loadedPropertyNames() {
-    return Collections.emptySet();
-  }
-
-  @Override
-  public boolean[] dirtyProperties() {
-    return new boolean[0];
-  }
-
-  @Override
-  public Set<String> dirtyPropertyNames() {
-    return Collections.emptySet();
-  }
-
-  @Override
-  public void addDirtyPropertyNames(Set<String> props, String prefix) {
-
-  }
-
-  @Override
-  public boolean hasDirtyProperty(Set<String> propertyNames) {
-    return false;
-  }
-
-  @Override
-  public Map<String, ValuePair> dirtyValues() {
-    return Collections.emptyMap();
-  }
-
-  @Override
-  public void addDirtyPropertyValues(Map<String, ValuePair> dirtyValues, String prefix) {
-
-  }
-
-  @Override
-  public void addDirtyPropertyValues(BeanDiffVisitor visitor) {
-
-  }
-
-  @Override
-  public StringBuilder dirtyPropertyKey() {
-    return null;
-  }
-
-  @Override
-  public void addDirtyPropertyKey(StringBuilder sb) {
-
-  }
-
-  @Override
-  public StringBuilder loadedPropertyKey() {
-    return null;
-  }
-
-  @Override
-  public boolean[] loaded() {
-    return new boolean[0];
-  }
-
-  @Override
-  public int lazyLoadPropertyIndex() {
-    return 0;
-  }
-
-  @Override
-  public String lazyLoadProperty() {
-    return null;
-  }
-
-  @Override
-  public void loadBean(int loadProperty) {
-
-  }
-
-  @Override
-  public void loadBeanInternal(int loadProperty, BeanLoader loader) {
-
-  }
-
-  @Override
-  public void initialisedMany(int propertyIndex) {
-
-  }
-
-  @Override
-  public void preGetterCallback(int propertyIndex) {
-
-  }
-
-  @Override
-  public void preGetId() {
-
-  }
-
-  @Override
-  public void preGetter(int propertyIndex) {
-
-  }
-
-  @Override
-  public void preSetterMany(boolean interceptField, int propertyIndex, Object oldValue, Object newValue) {
-
-  }
-
-  @Override
-  public void setChangedPropertyValue(int propertyIndex, boolean setDirtyState, Object origValue) {
-
-  }
-
-  @Override
-  public void setDirtyStatus() {
-
-  }
-
-  @Override
-  public void preSetter(boolean intercept, int propertyIndex, Object oldValue, Object newValue) {
-
-  }
-
-  @Override
-  public void preSetter(boolean intercept, int propertyIndex, boolean oldValue, boolean newValue) {
-
-  }
-
-  @Override
-  public void preSetter(boolean intercept, int propertyIndex, int oldValue, int newValue) {
-
-  }
-
-  @Override
-  public void preSetter(boolean intercept, int propertyIndex, long oldValue, long newValue) {
-
-  }
-
-  @Override
-  public void preSetter(boolean intercept, int propertyIndex, double oldValue, double newValue) {
-
-  }
-
-  @Override
-  public void preSetter(boolean intercept, int propertyIndex, float oldValue, float newValue) {
-
-  }
-
-  @Override
-  public void preSetter(boolean intercept, int propertyIndex, short oldValue, short newValue) {
-
-  }
-
-  @Override
-  public void preSetter(boolean intercept, int propertyIndex, char oldValue, char newValue) {
-
-  }
-
-  @Override
-  public void preSetter(boolean intercept, int propertyIndex, byte oldValue, byte newValue) {
-
-  }
-
-  @Override
-  public void preSetter(boolean intercept, int propertyIndex, char[] oldValue, char[] newValue) {
-
-  }
-
-  @Override
-  public void preSetter(boolean intercept, int propertyIndex, byte[] oldValue, byte[] newValue) {
-
-  }
-
-  @Override
-  public void setOldValue(int propertyIndex, Object oldValue) {
-
-  }
-
-  @Override
-  public int sortOrder() {
-    return 0;
-  }
-
-  @Override
-  public void setSortOrder(int sortOrder) {
-
-  }
-
-  @Override
-  public void setDeletedFromCollection(boolean deletedFromCollection) {
-
-  }
-
-  @Override
-  public boolean isOrphanDelete() {
-    return false;
-  }
-
-  @Override
-  public void setLoadError(int propertyIndex, Exception t) {
-
-  }
-
-  @Override
-  public Map<String, Exception> loadErrors() {
-    return null;
-  }
-
-  @Override
-  public boolean isChangedProp(int i) {
-    return false;
-  }
-
-  @Override
-  public MutableValueInfo mutableInfo(int propertyIndex) {
-    return null;
-  }
-
-  @Override
-  public void mutableInfo(int propertyIndex, MutableValueInfo info) {
-
-  }
-
-  @Override
-  public void mutableNext(int propertyIndex, MutableValueNext next) {
-
-  }
-
-  @Override
-  public String mutableNext(int propertyIndex) {
-    return null;
-  }
-}
@@ -1,42 +0,0 @@
-package io.ebean.bean;
-
-/**
- * Holds information on mutable values (like plain beans stored as json).
- * <p>
- * Used internally in EntityBeanIntercept for dirty detection on mutable values.
- * Typically, mutation detection is based on a hash/checksum of json content or the
- * original json content itself.
- * <p>
- * Refer to the mapping options {@code @DbJson(mutationDetection)}.
- */
-public interface MutableValueInfo {
-
-  /**
-   * Compares the given json returning null if deemed unchanged or returning
-   * the MutableValueNext to use if deemed dirty/changed.
-   * <p>
-   * Returning MutableValueNext allows an implementation based on hash/checksum
-   * to only perform that computation once.
-   *
-   * @return Null if deemed unchanged or the MutableValueNext if deemed changed.
-   */
-  MutableValueNext nextDirty(String json);
-
-  /**
-   * Compares the given object to an internal value.
-   * <p>
-   * This is used to support changelog/beanState. The implementation can serialize the
-   * object into json form and compare it against the original json.
-   */
-  boolean isEqualToObject(Object obj);
-
-  /**
-   * Creates a new instance from the internal json string.
-   * <p>
-   * This is used to provide an original/old value for change logging / persist listeners.
-   * This is only available for properties that have {@code @DbJson(keepSource=true)}.
-   */
-  default Object get() {
-    return null;
-  }
-}
@@ -1,17 +0,0 @@
-package io.ebean.bean;
-
-/**
- * Represents a next value to use for mutable content properties (DbJson with jackson beans).
- */
-public interface MutableValueNext {
-
-  /**
-   * Return the next content to use. Provided such that we serialise to json once.
-   */
-  String content();
-
-  /**
-   * Return the next MutableValueInfo to use after an update.
-   */
-  MutableValueInfo info();
-}
@@ -1,109 +0,0 @@
-package io.ebean.bean;
-
-import java.lang.ref.Cleaner;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-/**
- * Collects profile information for a bean (or reference/proxy bean) at a given node.
- * <p>
- * The node identifies the location of the bean in the object graph.
- */
-public final class NodeUsageCollector {
-
-  private final static Cleaner cleaner = Cleaner.create();
-
-  public static final class State implements Runnable {
-
-    private final NodeUsageListener listener;
-    /**
-     * The properties used at this profile point.
-     */
-    private final Set<String> used = new LinkedHashSet<>();
-    /**
-     * The point in the object graph for a specific query and call stack point.
-     */
-    private final ObjectGraphNode node;
-    /**
-     * set to true if the bean is modified (setter called)
-     */
-    private boolean modified;
-
-    private State(ObjectGraphNode node, NodeUsageListener listener) {
-      this.node = node;
-      this.listener = listener;
-    }
-
-    @Override
-    public String toString() {
-      return node + " read:" + used + " modified:" + modified;
-    }
-
-    @Override
-    public void run() {
-      listener.collectNodeUsage(this);
-    }
-
-    /**
-     * Return true if no properties where used.
-     */
-    public boolean isEmpty() {
-      return used.isEmpty();
-    }
-
-    /**
-     * Return the associated node which identifies the location in the object
-     * graph of the bean/reference.
-     */
-    public ObjectGraphNode node() {
-      return node;
-    }
-
-    /**
-     * Return the set of used properties.
-     */
-    public Set<String> used() {
-      return used;
-    }
-
-    /**
-     * Return true if the bean was modified by a setter.
-     */
-    public boolean isModified() {
-      return modified;
-    }
-  }
-
-  private final State state;
-
-  public NodeUsageCollector(ObjectGraphNode node, NodeUsageListener listener) {
-    this.state = new State(node, listener);
-    cleaner.register(this, state);
-  }
-
-  /**
-   * Return the underlying state.
-   */
-  public State state() {
-    return state;
-  }
-
-  /**
-   * The bean has been modified by a setter method.
-   */
-  public void setModified() {
-    state.modified = true;
-  }
-
-  /**
-   * Add the name of a property that has been used.
-   */
-  public void addUsed(String property) {
-    state.used.add(property);
-  }
-
-  @Override
-  public String toString() {
-    return state.toString();
-  }
-}
@@ -1,91 +0,0 @@
-package io.ebean.bean;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * Identifies a unique node of an object graph.
- * <p>
- * It represents a location relative to the root of an object graph and specific
- * to a query and call stack hash.
- */
-public final class ObjectGraphNode implements Serializable {
-
-  private static final long serialVersionUID = 2087081778650228996L;
-
-  /**
-   * Identifies the origin.
-   */
-  private final ObjectGraphOrigin origin;
-
-  /**
-   * The path relative to the root.
-   */
-  private final String path;
-
-  /**
-   * Create at a sub level.
-   */
-  public ObjectGraphNode(ObjectGraphNode parent, String path) {
-    this.origin = parent.origin();
-    this.path = parent.childPath(path);
-  }
-
-  /**
-   * Create an the root level.
-   */
-  public ObjectGraphNode(ObjectGraphOrigin origin, String path) {
-    this.origin = origin;
-    this.path = path;
-  }
-
-  /**
-   * Return the origin query point.
-   */
-  public ObjectGraphOrigin origin() {
-    return origin;
-  }
-
-  private String childPath(String childPath) {
-    if (path == null) {
-      return childPath;
-    } else if (childPath == null) {
-      return path;
-    } else {
-      return path + "." + childPath;
-    }
-  }
-
-  /**
-   * Return the path relative to the root.
-   */
-  public String path() {
-    return path;
-  }
-
-  @Override
-  public String toString() {
-    return "origin:" + origin + " path[" + path + "]";
-  }
-
-  @Override
-  public int hashCode() {
-    int hc = 92821 * origin.hashCode();
-    hc = 92821 * hc + (path == null ? 0 : path.hashCode());
-    return hc;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (obj == this) {
-      return true;
-    }
-    if (!(obj instanceof ObjectGraphNode)) {
-      return false;
-    }
-
-    ObjectGraphNode e = (ObjectGraphNode) obj;
-    return (Objects.equals(e.path, path))
-      && e.origin.equals(origin);
-  }
-}
@@ -1,73 +0,0 @@
-package io.ebean.bean;
-
-import io.ebean.Database;
-
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * BeanLoader used when single beans are loaded (which is usually not ideal / N+1).
- */
-public abstract class SingleBeanLoader implements BeanLoader {
-
-  private final ReentrantLock lock = new ReentrantLock();
-
-  protected final Database database;
-
-  SingleBeanLoader(Database database) {
-    this.database = database;
-  }
-
-  @Override
-  public String name() {
-    return database.name();
-  }
-
-  @Override
-  public Lock lock() {
-    lock.lock();
-    return lock;
-  }
-
-  /**
-   * Single bean lazy loaded when bean from L2 cache.
-   */
-  public static class L2 extends SingleBeanLoader {
-    public L2(Database database) {
-      super(database);
-    }
-
-    @Override
-    public void loadBean(EntityBeanIntercept ebi) {
-      database.pluginApi().loadBeanL2(ebi);
-    }
-  }
-
-  /**
-   * Single bean lazy loaded when a reference bean.
-   */
-  public static class Ref extends SingleBeanLoader {
-    public Ref(Database database) {
-      super(database);
-    }
-
-    @Override
-    public void loadBean(EntityBeanIntercept ebi) {
-      database.pluginApi().loadBeanRef(ebi);
-    }
-  }
-
-  /**
-   * Single bean lazy loaded when a reference bean.
-   */
-  public static class Dflt extends SingleBeanLoader {
-    public Dflt(Database database) {
-      super(database);
-    }
-
-    @Override
-    public void loadBean(EntityBeanIntercept ebi) {
-      database.pluginApi().loadBean(ebi);
-    }
-  }
-}
@@ -1,12 +0,0 @@
-package io.ebean.bean;
-
-/**
- * A type that can participate in building toString content with ToStringBuilder.
- */
-public interface ToStringAware {
-
-  /**
-   * Append to the ToStringBuilder.
-   */
-  void toString(ToStringBuilder builder);
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
rob bygrave	08d241d946	#1966 Remove sequence batching - postgres opps	2020-03-05 00:34:05 +13:00
rob bygrave	1c24ebf6dc	Remove Sequence batching in favour of JPA increment 50 Also remove h2sqldb in favour of always using H2	2020-03-05 00:22:20 +13:00