[maven-release-plugin] prepare release ebean-11.15.3

#1357 - Regression in 11.15.2 - for nested Ebean.beginTransaction(TxScope.requiresNew()); ... where closed via ebeanServer.endTransaction(); rather than transaction.end()
[maven-release-plugin] prepare for next development iteration
2024-04-21 10:51:47 +00:00 · 2018-03-29 14:35:25 +13:00 · 2018-03-29 10:22:12 +13:00 · 2018-03-29 01:49:43 +13:00 · 2018-03-29 01:49:28 +13:00 · 2018-03-29 01:15:58 +13:00
2836 changed files with 95072 additions and 41616 deletions
@@ -10,3 +10,4 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 spaces_around_operators = true
+max_line_length = 130
@@ -13,10 +13,11 @@ ebean-profiling*.xml
 /db
 /mydb.db
 !src/test/ddl-review/*.sql
-
+profiling/

 # Intellij project files
 *.iml
 *.ipr
 *.iws
 .idea/
+*uuid.state
@@ -1,3 +1,4 @@
+dist: trusty
 sudo: required
 language: java
 jdk:
@@ -7,17 +8,28 @@ git:
  depth: 3

 addons:
-  postgresql: "9.4"
+  postgresql: "9.6"
+#  apt:
+#    packages:
+#    - mysql-server-5.7
+#    - mysql-client-core-5.7
+#    - mysql-client-5.7

 services:
+  - docker
  - postgresql
+  - mysql

 before_script:
  - ./.travis/setup_database
+  - mysql -u root -e 'CREATE DATABASE test_ebean;'
+  - mysql -u root -e "CREATE USER 'test_ebean'@'localhost' IDENTIFIED BY 'test';"
+  - mysql -u root -e "GRANT ALL ON test_ebean.* TO 'test_ebean'@'localhost';"

 env:
  - EBEAN_DB=h2
  - EBEAN_DB=pg
+#  - EBEAN_DB=mysql

 install: true

@@ -0,0 +1,298 @@
+Overview of ebean.properties file
+=================================
+
+
+### DbMigration options
+
+You can set individual values for different platforms when generating migrations
+
+`dbmigration.platform.<PLATFORM>.databaseSequenceBatchSize`
+For DB's using sequences this is the number of sequence values prefetched.
+ 
+`dbmigration.platform.<PLATFORM>.dbuuid`
+Control, how UUID generation should work - it affects DDL which column type is generated. Possible values:
+- BINARY enforces binary UUID 
+- VARCHAR enforces varchar UUID
+- BINARY_OPTIMIZED enforces binary-optimized UUID (makes sense only with Type1 ID)
+- AUTO_BINARY use binary when platform does not support native UUID
+- AUTO_BINARY_OPTIMIZED use binary-optimized when platform does not support native UUID
+- AUTO_VARCHAR (default) use varchar when platform does not support UUID 
+
+`dbmigration.platform.<PLATFORM>.uuidStoreAsBinary`
+Same as setting dbuuid to BINARY
+
+`dbmigration.platform.<PLATFORM>.geometrySRID`
+The Geometry SRID value (default 4326).
+
+`dbmigration.platform.<PLATFORM>.idType`
+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.
+
+`ebean.migration.applySuffix`
+Defaults to '.sql'
+
+`ebean.migration.dbusername`
+DB user used to run the DB migration.
+
+`ebean.migration.dbpassword`
+DB password used to run the DB migration.
+
+`ebean.migration.generate`
+Set to true if the DB migration should be generated on server start.
+
+`ebean.migration.generatePendingDrop`
+The version of a pending drop that should be generated as the next migration.
+
+`ebean.migration.includeGeneratedFileComment`
+TODO
+
+`ebean.migration.metaTable`
+For running migration the DB table that holds migration execution status. Default 'db_migration'
+
+`ebean.migration.migrationPath`
+Resource path for the migration xml and sql.
+
+`ebean.migration.modelPath`
+Subdirectory the model xml files go into. Default 'model'
+
+`ebean.migration.modelSuffix`
+Suffix. Default '.model.xml' 
+
+`ebean.migration.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.
+
+`ebean.migration.patchResetChecksumOn`
+migration versions that should have their checksum reset and not run.
+Use this if you get a 'Checksum mismatch' error.
+
+`ebean.migration.placeholders`
+A comma and equals delimited placeholders that are substituted in SQL scripts when running migration (used by DB Migration runner only).
+
+`ebean.migration.platform`
+The database platform to generate migration DDL for.
+
+`ebean.migration.run`
+Flag set to true means to run any outstanding migrations on startup.
+
+`ebean.migration.version`
+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
+- VERSION4 (default) generate random V4 UUIDs,
+- VERSION1 generate rfc4122 compliant Type 1 UUIDs (requires a state file)
+- VERSION1RND generate fake Type 1 UUIDs
+
+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
+
+
+### DocStoreConfig
+
+`ebean.docstore.active`
+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.
+
+`ebean.docstore.bulkBatchSize`
+The default batch size to use for the Bulk API calls.
+
+`ebean.docstore.create`
+When true the Document store should create any document indexes that don't already exist.
+
+`ebean.docstore.dropCreate`
+When true the Document store should drop and re-create document indexes.
+
+`ebean.docstore.generateMapping`
+Set to true means Ebean will generate mapping files on startup.
+
+`ebean.docstore.mappingPath`
+Resource path for the Document store mapping files.
+
+`ebean.docstore.mappingSuffix`
+Suffix used for mapping files.
+
+`ebean.docstore.password`
+ Password credential that be used for authentication to document store.
+ 
+`ebean.docstore.pathToResources`
+Location of resources that mapping files are generated into.
+
+`ebean.docstore.persist`
+The default mode used by indexes. `DEFAULT|IGNORE|QUEUE|UPDATE`
+
+`ebean.docstore.url`
+The URL of the Document store server. For example: http://localhost:9200.
+
+`ebean.docstore.username`
+Credential that be used for authentication to document store.
+
+### Ebean Autotune
+
+`ebean.autoTune.mode`
+The autoTune mode `DEFAULT_OFF|DEFAULT_ON|DEFAULT_ONIFEMPTY`
+
+`ebean.autoTune.profiling`
+TODO
+
+`ebean.autoTune.profilingBase`
+TODO
+
+`ebean.autoTune.profilingFile`
+TODO
+
+`ebean.autoTune.profilingRate`
+TODO
+
+`ebean.autoTune.profilingUpdateFrequency`
+TODO
+
+`ebean.autoTune.queryTuning`
+TODO
+
+`ebean.autoTune.queryTuningAddVersion`
+TODO
+
+`ebean.autoTune.queryTuningFile`
+TODO
+
+`ebean.autoTune.skipGarbageCollectionOnShutdown`
+TODO
+
+`ebean.autoTune.skipProfileReportingOnShutdown`
+TODO
+
+
+### Ebean options
+`ebean.allQuotedIdentifiers`
+Quote all identifiers
+
+`ebean.asOfSysPeriod`
+Column used to support history and 'As of' queries. This column is a timestamp range or equivalent.
+
+`ebean.asOfViewSuffix`
+Suffix appended to the base table to derive the view that contains the union of the base table and the history table in order to support asOf queries.
+
+`ebean.autoCommitMode`
+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
+
+`ebean.autostart`
+Should the server start all
+
+`ebean.backgroundExecutorSchedulePoolSize`
+TODO
+
+`ebean.backgroundExecutorShutdownSecs`
+TODO
+
+and some more todos:
+`ebean.batch.mode`
+`ebean.batch.size`
+`ebean.changeLogAsync`
+`ebean.changeLogIncludeInserts`
+`ebean.classes`
+`ebean.collectQueryOrigins`
+`ebean.collectQueryStatsByNode`
+`ebean.currentUserProvider`
+`ebean.dataSourceJndiName`
+`ebean.dataTimeZone`
+`ebean.databaseBooleanFalse`
+`ebean.databaseBooleanTrue`
+`ebean.databasePlatform`
+`ebean.databasePlatformName`
+`ebean.databaseSequenceBatchSize`
+ebean.datasource.h2.adminpassword
+ebean.datasource.h2.adminusername
+`ebean.dbEncrypt`
+`ebean.dbOffline`
+ebean.ddl.createOnly
+ebean.ddl.generate
+ebean.ddl.header
+ebean.ddl.initSql
+ebean.ddl.run
+ebean.ddl.seedSql
+ebean.defaultDeleteMissingChildren
+ebean.defaultOrderById
+ebean.disableClasspathSearch
+ebean.disableL2Cache
+ebean.docStoreOnly
+ebean.docstore.active
+ebean.docstore.allowAllCertificates
+ebean.docstore.bulkBatchSize
+ebean.docstore.create
+ebean.docstore.dropCreate
+ebean.docstore.generateMapping
+ebean.docstore.mappingPath
+ebean.docstore.mappingSuffix
+ebean.docstore.password
+ebean.docstore.pathToResources
+ebean.docstore.persist
+ebean.docstore.url
+ebean.docstore.username
+ebean.encryptDeployManager
+ebean.encryptKeyManager
+ebean.encryptor
+ebean.explicitTransactionBeginMode
+ebean.expressionEqualsWithNullAsNoop
+ebean.expressionNativeIlike
+ebean.geometrySRID
+ebean.historyTableSuffix
+ebean.jdbcFetchSizeFindEach
+ebean.jdbcFetchSizeFindList
+ebean.jodaLocalTimeMode
+ebean.jsonDateTime
+ebean.jsonInclude
+ebean.lazyLoadBatchSize
+ebean.localTimeWithNanos
+ebean.namingConvention.schema
+ebean.namingConvention.sequenceFormat
+ebean.namingConvention.useForeignKeyPrefix
+ebean.namingconvention
+ebean.notifyL2CacheInForeground
+ebean.packages
+ebean.persistBatch
+ebean.persistBatchOnCascade
+ebean.persistBatchSize
+ebean.persistBatching
+ebean.persistenceContextScope
+ebean.profiling
+ebean.profiling.directory
+ebean.profiling.includeProfileIds
+ebean.profiling.minimumMicros
+ebean.profiling.profilesPerFile
+ebean.profiling.verbose
+ebean.queryBatchSize
+ebean.queryPlanTTLSeconds
+ebean.search.packages
+ebean.serverCachePlugin
+ebean.skipCacheAfterWrite
+ebean.slowQueryMillis
+ebean.tenant.catalogProvider
+ebean.tenant.currentTenantProvider
+ebean.tenant.mode
+ebean.tenant.partitionColumn
+ebean.tenant.schemaProvider
+ebean.updateAllPropertiesInBatch
+ebean.updateChangesOnly
+ebean.updatesDeleteMissingChildren
+ebean.useJavaxValidationNotNull
+ebean.useJtaTransactionManager
+
@@ -6,12 +6,12 @@ Goto [https://ebean-orm.github.io/](http://ebean-orm.github.io/ "Ebean ORM's Web


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

 [Maven central - all related projects](http://search.maven.org/#search%7Cga%7C1%7Cebean "maven central all related projects")

 ## Current versions
-* [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebean/ebean) - ebean
-* [![Maven Central : ebean-agent](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebean/ebean-agent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebean/ebean-agent) - ebean-agent
-* [![Maven Central : ebean-maven-plugin](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebean/ebean-maven-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebean/ebean-maven-plugin) - ebean-maven-plugin
+* [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebean/ebean) - ebean
+* [![Maven Central : ebean-agent](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-agent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.avaje.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/org.avaje.ebean/ebean-maven-plugin) - ebean-maven-plugin

@@ -0,0 +1,153 @@
+This is a short description how to run tests
+============================================
+
+Run tests from maven
+--------------------
+
+Just type `mvn test` - it will run the whole test suite with the settings
+from `src/test/resources/ebean.properties`. 
+
+Run tests from eclipse
+----------------------
+
+Running tests requires, that the classes are enhanced. By default, the 
+`BaseTestCase` tries to load the enhancer-agent in a very early stage. This 
+also works for most test cases, but it does not work if you try to run a 
+complete test-suite, as classes that are loaded before the enhancer-agent 
+kicks in will not get enhanced. To solve this problem, you need either the
+[Eclipse-Enhancer-Plugin](https://github.com/ebean-orm-tools/ebean-eclipse-enhancer) 
+or add the agent to your JVM arguments (Preferences->Installed JREs) or to
+your run configuration: 
+`-javaagent:<USER_HOME>/.m2/repository/io/ebean/ebean-agent/<VERSION>/ebean-agent-<VERSION>.jar=debug=0`
+
+
+Platform Tests
+==============
+
+By default, the `h2` platform is used. To test a different platform, add 
+`-Ddatasource.default=xxx` to your maven command or JVM arguments.
+
+'h2' platform
+-------------
+
+Reqires no setup
+
+run: `mvn clean test`
+
+Current status: PASS
+Tests run: 1986, Failures: 0, Errors: 0, Skipped: 16
+
+'pg' platform
+-------------
+
+Reqirements
+- a locally installed PostgreSQL server with PostGis.
+- Create a user "unit" with password "unit" and a database "unit"
+- Give the user all permissions to that db
+
+run: `mvn clean test -Ddatasource.default=pg`
+
+Current status: PASS
+Tests run: 2166, Failures: 0, Errors: 0, Skipped: 25
+
+
+
+'mysql' platform
+-------------
+
+Reqirements
+- a locally installed MySQL server.
+- Create a user "unit" with password "unit" and a database "unit"
+- Give the user all permissions to that db
+
+run: `mvn clean test -Ddatasource.default=mysql`
+
+Current status: PASS
+Tests run: 2166, Failures: 0, Errors: 0, Skipped: 33
+
+
+
+'sqlserver' platform
+--------------------
+
+Reqires an installed sqlserver - e.g. https://hub.docker.com/r/microsoft/mssql-server-linux/
+
+- Create a user "ebean" with password "ebean" and a database "ebean_unittest"
+- Adjust the connection string and/or username in ebean.properties
+  
+run: `mvn clean test -Ddatasource.default=mssql`
+
+Current status: PASS
+Tests run: 2166, Failures: 0, Errors: 0, Skipped: 39
+
+
+
+'oracle' platform
+-----------------
+
+Reqires a locally installed Oracle server.
+- Create a user "unit" with password "unit" with all permissions
+- The test wirtes directly to the "xe" SID - so do not use a productive server!
+- As the Oracle JDBC driver is only available on an oracle repository,
+  you need a special maven setup as described [here](http://docs.oracle.com/middleware/1213/core/MAVEN/config_maven_repo.htm#MAVEN9010)
+  
+run: `mvn clean test -Ddatasource.default=ora -Poracle`
+
+Current status: FAIL
+Tests run: 1986, Failures: 17, Errors: 34, Skipped: 16
+
+
+
+'db2' platform
+--------------
+
+Reqires a locally installed DB2 Express-C server.
+- Create a user "unit" with password "unit" with all permissions
+- Install the db2jcc4 driver (see pom.xml)
+
+run: `mvn clean test -Ddatasource.default=db2 -Pdb2`
+
+Current status: FAIL
+Tests run: 2166, Failures: 29, Errors: 58, Skipped: 30
+
+
+'sqlite' platform
+-----------------
+
+Reqires no setup
+
+run: `mvn clean test -Ddatasource.default=sqlite`
+
+Current status: FAIL
+Tests run: 1986, Failures: 24, Errors: 86, Skipped: 16
+
+After some time, the db locks up, every test takes 3 seconds and fails with 
+"the database file is locked"
+
+
+
+'hsqldb' platform
+-----------------
+
+Reqires no setup
+
+run: `mvn clean test -Ddatasource.default=hsqldb`
+
+Current status: FAIL
+Tests run: 1980, Failures: 3, Errors: 657, Skipped: 16
+
+
+@Rob FYI
+The problem is https://sourceforge.net/p/hsqldb/bugs/1364/
+In `InsertHandler.getPstmt` the `meta.getIdentityDbColumns()` contains
+'id' in lowercase. Changing that to uppercase gives me this result:
+`Tests run: 1986, Failures: 2, Errors: 18, Skipped: 16`
+(as quick hack I added temporary a toUpperCase to BindableIdScalar.getIdentityColumn)
+
+
+'sqlanywhere' platform
+----------------------
+
+TODO: not yet tested
+
+
@@ -4,100 +4,153 @@
  <parent>
    <groupId>org.avaje</groupId>
    <artifactId>java8-parent</artifactId>
-    <version>1.1</version>
+    <version>1.3</version>
  </parent>

-  <groupId>org.avaje.ebean</groupId>
+  <groupId>io.ebean</groupId>
  <artifactId>ebean</artifactId>
-  <version>9.3.1</version>
+  <version>11.15.3</version>
  <packaging>jar</packaging>

  <name>ebean</name>
  <url>http://ebean-orm.github.io/</url>

-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-9.3.1</tag>
+    <tag>ebean-11.15.3</tag>
  </scm>

+  <profiles>
+    <profile>
+      <!-- Note: to use this profile, you need credentials for the oracle repository in your
+        settings.xml as described here:
+        http://docs.oracle.com/middleware/1213/core/MAVEN/config_maven_repo.htm#MAVEN9010 -->
+      <id>oracle</id>
+      <dependencies>
+        <dependency>
+          <groupId>com.oracle.jdbc</groupId>
+          <artifactId>ojdbc8</artifactId>
+          <version>12.2.0.1</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      <repositories>
+        <repository>
+          <id>maven.oracle.com</id>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <url>https://maven.oracle.com</url>
+          <layout>default</layout>
+        </repository>
+      </repositories>
+    </profile>
+    <profile>
+      <!-- Note: to use this profile, you need to download manually the db2jcc4 driver.
+        After that, install it into your local maven repository:
+
+        mvn install:install-file \
+          -Dfile=db2jcc4.jar \
+          -DgroupId=com.ibm.jdbc \
+          -DartifactId=db2jcc4 \
+          -Dversion=4.23.42 \
+          -Dpackaging=jar
+      -->
+      <id>db2</id>
+      <dependencies>
+        <dependency>
+          <groupId>com.ibm.jdbc</groupId>
+          <artifactId>db2jcc4</artifactId>
+          <version>4.23.42</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
  <dependencies>

+    <!--
+    Projects are expected to explicit depend on version
+    of slf4j that they want to use
+    -->
    <dependency>
-      <groupId>org.jetbrains</groupId>
-      <artifactId>annotations</artifactId>
-      <version>13.0</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.25</version>
+      <scope>provided</scope>
    </dependency>

+    <!--
+    Exclude snakeyaml if you desire - it is not strictly required.
+    -->
    <dependency>
-      <groupId>org.avaje.ebean</groupId>
-      <artifactId>persistence-api</artifactId>
-      <version>2.1.3</version>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>1.19</version>
    </dependency>

+    <!--
+    Class retention Nonnull and Nullable annotations
+    to assist with IDE auto-completion with Ebean API
+    -->
    <dependency>
-      <groupId>org.avaje.ebean</groupId>
-      <artifactId>ebean-annotation</artifactId>
-      <version>1.4</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-datasource-api</artifactId>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-jsr305</artifactId>
      <version>1.1</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>persistence-api</artifactId>
+      <version>2.2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-annotation</artifactId>
+      <version>3.11</version>
    </dependency>

    <dependency>
      <groupId>org.avaje</groupId>
      <artifactId>avaje-datasource</artifactId>
-      <version>1.1.3</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-classpath-scanner-api</artifactId>
-      <version>2.2</version>
+      <version>3.2.2</version>
    </dependency>

    <dependency>
      <groupId>org.avaje</groupId>
      <artifactId>avaje-classpath-scanner</artifactId>
-      <version>2.2.1</version>
+      <version>3.1.1</version>
    </dependency>

    <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-dbmigration</artifactId>
-      <version>1.2.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>[1.7.1,1.7.99)</version>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>11.5.1</version>
    </dependency>

    <dependency>
      <groupId>org.antlr</groupId>
      <artifactId>antlr4-runtime</artifactId>
-      <version>4.5.3</version>
+      <version>4.7.1</version>
    </dependency>

    <!-- Jackson core used internally by Ebean -->
    <dependency>
      <groupId>com.fasterxml.jackson.core</groupId>
      <artifactId>jackson-core</artifactId>
-      <version>2.6.5</version>
+      <version>2.9.0</version>
    </dependency>

    <!-- provided scope for JsonNode support -->
    <dependency>
      <groupId>com.fasterxml.jackson.core</groupId>
      <artifactId>jackson-databind</artifactId>
-      <version>2.6.5</version>
+      <version>2.9.0</version>
      <scope>provided</scope>
    </dependency>

@@ -112,21 +165,21 @@
    <dependency>
      <groupId>javax.validation</groupId>
      <artifactId>validation-api</artifactId>
-      <version>1.0.0.GA</version>
+      <version>1.1.0.Final</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>joda-time</groupId>
      <artifactId>joda-time</artifactId>
-      <version>1.6</version>
+      <version>2.9.7</version>
      <scope>provided</scope>
    </dependency>

@@ -134,7 +187,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>9.4-1202-jdbc41</version>
+      <version>9.4.1212</version>
      <scope>provided</scope>
    </dependency>

@@ -147,24 +200,31 @@
      <!--<scope>test</scope>-->
    <!--</dependency>-->

-    <!--<dependency>-->
-      <!--<groupId>microsoft</groupId>-->
-      <!--<artifactId>sqlserver-jdbc</artifactId>-->
-      <!--<version>4.2</version>-->
-      <!--<scope>test</scope>-->
-    <!--</dependency>-->
-
    <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-agentloader</artifactId>
-      <version>1.1.1</version>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-docker-run</artifactId>
+      <version>1.5.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
-      <groupId>org.avaje.ebean</groupId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.2.3</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.avaje</groupId>
+      <artifactId>avaje-agentloader</artifactId>
+      <version>2.1.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
      <artifactId>ebean-agent</artifactId>
-      <version>8.1.1</version>
+      <version>11.11.1</version>
      <scope>test</scope>
    </dependency>

@@ -173,28 +233,36 @@
    <dependency>
      <groupId>com.h2database</groupId>
      <artifactId>h2</artifactId>
-      <version>1.4.192</version>
+      <version>1.4.196</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>org.xerial</groupId>
      <artifactId>sqlite-jdbc</artifactId>
-      <version>3.8.11.2</version>
+      <version>3.15.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>org.hsqldb</groupId>
      <artifactId>hsqldb</artifactId>
-      <version>2.0.0</version>
+      <version>2.3.4</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.microsoft.sqlserver</groupId>
+      <artifactId>mssql-jdbc</artifactId>
+      <version>6.4.0.jre8</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>mysql</groupId>
      <artifactId>mysql-connector-java</artifactId>
-      <version>5.1.36</version>
+      <!-- Do not upgrade to 6.0.6: https://bugs.mysql.com/bug.php?id=82896 -->
+      <version>5.1.43</version>
      <scope>test</scope>
    </dependency>

@@ -209,14 +277,14 @@
    <dependency>
      <groupId>commons-io</groupId>
      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>org.avaje.moduuid</groupId>
      <artifactId>avaje-moduuid</artifactId>
-      <version>1.2</version>
+      <version>2.1</version>
      <scope>test</scope>
    </dependency>

@@ -227,19 +295,18 @@
    <plugins>

      <plugin>
-        <groupId>org.avaje.ebean</groupId>
+        <groupId>io.ebean</groupId>
        <artifactId>ebean-maven-plugin</artifactId>
-        <version>8.1.1</version>
+        <version>11.11.1</version>
        <executions>
          <execution>
            <id>test</id>
            <phase>process-test-classes</phase>
            <configuration>
-              <classSource>target/test-classes</classSource>
              <transformArgs>debug=1</transformArgs>
            </configuration>
            <goals>
-              <goal>enhance</goal>
+              <goal>testEnhance</goal>
            </goals>
          </execution>
        </executions>
@@ -263,6 +330,11 @@
              <name>datasource.default</name>
              <value>${datasource.default}</value>
            </property>
+            <property>
+              <!-- transfer dbClockDelta parameter -->
+              <name>dbClockDelta</name>
+              <value>${dbClockDelta}</value>
+            </property>
          </systemProperties>
        </configuration>
      </plugin>
@@ -283,11 +355,11 @@
        <artifactId>maven-javadoc-plugin</artifactId>
        <version>2.9.1</version>
        <configuration>
-          <doctitle>Ebean 9</doctitle>
-          <overview>src/main/java/com/avaje/ebean/overview.html</overview>
+          <doctitle>Ebean 10</doctitle>
+          <overview>src/main/java/io/ebean/overview.html</overview>
          <source>1.8</source>
          <doclet>org.avaje.doclet.PygmentsDoclet</doclet>
-          <excludePackageNames>com.avaje.ebeaninternal.*:com.avaje.ebean.util:com.avaje.ebean.dbmigration.ddlgeneration:com.avaje.ebean.dbmigration.migration:com.avaje.ebean.dbmigration.migrationreader:com.avaje.ebean.dbmigration.model</excludePackageNames>
+          <excludePackageNames>io.ebeaninternal.*:com.avaje.ebean.util</excludePackageNames>
          <docletArtifact>
            <groupId>org.avaje</groupId>
            <artifactId>pygments-doclet</artifactId>
@@ -1,888 +0,0 @@
-package com.avaje.ebean;
-
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebean.util.ClassUtil;
-import org.jetbrains.annotations.Nullable;
-
-import javax.persistence.MappedSuperclass;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-/**
- * A MappedSuperclass base class that provides convenience methods for inserting, updating and
- * deleting beans.
- * <p>
- * By having your entity beans extend this it provides a 'Active Record' style programming model for
- * Ebean users.
- * <p>
- * Note that there is a avaje-ebeanorm-mocker project that enables you to use Mockito or similar
- * tools to still mock out the underlying 'default EbeanServer' for testing purposes.
- * <p>
- * You may choose not use this Model mapped superclass if you don't like the 'Active Record' style
- * or if you believe it 'pollutes' your entity beans.
- * <p>
- * You can use Dependency Injection like Guice or Spring to construct and wire a EbeanServer instance
- * and have that same instance used with this Model and Finder. The way that works is that when the
- * DI container creates the EbeanServer instance it can be registered with the Ebean singleton. In this
- * way the EbeanServer instance can be injected as per normal Guice / Spring dependency injection and
- * that same instance also used to support the Model and Finder active record style.
- * <p>
- * If you choose to use the Model mapped superclass you will probably also chose to additionally add
- * a {@link Find} as a public static field to complete the active record pattern and provide a
- * relatively nice clean way to write queries.
- * <p>
- * <h3>Typical common @MappedSuperclass</h3>
- * <pre>{@code
- *
- *     // Typically there is a common base model that has some
- *     // common properties like the ones below
- *
- *     @MappedSuperclass
- *     public class BaseModel extends Model {
- *
- *       @Id Long id;
- *
- *       @Version Long version;
- *
- *       @CreatedTimestamp Timestamp whenCreated;
- *
- *       @UpdatedTimestamp Timestamp whenUpdated;
- *
- *       ...
- *
- * }</pre>
- * <p>
- * <h3>Extend the Model</h3>
- * <pre>{@code
- *
- *     // Extend the mappedSuperclass
- *
- *     @Entity @Table(name="oto_account")
- *     public class Customer extends BaseModel {
- *
- *       // Add a static Find
- *       // ... with Long being the type of our @Id property.
- *       // ... Note the {} at the end as Find is an abstract class.
- *
- *       public static final Find<Long,Account> find = new Find<Long,Account>(){};
- *
- *       String name;
- *       ...
- *     }
- *
- * }</pre>
- * <p>
- * <h3>Modal: save()</h3>
- * <pre>{@code
- *
- *     // Active record style ... save(), delete() etc
- *     Customer customer = new Customer();
- *     customer.setName("AC234");
- *
- *     // save() method inherited from Model
- *     customer.save();
- *
- * }</pre>
- * <p>
- * <h3>Find byId</h3>
- * <pre>{@code
- *
- *     // find byId
- *     Customer customer = Customer.find.byId(42);
- *
- * }</pre>
- * <p>
- * <h3>Find where</h3>
- * <pre>{@code
- *
- *     // find where ...
- *     List<Customer> customers =
- *         Customer.find
- *         .where().gt("startDate", lastMonth)
- *         .findList();
- *
- * }</pre>
- */
-@MappedSuperclass
-public abstract class Model {
-
-  /**
-   * Return the underlying 'default' EbeanServer.
-   * <p>
-   * This provides full access to the API such as explicit transaction demarcation etc.
-   * <p>
-   * Example:
-   * <pre>{@code
-   *
-   * Transaction transaction = Customer.db().beginTransaction();
-   * try {
-   *
-   *   // turn off cascade persist for this transaction
-   *   transaction.setPersistCascade(false);
-   *
-   *   // extra control over jdbc batching for this transaction
-   *   transaction.setBatchGetGeneratedKeys(false);
-   *   transaction.setBatchMode(true);
-   *   transaction.setBatchSize(20);
-   *
-   *   Customer customer = new Customer();
-   *   customer.setName(&quot;Roberto&quot;);
-   *   customer.save();
-   *
-   *   Customer otherCustomer = new Customer();
-   *   otherCustomer.setName("Franko");
-   *   otherCustomer.save();
-   *
-   *   transaction.commit();
-   *
-   * } finally {
-   *   transaction.end();
-   * }
-   *
-   * }</pre>
-   */
-  public static EbeanServer db() {
-    return Ebean.getDefaultServer();
-  }
-
-  /**
-   * Return a named EbeanServer that is typically different to the default server.
-   * <p>
-   * If you are using multiple databases then each database has a name and maps to a single
-   * EbeanServer. You can use this method to get an EbeanServer for another database.
-   *
-   * @param server The name of the EbeanServer. If this is null then the default EbeanServer is returned.
-   */
-  public static EbeanServer db(String server) {
-    return Ebean.getServer(server);
-  }
-
-  /**
-   * Marks the entity bean as dirty.
-   * <p>
-   * This is used so that when a bean that is otherwise unmodified is updated the version
-   * property is updated.
-   * <p>
-   * An unmodified bean that is saved or updated is normally skipped and this marks the bean as
-   * dirty so that it is not skipped.
-   * <p>
-   * <pre>{@code
-   *
-   * Customer customer = Customer.find.byId(id);
-   *
-   * // mark the bean as dirty so that a save() or update() will
-   * // increment the version property
-   * customer.markAsDirty();
-   * customer.save();
-   *
-   * }</pre>
-   *
-   * @see EbeanServer#markAsDirty(Object)
-   */
-  public void markAsDirty() {
-    db().markAsDirty(this);
-  }
-
-  /**
-   * Mark the property as unset or 'not loaded'.
-   * <p>
-   * This would be used to specify a property that we did not wish to include in a stateless update.
-   * </p>
-   * <pre>{@code
-   *
-   *   // populate an entity bean from JSON or whatever
-   *   User user = ...;
-   *
-   *   // mark the email property as 'unset' so that it is not
-   *   // included in a 'stateless update'
-   *   user.markPropertyUnset("email");
-   *
-   *   user.update();
-   *
-   * }</pre>
-   *
-   * @param propertyName the name of the property on the bean to be marked as 'unset'
-   */
-  public void markPropertyUnset(String propertyName) {
-    ((EntityBean) this)._ebean_getIntercept().setPropertyLoaded(propertyName, false);
-  }
-
-  /**
-   * Insert or update this entity depending on its state.
-   * <p>
-   * Ebean will detect if this is a new bean or a previously fetched bean and perform either an
-   * insert or an update based on that.
-   *
-   * @see EbeanServer#save(Object)
-   */
-  public void save() {
-    db().save(this);
-  }
-
-  /**
-   * Update this entity.
-   *
-   * @see EbeanServer#update(Object)
-   */
-  public void update() {
-    db().update(this);
-  }
-
-  /**
-   * Insert this entity.
-   *
-   * @see EbeanServer#insert(Object)
-   */
-  public void insert() {
-    db().insert(this);
-  }
-
-  /**
-   * Delete this bean.
-   * <p>
-   * This will return true if the bean was deleted successfully or JDBC batch is being used.
-   * </p>
-   * <p>
-   * If there is no current transaction one will be created and committed for
-   * you automatically.
-   * </p>
-   * <p>
-   * If the Bean does not have a version property (or loaded version property) and
-   * the bean does not exist then this returns false indicating that nothing was
-   * deleted. Note that, if JDBC batch mode is used then this always returns true.
-   * </p>
-   *
-   * @see EbeanServer#delete(Object)
-   */
-  public boolean delete() {
-    return db().delete(this);
-  }
-
-  /**
-   * Delete a bean permanently without soft delete.
-   * <p>
-   * This is used when the bean contains a <code>@SoftDelete</code> property and we
-   * want to perform a hard/permanent delete.
-   * </p>
-   *
-   * @see EbeanServer#deletePermanent(Object)
-   */
-  public boolean deletePermanent() {
-    return db().deletePermanent(this);
-  }
-
-  /**
-   * Perform an update using this entity against the specified server.
-   */
-  public void update(String server) {
-    db(server).update(this);
-  }
-
-  /**
-   * Perform an insert using this entity against the specified server.
-   */
-  public void insert(String server) {
-    db(server).insert(this);
-  }
-
-  /**
-   * Perform a delete using this entity against the specified server.
-   */
-  public boolean delete(String server) {
-    return db(server).delete(this);
-  }
-
-  /**
-   * Refreshes this entity from the database.
-   *
-   * @see EbeanServer#refresh(Object)
-   */
-  public void refresh() {
-    db().refresh(this);
-  }
-
-  /**
-   * A concrete implementation of Find.
-   * <p>
-   * It should be preferred to use {@link Find} instead of Finder as that can use reflection to determine the class
-   * literal type of the entity bean.
-   * </p>
-   *
-   * @param <I> type of the Id property
-   * @param <T> type of the entity bean
-   */
-  public static class Finder<I, T> extends Find<I, T> {
-
-    /**
-     * Create with the type of the entity bean.
-     * <p>
-     * <pre>{@code
-     *
-     * @Entity
-     * public class Customer extends BaseModel {
-     *
-     *   public static final Finder<Long,Customer> find = new Finder<Long,Customer>(Customer.class);
-     *   ...
-     *
-     * }</pre>
-     * <p>
-     * <p/>
-     * The preferred approach is to instead use <code>Find</code> as below. This approach is more DRY in that it does
-     * not require the class literal Customer.class to be passed into the constructor.
-     * <p>
-     * <pre>{@code
-     *
-     * @Entity
-     * public class Customer extends BaseModel {
-     *
-     *   public static final Find<Long,Customer> find = new Find<Long,Customer>(){};
-     *   ...
-     *
-     * }</pre>
-     */
-    public Finder(Class<T> type) {
-      super(null, type);
-    }
-
-    /**
-     * Create with the type of the entity bean and specific server name.
-     */
-    public Finder(String serverName, Class<T> type) {
-      super(serverName, type);
-    }
-
-  }
-
-  /**
-   * Helper object for performing queries.
-   * <p>
-   * <p>
-   * Typically a Find instance is defined as a public static field on an entity bean class to provide a
-   * nice way to write queries.
-   * <p>
-   * <h3>Example use:</h3>
-   * <p>
-   * <pre>{@code
-   *
-   * @Entity
-   * public class Customer extends BaseModel {
-   *
-   *   public static final Find<Long,Customer> find = new Find<Long,Customer>(){};
-   *
-   *   ...
-   *
-   * }</pre>
-   * <p/>
-   * This enables you to write code like:
-   * <pre>{@code
-   *
-   * Customer customer = Customer.find.byId(42L);
-   *
-   * List<Customer> customers =
-   *     Customer.find
-   *         .select("name, dateOfBirth")
-   *         .findList();
-   *
-   * }</pre>
-   * <p>
-   * <h3>Kotlin</h3>
-   * In Kotlin you would typically create Find as a companion object.
-   * <pre>{@code
-   *
-   *   // kotlin
-   *   companion object : Model.Find<Long, Product>() {}
-   *
-   * }</pre>
-   *
-   * @param <I> The Id type. This is most often a {@link Long} but is also often a {@link UUID} or
-   *            {@link String}.
-   * @param <T> The entity bean type
-   */
-  public static abstract class Find<I, T> {
-
-    /**
-     * The entity bean type.
-     */
-    private final Class<T> type;
-
-    /**
-     * The name of the EbeanServer, null for the default server.
-     */
-    private final String serverName;
-
-    /**
-     * Creates a finder for entity of type <code>T</code> with ID of type <code>I</code>.
-     * <p/>
-     * Typically you create Find as a public static field on each entity bean as the example below.
-     * <p>
-     * <p/>
-     * Note that Find is an abstract class and hence <code>{}</code> is required. This is done so
-     * that the type (class literal) of the entity bean can be derived from the generics parameter.
-     * <p>
-     * <pre>{@code
-     *
-     * @Entity
-     * public class Customer extends BaseModel {
-     *
-     *   // Note the trailing {} as Find is an abstract class.
-     *   // We do this so that we can derive the type literal Customer.class
-     *   // via reflection
-     *   public static final Find<Long,Customer> find = new Find<Long,Customer>(){};
-     *   ...
-     *
-     * }</pre>
-     * <p/>
-     * This enables you to write code like:
-     * <pre>{@code
-     *
-     * Customer customer = Customer.find.byId(42L);
-     *
-     * List<Customer> customers =
-     *     Customer.find
-     *        .select("name, email, dateOfBirth")
-     *        .findList();
-     *
-     * }</pre>
-     * <p>
-     * <h3>Kotlin</h3>
-     * In Kotlin you would typically create it as a companion object.
-     * <p>
-     * <pre>{@code
-     *
-     *   // kotlin
-     *   companion object : Model.Find<Long, Product>() {}
-     *
-     * }</pre>
-     */
-    @SuppressWarnings("unchecked")
-    public Find() {
-      this.serverName = null;
-      this.type = (Class<T>) ClassUtil.getSecondArgumentType(getClass());
-    }
-
-    /**
-     * Construct passing the class literal type of the entity type.
-     */
-    protected Find(String serverName, Class<T> type) {
-      this.serverName = serverName;
-      this.type = type;
-    }
-
-    /**
-     * Return the underlying 'default' EbeanServer.
-     * <p>
-     * <p>
-     * This provides full access to the API such as explicit transaction demarcation etc.
-     */
-    public EbeanServer db() {
-      return Ebean.getServer(serverName);
-    }
-
-    /**
-     * Return typically a different EbeanServer to the default.
-     * <p>
-     * This is equivalent to {@link Ebean#getServer(String)}
-     *
-     * @param server The name of the EbeanServer. If this is null then the default EbeanServer is
-     *               returned.
-     */
-    public EbeanServer db(String server) {
-      return Ebean.getServer(server);
-    }
-
-    /**
-     * Creates a Finder for the named EbeanServer.
-     * <p>
-     * <p>
-     * Create and return a new Finder for a different server.
-     */
-    public Finder<I, T> on(String server) {
-      return new Finder<>(server, type);
-    }
-
-    /**
-     * Delete a bean by Id.
-     * <p>
-     * Equivalent to {@link EbeanServer#delete(Class, Object)}
-     */
-    public void deleteById(I id) {
-      db().delete(type, id);
-    }
-
-    /**
-     * Retrieves all entities of the given type.
-     * <p>
-     * <p>
-     * This is the same as (synonym for) {@link #findList()}
-     */
-    public List<T> all() {
-      return findList();
-    }
-
-    /**
-     * Retrieves an entity by ID.
-     * <p>
-     * <p>
-     * Equivalent to {@link EbeanServer#find(Class, Object)}
-     */
-    @Nullable
-    public T byId(I id) {
-      return db().find(type, id);
-    }
-
-    /**
-     * Creates an entity reference for this ID.
-     * <p>
-     * <p>
-     * Equivalent to {@link EbeanServer#getReference(Class, Object)}
-     */
-    public T ref(I id) {
-      return db().getReference(type, id);
-    }
-
-    /**
-     * Creates a filter for sorting and filtering lists of entities locally without going back to
-     * the database.
-     * <p>
-     * Equivalent to {@link EbeanServer#filter(Class)}
-     */
-    public Filter<T> filter() {
-      return db().filter(type);
-    }
-
-    /**
-     * Creates a query.
-     * <p>
-     * Equivalent to {@link EbeanServer#find(Class)}
-     */
-    public Query<T> query() {
-      return db().find(type);
-    }
-
-    /**
-     * Creates a query applying the path properties to set the select and fetch clauses.
-     * <p>
-     * Equivalent to {@link Query#apply(FetchPath)}
-     */
-    public Query<T> apply(FetchPath fetchPath) {
-      return db().find(type).apply(fetchPath);
-    }
-
-    /**
-     * Returns the next identity value.
-     *
-     * @see EbeanServer#nextId(Class)
-     */
-    @SuppressWarnings("unchecked")
-    public I nextId() {
-      return (I) db().nextId(type);
-    }
-
-    /**
-     * Executes a query and returns the results as a list of IDs.
-     * <p>
-     * Equivalent to {@link Query#findIds()}
-     */
-    public <A> List<A> findIds() {
-      return query().findIds();
-    }
-
-    /**
-     * Execute the query consuming each bean one at a time.
-     * <p>
-     * This is generally used to process large queries where unlike findList
-     * you do not want to hold all the results in memory at once but instead
-     * process them one at a time (requiring far less memory).
-     * </p>
-     * Equivalent to {@link Query#findEach(Consumer)}
-     */
-    public void findEach(Consumer<T> consumer) {
-      query().findEach(consumer);
-    }
-
-    /**
-     * Execute the query consuming each bean one at a time.
-     * <p>
-     * Equivalent to {@link Query#findEachWhile(Predicate)}
-     * <p>
-     * This is similar to #findEach except that you return boolean
-     * true to continue processing beans and return false to stop
-     * processing early.
-     * </p>
-     * <p>
-     * This is generally used to process large queries where unlike findList
-     * you do not want to hold all the results in memory at once but instead
-     * process them one at a time (requiring far less memory).
-     * </p>
-     * Equivalent to {@link Query#findEachWhile(Predicate)}
-     */
-    public void findEachWhile(Predicate<T> consumer) {
-      query().findEachWhile(consumer);
-    }
-
-    /**
-     * Retrieves all entities of the given type.
-     * <p>
-     * The same as {@link #all()}
-     * <p>
-     * Equivalent to {@link Query#findList()}
-     */
-    public List<T> findList() {
-      return query().findList();
-    }
-
-    /**
-     * Returns all the entities of the given type as a set.
-     * <p>
-     * Equivalent to {@link Query#findSet()}
-     */
-    public Set<T> findSet() {
-      return query().findSet();
-    }
-
-    /**
-     * Retrieves all entities of the given type as a map of objects.
-     * <p>
-     * Equivalent to {@link Query#findMap()}
-     */
-    public <K> Map<K, T> findMap() {
-      return query().findMap();
-    }
-
-    /**
-     * Executes a find row count query in a background thread.
-     * <p>
-     * Equivalent to {@link Query#findFutureCount()}
-     */
-    public FutureRowCount<T> findFutureCount() {
-      return query().findFutureCount();
-    }
-
-    /**
-     * Deprecated in favor of findFutureCount().
-     * <p>
-     * Equivalent to {@link Query#findFutureCount()}
-     */
-    public FutureRowCount<T> findFutureRowCount() {
-      return query().findFutureCount();
-    }
-
-    /**
-     * Returns the total number of entities for this type. *
-     * <p>
-     * Equivalent to {@link Query#findCount()}
-     */
-    public int findCount() {
-      return query().findCount();
-    }
-
-    /**
-     * Deprecated in favor of findCount().
-     *
-     * @deprecated
-     */
-    public int findRowCount() {
-      return query().findCount();
-    }
-
-    /**
-     * Returns the <code>ExpressionFactory</code> used by this query.
-     */
-    public ExpressionFactory getExpressionFactory() {
-      return query().getExpressionFactory();
-    }
-
-    /**
-     * Explicitly sets a comma delimited list of the properties to fetch on the 'main' entity bean,
-     * to load a partial object.
-     * <p>
-     * Equivalent to {@link Query#select(String)}
-     */
-    public Query<T> select(String fetchProperties) {
-      return query().select(fetchProperties);
-    }
-
-    /**
-     * Specifies a path to load including all its properties.
-     * <p>
-     * Equivalent to {@link Query#fetch(String)}
-     */
-    public Query<T> fetch(String path) {
-      return query().fetch(path);
-    }
-
-    /**
-     * Additionally specifies a <code>FetchConfig</code> to specify a 'query join' and/or define the
-     * lazy loading query.
-     * <p>
-     * Equivalent to {@link Query#fetch(String, FetchConfig)}
-     */
-    public Query<T> fetch(String path, FetchConfig joinConfig) {
-      return query().fetch(path, joinConfig);
-    }
-
-    /**
-     * Specifies a path to fetch with a specific list properties to include, to load a partial
-     * object.
-     * <p>
-     * Equivalent to {@link Query#fetch(String, String)}
-     */
-    public Query<T> fetch(String path, String fetchProperties) {
-      return query().fetch(path, fetchProperties);
-    }
-
-    /**
-     * Additionally specifies a <code>FetchConfig</code> to use a separate query or lazy loading to
-     * load this path.
-     * <p>
-     * Equivalent to {@link Query#fetch(String, String, FetchConfig)}
-     */
-    public Query<T> fetch(String assocProperty, String fetchProperties, FetchConfig fetchConfig) {
-      return query().fetch(assocProperty, fetchProperties, fetchConfig);
-    }
-
-    /**
-     * Adds expressions to the <code>where</code> clause with the ability to chain on the
-     * <code>ExpressionList</code>.
-     * <p>
-     * Equivalent to {@link Query#where()}
-     */
-    public ExpressionList<T> where() {
-      return query().where();
-    }
-
-    /**
-     * Returns the <code>order by</code> clause so that you can append an ascending or descending
-     * property to the <code>order by</code> clause.
-     * <p>
-     * This is exactly the same as {@link #orderBy}.
-     * <p>
-     * Equivalent to {@link Query#order()}
-     */
-    public OrderBy<T> order() {
-      return query().order();
-    }
-
-    /**
-     * Sets the <code>order by</code> clause, replacing the existing <code>order by</code> clause if
-     * there is one.
-     * <p>
-     * This is exactly the same as {@link #orderBy(String)}.
-     */
-    public Query<T> order(String orderByClause) {
-      return query().order(orderByClause);
-    }
-
-    /**
-     * Returns the <code>order by</code> clause so that you can append an ascending or descending
-     * property to the <code>order by</code> clause.
-     * <p>
-     * This is exactly the same as {@link #order}.
-     * <p>
-     * Equivalent to {@link Query#orderBy()}
-     */
-    public OrderBy<T> orderBy() {
-      return query().orderBy();
-    }
-
-    /**
-     * Set the <code>order by</code> clause replacing the existing <code>order by</code> clause if
-     * there is one.
-     * <p>
-     * This is exactly the same as {@link #order(String)}.
-     */
-    public Query<T> orderBy(String orderByClause) {
-      return query().orderBy(orderByClause);
-    }
-
-    /**
-     * Sets the first row to return for this query.
-     * <p>
-     * Equivalent to {@link Query#setFirstRow(int)}
-     */
-    public Query<T> setFirstRow(int firstRow) {
-      return query().setFirstRow(firstRow);
-    }
-
-    /**
-     * Sets the maximum number of rows to return in the query.
-     * <p>
-     * Equivalent to {@link Query#setMaxRows(int)}
-     */
-    public Query<T> setMaxRows(int maxRows) {
-      return query().setMaxRows(maxRows);
-    }
-
-    /**
-     * Sets the ID value to query.
-     * <p>
-     * <p>
-     * Use this to perform a find byId query but with additional control over the query such as
-     * using select and fetch to control what parts of the object graph are returned.
-     * <p>
-     * Equivalent to {@link Query#setId(Object)}
-     */
-    public Query<T> setId(Object id) {
-      return query().setId(id);
-    }
-
-    /**
-     * Create and return a new query based on the <code>RawSql</code>.
-     * <p>
-     * Equivalent to {@link Query#setRawSql(RawSql)}
-     */
-    public Query<T> setRawSql(RawSql rawSql) {
-      return query().setRawSql(rawSql);
-    }
-
-    /**
-     * Create a query with explicit 'AutoTune' use.
-     */
-    public Query<T> setAutoTune(boolean autoTune) {
-      return query().setAutoTune(autoTune);
-    }
-
-    /**
-     * Create a query with the select with "for update" specified.
-     * <p>
-     * <p>
-     * This will typically create row level database locks on the selected rows.
-     */
-    public Query<T> setForUpdate(boolean forUpdate) {
-      return query().setForUpdate(forUpdate);
-    }
-
-    /**
-     * Create a query specifying whether the returned beans will be read-only.
-     */
-    public Query<T> setReadOnly(boolean readOnly) {
-      return query().setReadOnly(readOnly);
-    }
-
-    /**
-     * Create a query specifying if the beans should be loaded into the L2 cache.
-     */
-    public Query<T> setLoadBeanCache(boolean loadBeanCache) {
-      return query().setLoadBeanCache(loadBeanCache);
-    }
-
-    /**
-     * Create a query specifying if the L2 bean cache should be used.
-     */
-    public Query<T> setUseCache(boolean useBeanCache) {
-      return query().setUseCache(useBeanCache);
-    }
-
-    /**
-     * Create a query specifying if the L2 query cache should be used.
-     */
-    public Query<T> setUseQueryCache(boolean useQueryCache) {
-      return query().setUseQueryCache(useQueryCache);
-    }
-
-  }
-}
@@ -1,47 +0,0 @@
-package com.avaje.ebean;
-
-/**
- * Execute a TxCallable in a Transaction scope.
- * <p>
- * Use this with the {@link Ebean#execute(TxCallable)} method.
- * </p>
- * <p>
- * Note that this is basically the same as TxRunnable except that it returns an
- * Object (and you specify the return type via generics).
- * </p>
- * <p>
- * See also {@link TxRunnable}.
- * </p>
- * <p>
- * <pre>{@code
- *
- * Ebean.execute(new TxCallable<String>() {
- *   public String call() {
- *     User u1 = Ebean.find(User.class, 1);
- *     User u2 = Ebean.find(User.class, 2);
- *
- *     u1.setName("u1 mod");
- *     u2.setName("u2 mod");
- *
- *     Ebean.save(u1);
- *     Ebean.save(u2);
- *
- *     return u1.getEmail();
- *   }
- * });
- *
- * }</pre>
- *
- * @see TxRunnable
- */
-public interface TxCallable<T> {
-
-  /**
-   * Execute the method within a transaction scope returning the result.
-   * <p>
-   * If you do not want to return a result you should look to use TxRunnable
-   * instead.
-   * </p>
-   */
-  T call();
-}
@@ -1,40 +0,0 @@
-package com.avaje.ebean;
-
-/**
- * Execute a TxRunnable in a Transaction scope.
- * <p>
- * Use this with the {@link Ebean#execute(TxRunnable)} method.
- * </p>
- * <p>
- * See also {@link TxCallable}.
- * </p>
- * <p>
- * <pre>{@code
- *
- * // this run method runs in a transaction scope
- * // which by default is TxScope.REQUIRED
- *
- * Ebean.execute(new TxRunnable() {
- *   public void run() {
- *     User u1 = Ebean.find(User.class, 1);
- *     User u2 = Ebean.find(User.class, 2);
- *
- *     u1.setName("u1 mod");
- *     u2.setName("u2 mod");
- *
- *     Ebean.save(u1);
- *     Ebean.save(u2);
- *   }
- * });
- *
- * }</pre>
- *
- * @see TxCallable
- */
-public interface TxRunnable {
-
-  /**
-   * Run the method in a transaction sope.
-   */
-  void run();
-}
@@ -1,119 +0,0 @@
-package com.avaje.ebean.annotation;
-
-import com.avaje.ebean.Query;
-import com.avaje.ebean.config.Platform;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Assign to a property to be based on a SQL formula.
- * <p>
- * This is typically a SQL Literal value, SQL case statement, SQL function or
- * similar.
- * </p>
- * <p>
- * Any property based on a formula becomes a read only property.
- * </p>
- * <p>
- * You may also put use the Transient annotation with the Formula annotation.
- * The effect of the Transient annotation in this case is that the formula will
- * <b>NOT</b> be included in queries by default - you have to explicitly include
- * it via {@link Query#select(String)} or {@link Query#fetch(String, String, com.avaje.ebean.FetchConfig)}.
- * You may want to do this if the Formula is relatively expensive and only want
- * it included in the query when you explicitly state it.
- * </p>
- * <p>
- * <pre>{@code
- * // On the Order "master" bean
- * // ... a formula using the Order details
- * // ... sum(order_qty*unit_price)
- * @Transient
- * @Formula(select = "_b${ta}.total_amount", join = "join (select order_id, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) as _b${ta} on _b${ta}.order_id = ${ta}.id")
- * Double totalAmount;
- *
- * }</pre>
- * <p>
- * As the totalAmount formula is also Transient it is not included by default in
- * queries - it needs to be explicitly included.
- * </p>
- * <pre>{@code
- *
- * // find by Id
- * Order o1 = Ebean.find(Order.class)
- *     .select("id, totalAmount")
- *     .setId(1).findUnique();
- *
- * // find list ... using totalAmount in the where clause
- * List<Order> list = Ebean.find(Order.class)
- *     .select("id, totalAmount")
- *     .where()
- *     .eq("status", Order.Status.NEW)
- *     .gt("totalAmount", 10)
- *     .findList();
- *
- * // as a join from customer
- * List<Customer> l0 = Ebean.find(Customer.class)
- *     .select("id, name")
- *     .fetch("orders", "status, totalAmount")
- *     .where()
- *     .gt("id", 0)
- *     .gt("orders.totalAmount", 10)
- *     .findList();
- *
- * }</pre>
- */
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Repeatable(Formula.List.class)
-public @interface Formula {
-
-  /**
-   * The SQL to be used in the SELECT part of the SQL to populate a property.
-   */
-  String select();
-
-  /**
-   * OPTIONAL - the SQL to be used in the JOIN part of the SQL to support the
-   * formula.
-   * <p>
-   * This is commonly used to join a 'dynamic view' to support aggregation such
-   * as count, sum etc.
-   * </p>
-   * <p>
-   * The join string should start with either "left join" or "join".
-   * </p>
-   * <p>
-   * You will almost certainly use the "${ta}" as a place holder for the table
-   * alias of the table you are joining back to (the "base table" of the entity
-   * bean).
-   * </p>
-   * <p>
-   * The example below is used to support a total count of topics created by a
-   * user.
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   * join (select user_id, count(*) as topic_count from f_topic group by user_id) as _tc on _tc.user_id = ${ta}.id
-   *
-   * }</pre>
-   */
-  String join() default "";
-
-  Platform[] platforms() default {};
-
-  /**
-   * Repeatable support for {@link Formula}.
-   */
-  @Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE })
-  @Retention(RetentionPolicy.RUNTIME)
-  @interface List {
-
-    Formula[] value() default {};
-  }
-
-}
@@ -1,138 +0,0 @@
-package com.avaje.ebean.annotation;
-
-import com.avaje.ebean.TxIsolation;
-import com.avaje.ebean.TxType;
-import com.avaje.ebean.config.PersistBatch;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Specify transaction scoping for a method.
- * <p>
- * <b><i> This is only supported if "Enhancement" is used via javaagent, ANT
- * task or IDE enhancement plugin etc. </i></b>
- * </p>
- * <p>
- * Note: Currently there are 3 known annotations that perform this role.
- * <ul>
- * <li>EJB's javax.ejb.TransactionAttribute</li>
- * <li>Spring's org.springframework.transaction.annotation.Transactional</li>
- * <li>and this one, Ebean's own com.avaje.ebean.annotation.Transactional</li>
- * </ul>
- * Spring created their one because the EJB annotation does not support features
- * such as isolation level and specifying rollbackOn, noRollbackOn exceptions.
- * This one exists for Ebean because I agree that the standard one is
- * insufficient and don't want to include a dependency on Spring.
- * </p>
- * <p>
- * The default behaviour of EJB (and hence Spring) is to NOT ROLLBACK on checked
- * exceptions. I find this very counter-intuitive. Ebean will provide a property
- * to set the default behaviour to rollback on any exception and optionally
- * change the setting to be consistent with EJB/Spring if people wish to do so.
- * </p>
- * <p>
- * <pre>{@code
- *
- *  // a normal class
- *  public class MySimpleUserService {
- *
- *    // this method is transactional automatically handling
- *    // transaction begin, commit and rollback etc
- *    @Transactional
- *    public void runInTrans() throws IOException {
- *
- *      // tasks performed within the transaction
- *      ...
- *      // find some objects
- *      Customer cust = ebeanServer.find(Customer.class, 42);
- *
- *      Order order = ...;
- *      ...
- *      // save some objects
- *      ebeanServer.save(customer);
- *      ebeanServer.save(order);
- *    }
- *
- * }</pre>
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Transactional {
-
-  /**
-   * The type of transaction scoping. Defaults to REQUIRED.
-   */
-  TxType type() default TxType.REQUIRED;
-
-  /**
-   * Persist batch mode for the transaction.
-   */
-  PersistBatch batch() default PersistBatch.INHERIT;
-
-  /**
-   * Persist batch mode for the request if not set on the transaction.
-   * <p>
-   * If batch is set to NONE then batchOnCascade can be set to INSERT or ALL
-   * and then each save(), delete(), insert(), update() request that cascades
-   * to child beans can use JDBC batch.
-   * </p>
-   */
-  PersistBatch batchOnCascade() default PersistBatch.INHERIT;
-
-  /**
-   * The batch size to use when using JDBC batch mode.
-   * <p>
-   * If unset this defaults to the value set in ServerConfig.
-   * </p>
-   */
-  int batchSize() default 0;
-
-  /**
-   * Set to false when we want to skip getting generatedKeys.
-   * <p>
-   * This is typically used in the case of large batch inserts where we get a
-   * performance benefit from not calling getGeneratedKeys (as we are going to
-   * insert a lot of rows and have no need for the Id values after the insert).
-   * </p>
-   */
-  boolean getGeneratedKeys() default true;
-
-  /**
-   * The transaction isolation level this transaction should have.
-   * <p>
-   * This will only be used if this scope creates the transaction. If the
-   * transaction has already started then this will currently be ignored (you
-   * could argue that it should throw an exception).
-   * </p>
-   */
-  TxIsolation isolation() default TxIsolation.DEFAULT;
-
-  /**
-   * Set this to true if the transaction should be only contain queries.
-   */
-  boolean readOnly() default false;
-
-  /**
-   * The name of the server that you want the transaction to be created from.
-   * <p>
-   * If left blank the 'default' server is used.
-   * </p>
-   */
-  String serverName() default "";
-
-  // int timeout() default 0;
-
-  /**
-   * The Throwable's that will explicitly cause a rollback to occur.
-   */
-  Class<? extends Throwable>[] rollbackFor() default {};
-
-  /**
-   * The Throwable's that will explicitly NOT cause a rollback to occur.
-   */
-  Class<? extends Throwable>[] noRollbackFor() default {};
-
-}
@@ -1,68 +0,0 @@
-package com.avaje.ebean.annotation;
-
-import com.avaje.ebean.config.Platform;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Add an Literal to add to the where clause when a many property (List, Set or
- * Map) is loaded or refreshed.
- * <pre>{@code
- *
- * // on a OneToMany property...
- *
- * @OneToMany
- * @Where(clause = "deleted='y'")
- * List<Topic> topics;
- *
- * }</pre>
- * <p>
- * Note that you can include "${ta}" as a place holder for the table alias if
- * you need to include the table alias in the clause.
- * </p>
- * <pre>{@code
- * // ... including the ${ta} table alias placeholder...
- *
- * @OneToMany
- * @Where(clause = "${ta}.deleted='y'")
- * List<Topic> topics;
- *
- * }</pre>
- * <p>
- * This will be added to the where clause when lazy loading the OneToMany
- * property or when there is a join to that OneToMany property.
- * </p>
- */
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Repeatable(Where.List.class)
-public @interface Where {
-
-  /**
-   * The clause added to the lazy load query.
-   * <p>
-   * Note that you can include "${ta}" as a place holder for the table alias if
-   * you need to include the table alias in the clause.
-   * </p>
-   */
-  String clause();
-
-  /**
-   * The platform where this annotation is active. Default: any platform
-   */
-  Platform[] platforms() default {};
-
-  /**
-   * Repeatable support for {@link Where}.
-   */
-  @Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE })
-  @Retention(RetentionPolicy.RUNTIME)
-  @interface List {
-
-    Where[] value() default {};
-  }
-}
@@ -1,42 +0,0 @@
-package com.avaje.ebean.config;
-
-/**
- * API from creating and getting property values from an Immutable Compound
- * Value Object.
- * <p>
- * A Compound Value object should contain multiple properties that are stored
- * separately. If you only have a single scalar value you should instead look to
- * use {@link ScalarTypeConverter}.
- * </p>
- * <p>
- * For each property in the compound type you need to implement the
- * {@link CompoundTypeProperty} interface. These must be returned from
- * {@link #getProperties()} in the same order that the properties appear in the
- * constructor.
- * </p>
- * <p>
- * If your compound type is mutable then you should look to use the JPA Embedded
- * annotation instead of implementing this interface.
- * </p>
- * <p>
- * When using classpath search Ebean will detect and automatically register any
- * implementations of this interface (along with detecting the entity classes
- * etc).
- * </p>
- *
- * @param <V> The type of the Value Object
- * @author rbygrave
- * @see ScalarTypeConverter
- */
-public interface CompoundType<V> {
-
-  /**
-   * Create an instance of the compound type given its property values.
-   */
-  V create(Object[] propertyValues);
-
-  /**
-   * Return the properties in the order they appear in the constructor.
-   */
-  CompoundTypeProperty<V, ?>[] getProperties();
-}
@@ -1,45 +0,0 @@
-package com.avaje.ebean.config;
-
-/**
- * Represents a Property of a Compound Value Object.
- * <p>
- * For each property in a {@link CompoundType} you need an implementation of
- * this CompoundTypeProperty interface.
- * </p>
- *
- * @param <V> The type of the Compound value object
- * @param <P> The type of the property
- * @author rbygrave
- * @see CompoundType
- * @see ScalarTypeConverter
- */
-public interface CompoundTypeProperty<V, P> {
-
-  /**
-   * The name of this property.
-   */
-  String getName();
-
-  /**
-   * Return the property value from the containing compound value object.
-   *
-   * @param valueObject the compound value object
-   * @return the property value.
-   */
-  P getValue(V valueObject);
-
-  /**
-   * This should <b>ONLY</b> be used when the persistence type is different from
-   * the logical type returned. It most cases just return 0 and Ebean will
-   * persist the logical type.
-   * <p>
-   * Typically this should be used when the logical type is long but the
-   * persistence type is java.sql.Timestamp. In this case return
-   * java.sql.Types.TIMESTAMP (rather than 0).
-   * </p>
-   *
-   * @return Return the java.sql.Type that you want to use to persist this
-   * property or 0 and Ebean will use the logical type.
-   */
-  int getDbType();
-}
@@ -1,60 +0,0 @@
-package com.avaje.ebean.config;
-
-import java.util.Properties;
-
-/**
- * Configuration for the container that holds the EbeanServer instances.
- * <p>
- * Provides configuration for cluster communication (if clustering is used). The cluster communication is
- * used to invalidate appropriate parts of the L2 cache across the cluster.
- */
-public class ContainerConfig {
-
-  protected boolean clusterActive;
-
-  protected Properties properties;
-
-  /**
-   * Return true if clustering is active.
-   */
-  public boolean isClusterActive() {
-    return clusterActive;
-  }
-
-  /**
-   * Set to true for clustering to be active.
-   */
-  public void setClusterActive(boolean clusterActive) {
-    this.clusterActive = clusterActive;
-  }
-
-  /**
-   * Return the deployment properties.
-   */
-  public Properties getProperties() {
-    return properties;
-  }
-
-  /**
-   * Set the deployment properties.
-   */
-  public void setProperties(Properties properties) {
-    this.properties = properties;
-  }
-
-  /**
-   * Load the settings from properties.
-   */
-  public void loadFromProperties(Properties properties) {
-    this.properties = properties;
-    this.clusterActive = getProperty(properties, "ebean.cluster.active", clusterActive);
-  }
-
-  /**
-   * Return the boolean property setting.
-   */
-  protected boolean getProperty(Properties properties, String key, boolean defaultValue) {
-    return "true".equalsIgnoreCase(properties.getProperty(key, Boolean.toString(defaultValue)));
-  }
-
-}
@@ -1,123 +0,0 @@
-package com.avaje.ebean.config;
-
-import com.avaje.ebean.config.dbplatform.DbType;
-import com.avaje.ebean.config.dbplatform.IdType;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Configuration for DB types such as UUID, Geometry etc.
- */
-public class DbTypeConfig {
-
-  /**
-   * The Geometry SRID value (default 4326).
-   */
-  private int geometrySRID = 4326;
-
-  /**
-   * Set for DB's that support both Sequence and Identity (and the default choice is not desired).
-   */
-  private IdType idType;
-
-  /**
-   * Setting to indicate if UUID should be stored as binary(16) or varchar(40) or native DB type (for H2 and Postgres).
-   */
-  private ServerConfig.DbUuid dbUuid = ServerConfig.DbUuid.AUTO_VARCHAR;
-
-  /**
-   * Modify the default mapping of standard types such as default precision for DECIMAL etc.
-   */
-  private List<CustomDbTypeMapping> customDbTypeMappings = new ArrayList<>();
-
-  /**
-   * Return the Geometry SRID.
-   */
-  public int getGeometrySRID() {
-    return geometrySRID;
-  }
-
-  /**
-   * Set the Geometry SRID.
-   */
-  public void setGeometrySRID(int geometrySRID) {
-    this.geometrySRID = geometrySRID;
-  }
-
-  /**
-   * Return the DB type used to store UUID.
-   */
-  public ServerConfig.DbUuid getDbUuid() {
-    return dbUuid;
-  }
-
-  /**
-   * Set the DB type used to store UUID.
-   */
-  public void setDbUuid(ServerConfig.DbUuid dbUuid) {
-    this.dbUuid = dbUuid;
-  }
-
-  /**
-   * Return the IdType to use (or null for the default choice).
-   */
-  public IdType getIdType() {
-    return idType;
-  }
-
-  /**
-   * Set the IdType to use (when the DB supports both SEQUENCE and IDENTITY and the default is not desired).
-   */
-  public void setIdType(IdType idType) {
-    this.idType = idType;
-  }
-
-  /**
-   * Add a custom type mapping.
-   * <p>
-   * <pre>{@code
-   *
-   *   // set the default mapping for BigDecimal.class/decimal
-   *   serverConfig.addCustomMapping(DbType.DECIMAL, "decimal(18,6)");
-   *
-   *   // set the default mapping for String.class/varchar but only for Postgres
-   *   serverConfig.addCustomMapping(DbType.VARCHAR, "text", Platform.POSTGRES);
-   *
-   * }</pre>
-   *
-   * @param type             The DB type this mapping should apply to
-   * @param columnDefinition The column definition that should be used
-   * @param platform         Optionally specify the platform this mapping should apply to.
-   */
-  public void addCustomMapping(DbType type, String columnDefinition, Platform platform) {
-    customDbTypeMappings.add(new CustomDbTypeMapping(type, columnDefinition, platform));
-  }
-
-  /**
-   * Add a custom type mapping that applies to all platforms.
-   * <p>
-   * <pre>{@code
-   *
-   *   // set the default mapping for BigDecimal/decimal
-   *   serverConfig.addCustomMapping(DbType.DECIMAL, "decimal(18,6)");
-   *
-   *   // set the default mapping for String/varchar
-   *   serverConfig.addCustomMapping(DbType.VARCHAR, "text");
-   *
-   * }</pre>
-   *
-   * @param type             The DB type this mapping should apply to
-   * @param columnDefinition The column definition that should be used
-   */
-  public void addCustomMapping(DbType type, String columnDefinition) {
-    customDbTypeMappings.add(new CustomDbTypeMapping(type, columnDefinition));
-  }
-
-  /**
-   * Return the list of custom type mappings.
-   */
-  public List<CustomDbTypeMapping> getCustomTypeMappings() {
-    return customDbTypeMappings;
-  }
-}
@@ -1,178 +0,0 @@
-package com.avaje.ebean.config;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * Helper used to evaluate expressions such as ${CATALINA_HOME}.
- * <p>
- * The expressions can contain environment variables, system properties or JNDI
- * properties. JNDI expressions take the form ${jndi:propertyName} where you
- * substitute propertyName with the name of the jndi property you wish to
- * evaluate.
- * </p>
- */
-final class PropertyExpression {
-
-  private static final Logger logger = LoggerFactory.getLogger(PropertyExpression.class);
-
-  /**
-   * Prefix for looking up JNDI Environment variable.
-   */
-  private static final String JAVA_COMP_ENV = "java:comp/env/";
-
-  /**
-   * Used to detect the start of an expression.
-   */
-  private static final String START = "${";
-
-  /**
-   * Used to detect the end of an expression.
-   */
-  private static final String END = "}";
-
-  /**
-   * Specify the PropertyHolder.
-   */
-  private PropertyExpression() {
-  }
-
-  /**
-   * Return the property value evaluating and replacing any expressions such as
-   * ${CATALINA_HOME}.
-   */
-  static String eval(String val, PropertyMap map) {
-    if (val == null) {
-      return null;
-    }
-    int sp = val.indexOf(START);
-    if (sp > -1) {
-      int ep = val.indexOf(END, sp + 1);
-      if (ep > -1) {
-        return eval(val, sp, ep, map);
-      }
-    }
-    return val;
-  }
-
-  /**
-   * Convert the expression using JNDI, Environment variables, System Properties
-   * or existing an property in SystemProperties itself.
-   */
-  private static String evaluateExpression(String exp, PropertyMap map) {
-
-    if (isJndiExpression(exp)) {
-      // JNDI property lookup...
-      String val = getJndiProperty(exp);
-      if (val != null) {
-        return val;
-      }
-    }
-
-    // check Environment Variables first
-    String val = System.getenv(exp);
-    if (val == null) {
-      // then check system properties
-      val = System.getProperty(exp);
-    }
-    if (val == null && map != null) {
-      // then check PropertyMap
-      val = map.get(exp);
-    }
-
-    if (val != null) {
-      return val;
-
-    } else {
-      // unable to evaluate yet... but maybe later based on the order
-      // in which properties are being set/loaded. You can use
-      // GlobalProperties.evaluateExpressions() to get any unresolved
-      // expressions to be evaluated
-      logger.debug("Unable to evaluate expression [" + exp + "]");
-      return null;
-    }
-  }
-
-  private static String eval(String val, int sp, int ep, PropertyMap map) {
-
-    StringBuilder sb = new StringBuilder();
-    sb.append(val.substring(0, sp));
-
-    String cal = evalExpression(val, sp, ep, map);
-    sb.append(cal);
-
-    eval(val, ep + 1, sb, map);
-
-    return sb.toString();
-  }
-
-  private static void eval(String val, int startPos, StringBuilder sb, PropertyMap map) {
-    if (startPos < val.length()) {
-      int sp = val.indexOf(START, startPos);
-      if (sp > -1) {
-        // append what is between the last token and the new one (if startPos ==
-        // sp nothing gets added)
-        sb.append(val.substring(startPos, sp));
-        int ep = val.indexOf(END, sp + 1);
-        if (ep > -1) {
-          String cal = evalExpression(val, sp, ep, map);
-          sb.append(cal);
-          eval(val, ep + 1, sb, map);
-          return;
-        }
-      }
-    }
-    // append what is left...
-    sb.append(val.substring(startPos));
-  }
-
-  private static String evalExpression(String val, int sp, int ep, PropertyMap map) {
-    // trim off start and end ${ and }
-    String exp = val.substring(sp + START.length(), ep);
-
-    // evaluate the variable
-    String evaled = evaluateExpression(exp, map);
-    if (evaled != null) {
-      return evaled;
-    } else {
-      // unable to evaluate at this stage (maybe later)
-      return START + exp + END;
-    }
-  }
-
-  private static boolean isJndiExpression(String exp) {
-    return exp.startsWith("JNDI:") || exp.startsWith("jndi:");
-  }
-
-  /**
-   * Returns null if JNDI is not setup or if the property is not found.
-   *
-   * @param key the key of the JNDI Environment property including a JNDI: prefix.
-   */
-  private static String getJndiProperty(String key) {
-
-    try {
-      // remove the JNDI: prefix
-      key = key.substring(5);
-
-      return (String) getJndiObject(key);
-
-    } catch (NamingException ex) {
-      return null;
-    }
-  }
-
-  /**
-   * Similar to getProperty but throws NamingException if JNDI is not setup or
-   * if the property is not found.
-   */
-  private static Object getJndiObject(String key) throws NamingException {
-
-    InitialContext ctx = new InitialContext();
-    return ctx.lookup(JAVA_COMP_ENV + key);
-  }
-
-}
@@ -1,167 +0,0 @@
-package com.avaje.ebean.config;
-
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-
-/**
- * A map like structure of properties.
- * <p/>
- * Handles evaluation of expressions like ${home} and provides convenience methods for int, long and boolean.
- */
-public final class PropertyMap implements Serializable {
-
-  private static final long serialVersionUID = 1L;
-
-  private final LinkedHashMap<String, String> map = new LinkedHashMap<>();
-
-  /**
-   * Return properties loaded from test-ebean.properties.
-   */
-  public static Properties testProperties() {
-    PropertyMap propertyMap = PropertyMapLoader.loadTestProperties();
-    return (propertyMap == null) ? new Properties() : propertyMap.asProperties();
-  }
-
-  public static Properties defaultProperties() {
-    PropertyMap propertyMap = PropertyMapLoader.loadGlobalProperties();
-    return (propertyMap == null) ? new Properties() : propertyMap.asProperties();
-  }
-
-  public static boolean loadTestProperties() {
-    String disable = System.getProperty("disableTestProperties");
-    return (disable == null || !disable.equalsIgnoreCase("true"));
-  }
-
-  public String toString() {
-    return map.toString();
-  }
-
-  /**
-   * Return as standard Properties.
-   */
-  public Properties asProperties() {
-    Properties properties = new Properties();
-    for (Entry<String, String> e : entrySet()) {
-      properties.put(e.getKey(), e.getValue());
-    }
-    return properties;
-  }
-
-  /**
-   * Go through all the properties and evaluate any expressions that have not
-   * been resolved.
-   */
-  public void evaluateProperties() {
-
-    for (Entry<String, String> e : entrySet()) {
-      String key = e.getKey();
-      String val = e.getValue();
-      String eval = eval(val);
-      if (eval != null && !eval.equals(val)) {
-        put(key, eval);
-      }
-    }
-  }
-
-  /**
-   * Returns the value with expressions like ${home} evaluated using system properties and environment variables.
-   */
-  public synchronized String eval(String val) {
-    return PropertyExpression.eval(val, this);
-  }
-
-  /**
-   * Return the boolean property value with a given default.
-   */
-  public synchronized boolean getBoolean(String key, boolean defaultValue) {
-    String value = get(key);
-    if (value == null) {
-      return defaultValue;
-    } else {
-      return Boolean.parseBoolean(value);
-    }
-  }
-
-  /**
-   * Return the int property value with a given default.
-   */
-  public synchronized int getInt(String key, int defaultValue) {
-    String value = get(key);
-    if (value == null) {
-      return defaultValue;
-    } else {
-      return Integer.parseInt(value);
-    }
-  }
-
-  /**
-   * Return the long property value with a given default.
-   */
-  public synchronized long getLong(String key, long defaultValue) {
-    String value = get(key);
-    if (value == null) {
-      return defaultValue;
-    } else {
-      return Long.parseLong(value);
-    }
-  }
-
-  /**
-   * Return the string property value with a given default.
-   */
-  public synchronized String get(String key, String defaultValue) {
-    String value = map.get(key.toLowerCase());
-    return value == null ? defaultValue : value;
-  }
-
-  /**
-   * Return the property value returning null if there is no value defined.
-   */
-  public synchronized String get(String key) {
-    return map.get(key.toLowerCase());
-  }
-
-  /**
-   * Put all evaluating any expressions in the values.
-   */
-  public synchronized void putEvalAll(Map<String, String> keyValueMap) {
-
-    for (Map.Entry<String, String> entry : keyValueMap.entrySet()) {
-      putEval(entry.getKey(), entry.getValue());
-    }
-  }
-
-  /**
-   * Put a single key value evaluating any expressions in the value.
-   */
-  public synchronized String putEval(String key, String value) {
-    value = PropertyExpression.eval(value, this);
-    return map.put(key.toLowerCase(), value);
-  }
-
-  /**
-   * Put a single key value with no expression evaluation.
-   */
-  public synchronized String put(String key, String value) {
-    return map.put(key.toLowerCase(), value);
-  }
-
-  /**
-   * Remove an entry.
-   */
-  public synchronized String remove(String key) {
-    return map.remove(key.toLowerCase());
-  }
-
-  /**
-   * Return the entries.
-   */
-  public synchronized Set<Entry<String, String>> entrySet() {
-    return map.entrySet();
-  }
-
-}
@@ -1,159 +0,0 @@
-package com.avaje.ebean.config;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Helper used to load the ebean.properties into a PropertyMap.
- */
-final class PropertyMapLoader {
-
-  private static final Logger logger = LoggerFactory.getLogger(PropertyMapLoader.class);
-
-  /**
-   * Load the <code>test-ebean.properties</code>.
-   */
-  public static PropertyMap loadTestProperties() {
-    if (!PropertyMap.loadTestProperties()) {
-      return new PropertyMap();
-    }
-    return load(null, "test-ebean.properties");
-  }
-
-  /**
-   * Load the ebean.properties (and test-ebean.properties if present).
-   */
-  public static PropertyMap loadGlobalProperties() {
-
-    boolean loadTestProperties = false;
-    String fileName = System.getenv("EBEAN_PROPS_FILE");
-    if (fileName == null) {
-      fileName = System.getProperty("ebean.props.file");
-      if (fileName == null) {
-        loadTestProperties = PropertyMap.loadTestProperties();
-        fileName = "ebean.properties";
-      }
-    }
-
-    PropertyMap map = load(null, fileName);
-    if (loadTestProperties) {
-      // load test properties if present in classpath
-      map = load(map, "test-ebean.properties");
-    }
-    return map;
-  }
-
-  /**
-   * Load the file returning the property map.
-   *
-   * @param p        an existing property map to load into.
-   * @param fileName the name of the properties file to load.
-   */
-  public static PropertyMap load(PropertyMap p, String fileName) {
-
-    InputStream is = findInputStream(fileName);
-    if (is == null) {
-      return p;
-    } else {
-      return load(p, is);
-    }
-  }
-
-  /**
-   * Load the InputStream returning the property map.
-   *
-   * @param p  an existing property map to load into.
-   * @param in the InputStream of the properties file to load.
-   */
-  public static PropertyMap load(PropertyMap p, InputStream in) {
-
-    Properties props = new Properties();
-    try {
-      props.load(in);
-      in.close();
-      return load(p, props);
-
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public static PropertyMap load(PropertyMap p, Properties props) {
-
-    if (p == null) {
-      p = new PropertyMap();
-    }
-
-    // put values in initially without any evaluation
-    for (Map.Entry<Object, Object> entry : props.entrySet()) {
-      String key = ((String) entry.getKey()).toLowerCase();
-      String val = ((String) entry.getValue());
-      if (val != null) {
-        val = val.trim();
-      }
-      p.put(key, val);
-    }
-
-    p.evaluateProperties();
-
-    String otherProps = p.remove("load.properties");
-    if (otherProps == null) {
-      otherProps = p.remove("load.properties.override");
-    }
-    if (otherProps != null) {
-      otherProps = otherProps.replace("\\", "/");
-      InputStream is = findInputStream(otherProps);
-      if (is != null) {
-        logger.debug("loading properties from " + otherProps);
-        load(p, is);
-      } else {
-        logger.error("load.properties " + otherProps + " not found.");
-      }
-    }
-
-    return p;
-  }
-
-  /**
-   * Find the input stream given the file name.
-   */
-  private static InputStream findInputStream(String fileName) {
-
-    if (fileName == null) {
-      throw new NullPointerException("fileName is null?");
-    }
-
-    try {
-      File f = new File(fileName);
-
-      if (f.exists()) {
-        logger.debug(fileName + " found in file system");
-        return new FileInputStream(f);
-      } else {
-        InputStream in = findInClassPath(fileName);
-        if (in != null) {
-          logger.debug(fileName + " found in classpath");
-        }
-        return in;
-      }
-
-    } catch (FileNotFoundException ex) {
-      // already made the check so this
-      // should never be thrown
-      throw new RuntimeException(ex);
-    }
-  }
-
-  private static InputStream findInClassPath(String fileName) {
-    return Thread.currentThread().getContextClassLoader().getResourceAsStream(fileName);
-  }
-
-}
@@ -1,40 +0,0 @@
-package com.avaje.ebean.config;
-
-/**
- * The mode to use for multi-tenancy.
- */
-public enum TenantMode {
-
-  /**
-   * No multi-tenancy.
-   */
-  NONE(false),
-
-  /**
-   * Each Tenant has their own Database (javax.sql.DataSource)
-   */
-  DB(true),
-
-  /**
-   * Each Tenant has their own Database schema.
-   */
-  SCHEMA(true),
-
-  /**
-   * Tenants share tables but have a discriminator/partition column that partitions the data.
-   */
-  PARTITION(false);
-
-  boolean dynamicDataSource;
-
-  TenantMode(boolean dynamicDataSource) {
-    this.dynamicDataSource = dynamicDataSource;
-  }
-
-  /**
-   * Return true if the DataSource is not available on bootup.
-   */
-  public boolean isDynamicDataSource() {
-    return dynamicDataSource;
-  }
-}
@@ -1,42 +0,0 @@
-package com.avaje.ebean.config.dbplatform;
-
-import com.avaje.ebean.BackgroundExecutor;
-import com.avaje.ebean.dbmigration.ddlgeneration.platform.DB2Ddl;
-
-import javax.sql.DataSource;
-import java.sql.Types;
-
-/**
- * DB2 specific platform.
- */
-public class DB2Platform extends DatabasePlatform {
-
-  public DB2Platform() {
-    super();
-    this.name = "db2";
-    this.maxTableNameLength = 18;
-    this.maxConstraintNameLength = 18;
-    this.sqlLimiter = new Db2SqlLimiter();
-    this.platformDdl = new DB2Ddl(this);
-
-    this.dbIdentity.setSupportsGetGeneratedKeys(true);
-    this.dbIdentity.setSupportsSequence(true);
-
-    booleanDbType = Types.BOOLEAN;
-    dbTypeMap.put(DbType.REAL, new DbPlatformType("real"));
-    dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("decimal", 15));
-  }
-
-  /**
-   * Return a DB2 specific sequence IdGenerator that supports batch fetching
-   * sequence values.
-   */
-  @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be,
-                                                       DataSource ds, String seqName, int batchSize) {
-
-    return new DB2SequenceIdGenerator(be, ds, seqName, batchSize);
-  }
-
-}
@@ -1,70 +0,0 @@
-package com.avaje.ebean.config.dbplatform;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * DB Column default values mapping to database platform specific literals.
- */
-public class DbDefaultValue {
-
-  /**
-   * The key for FALSE.
-   */
-  public static final String FALSE = "false";
-
-  /**
-   * The key for TRUE.
-   */
-  public static final String TRUE = "true";
-
-  /**
-   * The key for the NOW / current timestamp.
-   */
-  public static final String NOW = "now";
-
-  protected Map<String, String> map = new LinkedHashMap<>();
-
-  /**
-   * Set the DB now function.
-   */
-  public void setNow(String dbFunction) {
-    put(NOW, dbFunction);
-  }
-
-  /**
-   * Set the DB false literal.
-   */
-  public void setFalse(String dbFalseLiteral) {
-    put(FALSE, dbFalseLiteral);
-  }
-
-  /**
-   * Set the DB true literal.
-   */
-  public void setTrue(String dbTrueLiteral) {
-    put(TRUE, dbTrueLiteral);
-  }
-
-  /**
-   * Add an translation entry.
-   */
-  public void put(String dbLiteral, String dbTranslated) {
-    map.put(dbLiteral, dbTranslated);
-  }
-
-  /**
-   * Convert the DB default literal to platform specific type or function.
-   * <p>
-   * This is intended for the DB column default clause in DDL.
-   * </p>
-   */
-  public String convert(String dbDefaultLiteral) {
-    if (dbDefaultLiteral == null) {
-      return null;
-    }
-    String val = map.get(dbDefaultLiteral);
-    return val != null ? val : dbDefaultLiteral;
-  }
-
-}
@@ -1,49 +0,0 @@
-package com.avaje.ebean.config.dbplatform;
-
-import com.avaje.ebean.BackgroundExecutor;
-import com.avaje.ebean.dbmigration.ddlgeneration.platform.H2Ddl;
-
-import javax.sql.DataSource;
-
-/**
- * H2 specific platform.
- */
-public class H2Platform extends DatabasePlatform {
-
-  public H2Platform() {
-    super();
-    this.name = "h2";
-    this.dbEncrypt = new H2DbEncrypt();
-    this.platformDdl = new H2Ddl(this);
-    this.historySupport = new H2HistorySupport();
-    this.nativeUuidType = true;
-    this.dbDefaultValue.setNow("now()");
-
-    this.dbIdentity.setIdType(IdType.IDENTITY);
-    this.dbIdentity.setSupportsGetGeneratedKeys(true);
-    this.dbIdentity.setSupportsSequence(true);
-    this.dbIdentity.setSupportsIdentity(true);
-
-    // like ? escape'' not working in the latest version H2 so just using no
-    // escape clause for now noting that backslash is an escape char for like in H2
-    this.likeClause = "like ?";
-
-    dbTypeMap.put(DbType.UUID, new DbPlatformType("uuid", false));
-  }
-
-  /**
-   * Return a H2 specific sequence IdGenerator that supports batch fetching
-   * sequence values.
-   */
-  @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds,
-                                                       String seqName, int batchSize) {
-
-    return new H2SequenceIdGenerator(be, ds, seqName, batchSize);
-  }
-
-  @Override
-  protected String withForUpdate(String sql) {
-    return sql + " for update";
-  }
-}
@@ -1,33 +0,0 @@
-package com.avaje.ebean.config.dbplatform;
-
-import com.avaje.ebean.BackgroundExecutor;
-import com.avaje.ebean.dbmigration.ddlgeneration.platform.HsqldbDdl;
-
-import javax.sql.DataSource;
-
-/**
- * H2 specific platform.
- */
-public class HsqldbPlatform extends DatabasePlatform {
-
-  public HsqldbPlatform() {
-    super();
-    this.name = "hsqldb";
-    this.dbEncrypt = new H2DbEncrypt();
-    this.platformDdl = new HsqldbDdl(this);
-
-    this.dbIdentity.setIdType(IdType.IDENTITY);
-    this.dbIdentity.setSupportsGetGeneratedKeys(true);
-    this.dbIdentity.setSupportsSequence(true);
-    this.dbIdentity.setSupportsIdentity(true);
-
-    dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
-  }
-
-  @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
-
-    return new H2SequenceIdGenerator(be, ds, seqName, batchSize);
-  }
-
-}
@@ -1,49 +0,0 @@
-package com.avaje.ebean.config.dbplatform;
-
-import com.avaje.ebean.config.PersistBatch;
-
-/**
- * Microsoft SQL Server 2000 specific platform.
- * <p>
- * <ul>
- * <li>supportsGetGeneratedKeys = false</li>
- * <li>Use select @@IDENTITY to return the generated Id instead</li>
- * <li>Uses LIMIT OFFSET clause</li>
- * <li>Uses [ & ] for quoted identifiers</li>
- * </ul>
- * </p>
- */
-public class MsSqlServer2000Platform extends DatabasePlatform {
-
-  public MsSqlServer2000Platform() {
-    super();
-    this.name = "mssqlserver2000";
-    this.persistBatchOnCascade = PersistBatch.NONE;
-    this.dbIdentity.setIdType(IdType.IDENTITY);
-    this.dbIdentity.setSupportsGetGeneratedKeys(false);
-    this.dbIdentity.setSelectLastInsertedIdTemplate("select @@IDENTITY as X");
-    this.dbIdentity.setSupportsIdentity(true);
-
-    this.openQuote = "[";
-    this.closeQuote = "]";
-
-    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("bit default 0"));
-
-    dbTypeMap.put(DbType.BIGINT, new DbPlatformType("numeric", 19));
-    dbTypeMap.put(DbType.REAL, new DbPlatformType("float(16)"));
-    dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float(32)"));
-    dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 28));
-
-    dbTypeMap.put(DbType.BLOB, new DbPlatformType("image"));
-    dbTypeMap.put(DbType.CLOB, new DbPlatformType("text"));
-    dbTypeMap.put(DbType.LONGVARBINARY, new DbPlatformType("image"));
-    dbTypeMap.put(DbType.LONGVARCHAR, new DbPlatformType("text"));
-
-    dbTypeMap.put(DbType.DATE, new DbPlatformType("datetime"));
-    dbTypeMap.put(DbType.TIME, new DbPlatformType("datetime"));
-    dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("datetime"));
-
-  }
-
-}
@@ -1,55 +0,0 @@
-package com.avaje.ebean.config.dbplatform;
-
-import com.avaje.ebean.config.PersistBatch;
-import com.avaje.ebean.dbmigration.ddlgeneration.platform.MsSqlServerDdl;
-
-/**
- * Microsoft SQL Server 2005 specific platform.
- * <p>
- * <ul>
- * <li>supportsGetGeneratedKeys = true</li>
- * <li>Uses LIMIT OFFSET clause</li>
- * <li>Uses [ & ] for quoted identifiers</li>
- * </ul>
- * </p>
- */
-public class MsSqlServer2005Platform extends DatabasePlatform {
-
-  public MsSqlServer2005Platform() {
-    super();
-    this.name = "mssqlserver2005";
-    // effectively disable persistBatchOnCascade mode for SQL Server
-    // due to lack of support for getGeneratedKeys in batch mode
-    this.persistBatchOnCascade = PersistBatch.NONE;
-    this.idInExpandedForm = true;
-    this.selectCountWithAlias = true;
-    this.sqlLimiter = new MsSqlServer2005SqlLimiter();
-    this.platformDdl = new MsSqlServerDdl(this);
-    this.dbIdentity.setIdType(IdType.IDENTITY);
-    this.dbIdentity.setSupportsGetGeneratedKeys(true);
-    this.dbIdentity.setSupportsIdentity(true);
-
-    this.openQuote = "[";
-    this.closeQuote = "]";
-
-    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("bit default 0"));
-
-    dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
-    dbTypeMap.put(DbType.BIGINT, new DbPlatformType("numeric", 19));
-    dbTypeMap.put(DbType.REAL, new DbPlatformType("float(16)"));
-    dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float(32)"));
-    dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 28));
-
-    dbTypeMap.put(DbType.BLOB, new DbPlatformType("image"));
-    dbTypeMap.put(DbType.CLOB, new DbPlatformType("text"));
-    dbTypeMap.put(DbType.LONGVARBINARY, new DbPlatformType("image"));
-    dbTypeMap.put(DbType.LONGVARCHAR, new DbPlatformType("text"));
-
-    dbTypeMap.put(DbType.DATE, new DbPlatformType("date"));
-    dbTypeMap.put(DbType.TIME, new DbPlatformType("time"));
-    dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("datetime2"));
-
-  }
-
-}
@@ -1,28 +0,0 @@
-package com.avaje.ebean.config.dbplatform;
-
-import com.avaje.ebean.dbmigration.ddlgeneration.platform.SQLiteDdl;
-
-import java.sql.Types;
-
-public class SQLitePlatform extends DatabasePlatform {
-
-  public SQLitePlatform() {
-    super();
-    this.name = "sqlite";
-    this.platformDdl = new SQLiteDdl(this);
-
-    this.dbIdentity.setIdType(IdType.IDENTITY);
-    this.dbIdentity.setSupportsGetGeneratedKeys(false);
-    this.dbIdentity.setSupportsSequence(false);
-    this.dbIdentity.setSelectLastInsertedIdTemplate("select last_insert_rowid()");
-
-    this.booleanDbType = Types.INTEGER;
-
-    dbTypeMap.put(DbType.BIT, new DbPlatformType("int default 0"));
-    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("int default 0"));
-    dbTypeMap.put(DbType.BIGINT, new DbPlatformType("integer"));
-    dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("integer"));
-
-  }
-
-}
@@ -1,240 +0,0 @@
-package com.avaje.ebean.config.dbplatform;
-
-import com.avaje.ebean.BackgroundExecutor;
-import com.avaje.ebean.Transaction;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.persistence.PersistenceException;
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-
-/**
- * Database sequence based IdGenerator.
- */
-public abstract class SequenceIdGenerator implements PlatformIdGenerator {
-
-  private static final Logger logger = LoggerFactory.getLogger(SequenceIdGenerator.class);
-
-  /**
-   * Used to synchronise the idList access.
-   */
-  protected final Object monitor = new Object();
-
-  /**
-   * Used to synchronise background loading (loadBatchInBackground).
-   */
-  protected final Object backgroundLoadMonitor = new Object();
-
-  /**
-   * The actual sequence name.
-   */
-  protected final String seqName;
-
-  protected final DataSource dataSource;
-
-  protected final BackgroundExecutor backgroundExecutor;
-
-  protected final ArrayList<Long> idList = new ArrayList<>(50);
-
-  protected final int batchSize;
-
-  protected int currentlyBackgroundLoading;
-
-  /**
-   * Construct given a dataSource and sql to return the next sequence value.
-   */
-  public SequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
-    this.backgroundExecutor = be;
-    this.dataSource = ds;
-    this.seqName = seqName;
-    this.batchSize = batchSize;
-  }
-
-  public abstract String getSql(int batchSize);
-
-  /**
-   * Returns the sequence name.
-   */
-  public String getName() {
-    return seqName;
-  }
-
-  /**
-   * Returns true.
-   */
-  public boolean isDbSequence() {
-    return true;
-  }
-
-  /**
-   * If allocateSize is large load some sequences in a background thread.
-   * <p>
-   * For example, when inserting a bean with a cascade on a OneToMany with many
-   * beans Ebean can call this to ensure .
-   * </p>
-   */
-  public void preAllocateIds(int allocateSize) {
-    if (batchSize > 1 && allocateSize > batchSize) {
-      // only bother if allocateSize is bigger than
-      // the normal loading batchSize
-      if (allocateSize > 100) {
-        // max out at 100 for now
-        allocateSize = 100;
-      }
-      loadLargeAllocation(allocateSize);
-    }
-  }
-
-  /**
-   * Called by preAllocateIds when we know that a large number of Id's is going
-   * to be needed shortly.
-   */
-  protected void loadLargeAllocation(final int allocateSize) {
-    // preAllocateIds was called with a relatively large batchSize
-    // so we will just go ahead and load those anyway in background
-    backgroundExecutor.execute(() -> loadMoreIds(allocateSize, null));
-  }
-
-  /**
-   * Return the next Id.
-   * <p>
-   * If a Transaction has been passed in use the Connection from it.
-   * </p>
-   */
-  public Object nextId(Transaction t) {
-    synchronized (monitor) {
-
-      if (idList.isEmpty()) {
-        loadMoreIds(batchSize, t);
-      }
-      Long nextId = idList.remove(0);
-
-      if (batchSize > 1) {
-        if (idList.size() <= batchSize / 2) {
-          loadBatchInBackground();
-        }
-      }
-
-      return nextId;
-    }
-  }
-
-  /**
-   * Load another batch of Id's using a background thread.
-   */
-  protected void loadBatchInBackground() {
-
-    // single threaded processing...
-    synchronized (backgroundLoadMonitor) {
-
-      if (currentlyBackgroundLoading > 0) {
-        // skip as already background loading
-        logger.debug("... skip background sequence load (another load in progress)");
-        return;
-      }
-
-      currentlyBackgroundLoading = batchSize;
-
-      backgroundExecutor.execute(() -> {
-        loadMoreIds(batchSize, null);
-        synchronized (backgroundLoadMonitor) {
-          currentlyBackgroundLoading = 0;
-        }
-      });
-    }
-  }
-
-  protected void loadMoreIds(final int numberToLoad, Transaction t) {
-
-    ArrayList<Long> newIds = getMoreIds(numberToLoad, t);
-
-    if (logger.isDebugEnabled()) {
-      logger.debug("... seq:" + seqName + " loaded:" + numberToLoad + " ids:" + newIds);
-    }
-
-    synchronized (monitor) {
-      for (Long newId : newIds) {
-        idList.add(newId);
-      }
-    }
-  }
-
-  /**
-   * Get more Id's by executing a query and reading the Id's returned.
-   */
-  protected ArrayList<Long> getMoreIds(int loadSize, Transaction t) {
-
-    String sql = getSql(loadSize);
-
-    ArrayList<Long> newIds = new ArrayList<>(loadSize);
-
-    boolean useTxnConnection = t != null;
-
-    Connection c = null;
-    PreparedStatement pstmt = null;
-    ResultSet rset = null;
-    try {
-      c = useTxnConnection ? t.getConnection() : dataSource.getConnection();
-
-      pstmt = c.prepareStatement(sql);
-      rset = pstmt.executeQuery();
-      while (rset.next()) {
-        newIds.add(rset.getLong(1));
-      }
-      if (newIds.isEmpty()) {
-        throw new PersistenceException("Always expecting more than 1 row from " + sql);
-      }
-
-      return newIds;
-
-    } catch (SQLException e) {
-      if (e.getMessage().contains("Database is already closed")) {
-        String msg = "Error getting SEQ when DB shutting down " + e.getMessage();
-        logger.info(msg);
-        System.out.println(msg);
-        return newIds;
-      } else {
-        throw new PersistenceException("Error getting sequence nextval", e);
-      }
-    } finally {
-      if (useTxnConnection) {
-        closeResources(null, pstmt, rset);
-      } else {
-        closeResources(c, pstmt, rset);
-      }
-    }
-  }
-
-  /**
-   * Close the JDBC resources.
-   */
-  protected void closeResources(Connection c, PreparedStatement pstmt, ResultSet rset) {
-    try {
-      if (rset != null) {
-        rset.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing ResultSet", e);
-    }
-    try {
-      if (pstmt != null) {
-        pstmt.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing PreparedStatement", e);
-    }
-    try {
-      if (c != null) {
-        c.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing Connection", e);
-    }
-  }
-
-}
@@ -1,45 +0,0 @@
-package com.avaje.ebean.dbmigration.ddlgeneration;
-
-import com.avaje.ebean.dbmigration.migration.AddColumn;
-import com.avaje.ebean.dbmigration.migration.AddHistoryTable;
-import com.avaje.ebean.dbmigration.migration.AddTableComment;
-import com.avaje.ebean.dbmigration.migration.AlterColumn;
-import com.avaje.ebean.dbmigration.migration.ChangeSet;
-import com.avaje.ebean.dbmigration.migration.CreateIndex;
-import com.avaje.ebean.dbmigration.migration.CreateTable;
-import com.avaje.ebean.dbmigration.migration.DropColumn;
-import com.avaje.ebean.dbmigration.migration.DropHistoryTable;
-import com.avaje.ebean.dbmigration.migration.DropIndex;
-import com.avaje.ebean.dbmigration.migration.DropTable;
-
-import java.io.IOException;
-
-/**
- * DDL generation interface.
- */
-public interface DdlHandler {
-
-  void generate(DdlWrite writer, ChangeSet changeSet) throws IOException;
-
-  void generate(DdlWrite writer, CreateTable createTable) throws IOException;
-
-  void generate(DdlWrite writer, DropTable dropTable) throws IOException;
-
-  void generate(DdlWrite writer, AddTableComment addTableComment) throws IOException;
-
-  void generate(DdlWrite writer, AddColumn addColumn) throws IOException;
-
-  void generate(DdlWrite writer, DropColumn dropColumn) throws IOException;
-
-  void generate(DdlWrite writer, AlterColumn alterColumn) throws IOException;
-
-  void generate(DdlWrite writer, AddHistoryTable addHistoryTable) throws IOException;
-
-  void generate(DdlWrite writer, DropHistoryTable dropHistoryTable) throws IOException;
-
-  void generate(DdlWrite writer, CreateIndex createIndex) throws IOException;
-
-  void generate(DdlWrite writer, DropIndex dropIndex) throws IOException;
-
-  void generateExtra(DdlWrite write) throws IOException;
-}
@@ -1,15 +0,0 @@
-package com.avaje.ebean.dbmigration.ddlgeneration.platform;
-
-import com.avaje.ebean.config.dbplatform.DatabasePlatform;
-
-/**
- * DB2 platform specific DDL.
- */
-public class DB2Ddl extends PlatformDdl {
-
-  public DB2Ddl(DatabasePlatform platform) {
-    super(platform);
-    this.identitySuffix = " generated by default as identity";
-  }
-
-}
@@ -1,15 +0,0 @@
-package com.avaje.ebean.dbmigration.ddlgeneration.platform;
-
-import com.avaje.ebean.config.dbplatform.DatabasePlatform;
-
-/**
- * H2 platform specific DDL.
- */
-public class H2Ddl extends PlatformDdl {
-
-  public H2Ddl(DatabasePlatform platform) {
-    super(platform);
-    this.historyDdl = new H2HistoryDdl();
-  }
-
-}
@@ -1,105 +0,0 @@
-package com.avaje.ebean.dbmigration.ddlgeneration.platform;
-
-import com.avaje.ebean.config.dbplatform.DatabasePlatform;
-import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import com.avaje.ebean.dbmigration.migration.AlterColumn;
-
-import java.io.IOException;
-
-/**
- * MS SQL Server platform specific DDL.
- */
-public class MsSqlServerDdl extends PlatformDdl {
-
-  public MsSqlServerDdl(DatabasePlatform platform) {
-    super(platform);
-    this.identitySuffix = " identity(1,1)";
-    this.foreignKeyRestrict = "";
-    this.inlineUniqueOneToOne = false;
-    this.columnSetDefault = "add default";
-    this.dropConstraintIfExists = "drop constraint";
-  }
-
-  @Override
-  public String dropTable(String tableName) {
-    return "IF OBJECT_ID('" + tableName + "', 'U') IS NOT NULL drop table " + tableName;
-  }
-
-  @Override
-  public String alterTableDropForeignKey(String tableName, String fkName) {
-    return "IF OBJECT_ID('" + fkName + "', 'F') IS NOT NULL " + super.alterTableDropForeignKey(tableName, fkName);
-  }
-
-  /**
-   * MsSqlServer specific null handling on unique constraints.
-   */
-  @Override
-  public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns) {
-
-    // issues#233
-    String start = "create unique nonclustered index " + uqName + " on " + tableName + "(";
-    StringBuilder sb = new StringBuilder(start);
-
-    for (int i = 0; i < columns.length; i++) {
-      if (i > 0) {
-        sb.append(",");
-      }
-      sb.append(columns[i]);
-    }
-    sb.append(") where");
-    for (String column : columns) {
-      sb.append(" ").append(column).append(" is not null");
-    }
-    return sb.toString();
-  }
-
-  @Override
-  public String alterColumnDefaultValue(String tableName, String columnName, String defaultValue) {
-
-    if (isDropDefault(defaultValue)) {
-      return "-- alter table " + tableName + " drop constraint <unknown>  -- find the appropriate constraint for default value on column " + columnName;
-    } else {
-      return "alter table " + tableName + " add default " + defaultValue + " for " + columnName;
-    }
-  }
-
-  public String alterColumnBaseAttributes(AlterColumn alter) {
-
-    String tableName = alter.getTableName();
-    String columnName = alter.getColumnName();
-    String type = alter.getType() != null ? alter.getType() : alter.getCurrentType();
-    boolean notnull = (alter.isNotnull() != null) ? alter.isNotnull() : Boolean.TRUE.equals(alter.isCurrentNotnull());
-    String notnullClause = notnull ? " not null" : "";
-
-    return "alter table " + tableName + " alter column " + columnName + " " + type + notnullClause;
-  }
-
-  @Override
-  public String alterColumnType(String tableName, String columnName, String type) {
-
-    // can't alter itself - done in alterColumnBaseAttributes()
-    return null;
-  }
-
-  public String alterColumnNotnull(String tableName, String columnName, boolean notnull) {
-
-    // can't alter itself - done in alterColumnBaseAttributes()
-    return null;
-  }
-
-  /**
-   * Add table comment as a separate statement (from the create table statement).
-   */
-  public void addTableComment(DdlBuffer apply, String tableName, String tableComment) throws IOException {
-
-    // do nothing for MS SQL Server (cause it requires stored procedures etc)
-  }
-
-  /**
-   * Add column comment as a separate statement.
-   */
-  public void addColumnComment(DdlBuffer apply, String table, String column, String comment) throws IOException {
-
-    // do nothing for MS SQL Server (cause it requires stored procedures etc)
-  }
-}
@@ -1,24 +0,0 @@
-package com.avaje.ebean.dbmigration.ddlgeneration.platform;
-
-import com.avaje.ebean.config.dbplatform.DatabasePlatform;
-
-/**
- * Oracle platform specific DDL.
- */
-public class Oracle10Ddl extends PlatformDdl {
-
-  public Oracle10Ddl(DatabasePlatform platform) {
-    super(platform);
-    this.dropTableIfExists = "drop table ";
-    this.dropSequenceIfExists = "drop sequence ";
-    this.dropConstraintIfExists = "drop constraint";
-    this.dropIndexIfExists = "drop index ";
-    this.dropTableCascade = " cascade constraints purge";
-    this.foreignKeyRestrict = "";
-    this.alterColumn = "modify";
-    this.columnSetNotnull = "not null";
-    this.columnSetNull = "null";
-    this.columnSetDefault = "default";
-  }
-
-}
@@ -1,50 +0,0 @@
-package com.avaje.ebean.dbmigration.model;
-
-/**
- * A unique constraint for multiple columns.
- * <p>
- * Note that unique constraint on a single column is instead
- * a boolean flag on the associated MColumn.
- * </p>
- */
-public class MCompoundUniqueConstraint {
-
-  private final String name;
-
-  /**
-   * Flag if true indicates this was specifically created for a OneToOne mapping.
-   */
-  private final boolean oneToOne;
-
-  /**
-   * The columns combined to be unique.
-   */
-  private final String[] columns;
-
-  public MCompoundUniqueConstraint(String[] columns, boolean oneToOne, String name) {
-    this.name = name;
-    this.columns = columns;
-    this.oneToOne = oneToOne;
-  }
-
-  /**
-   * Return the columns for this unique constraint.
-   */
-  public String[] getColumns() {
-    return columns;
-  }
-
-  /**
-   * Return true if this unqiue constraint is specifically for OneToOne mapping.
-   */
-  public boolean isOneToOne() {
-    return oneToOne;
-  }
-
-  /**
-   * Return the constraint name.
-   */
-  public String getName() {
-    return name;
-  }
-}
@@ -1,27 +0,0 @@
-package com.avaje.ebean.event;
-
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.Query;
-import com.avaje.ebean.Transaction;
-
-/**
- * Holds the information available for a bean query.
- */
-public interface BeanQueryRequest<T> {
-
-  /**
-   * Return the server processing the request.
-   */
-  EbeanServer getEbeanServer();
-
-  /**
-   * Return the Transaction associated with this request.
-   */
-  Transaction getTransaction();
-
-  /**
-   * Returns the query.
-   */
-  Query<T> getQuery();
-
-}
@@ -1,127 +0,0 @@
-package com.avaje.ebean.event.changelog;
-
-import com.avaje.ebean.ValuePair;
-
-import java.util.Map;
-
-/**
- * A bean insert, update or delete change sent as part of a ChangeSet.
- */
-public class BeanChange {
-
-  /**
-   * The underling base table name.
-   */
-  String table;
-
-  /**
-   * The id value.
-   */
-  Object id;
-
-  /**
-   * The INSERT, UPDATE or DELETE change type.
-   */
-  ChangeType type;
-
-  /**
-   * The time the bean change was created.
-   */
-  long eventTime;
-
-  /**
-   * The values for insert or update. Note that null values are not included for insert.
-   */
-  Map<String, ValuePair> values;
-
-  /**
-   * Construct with all the details.
-   */
-  public BeanChange(String table, Object id, ChangeType type, Map<String, ValuePair> values) {
-    this.table = table;
-    this.id = id;
-    this.type = type;
-    this.eventTime = System.currentTimeMillis();
-    this.values = values;
-  }
-
-  /**
-   * Default constructor for JSON tools.
-   */
-  public BeanChange() {
-  }
-
-  public String toString() {
-    return "table:" + table + " id:" + id + " values:" + values;
-  }
-
-  /**
-   * Return the object type (typically table name).
-   */
-  public String getTable() {
-    return table;
-  }
-
-  /**
-   * Set the object type (for JSON tools).
-   */
-  public void setTable(String table) {
-    this.table = table;
-  }
-
-  /**
-   * Return the object id.
-   */
-  public Object getId() {
-    return id;
-  }
-
-  /**
-   * Set the bean id (for JSON tools).
-   */
-  public void setId(Object id) {
-    this.id = id;
-  }
-
-  /**
-   * Return the change type (INSERT, UPDATE or DELETE).
-   */
-  public ChangeType getType() {
-    return type;
-  }
-
-  /**
-   * Set the type (for JSON tools).
-   */
-  public void setType(ChangeType type) {
-    this.type = type;
-  }
-
-  /**
-   * Return the event time in epoch millis.
-   */
-  public long getEventTime() {
-    return eventTime;
-  }
-
-  /**
-   * Set the event time in epoch millis.
-   */
-  public void setEventTime(long eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  /**
-   * Return the value pairs. For inserts the ValuePair oldValue is always null.
-   */
-  public Map<String, ValuePair> getValues() {
-    return values;
-  }
-
-  /**
-   * Set the value pairs (for JSON tools).
-   */
-  public void setValues(Map<String, ValuePair> values) {
-    this.values = values;
-  }
-}
@@ -1,17 +0,0 @@
-package com.avaje.ebean.meta;
-
-import java.util.List;
-
-public interface MetaBeanInfo {
-
-  /**
-   * Collect the current query plan statistics return the non-empty statistics.
-   */
-  List<MetaQueryPlanStatistic> collectQueryPlanStatistics(boolean reset);
-
-  /**
-   * Collect the current query plan statistics return all the statistics (include query plans that haven't had query executions).
-   */
-  List<MetaQueryPlanStatistic> collectAllQueryPlanStatistics(boolean reset);
-
-}
@@ -1,91 +0,0 @@
-package com.avaje.ebean.meta;
-
-import java.util.List;
-
-/**
- * Query execution statistics Meta data.
- *
- * @see MetaInfoManager#collectQueryPlanStatistics(boolean)
- */
-public interface MetaQueryPlanStatistic {
-
-  /**
-   * Return the bean type this query plan is for.
-   */
-  Class<?> getBeanType();
-
-  /**
-   * Return true if this query plan was tuned by AutoTune.
-   */
-  boolean isAutoTuned();
-
-  /**
-   * Return a string representation of the query plan hash.
-   */
-  String getQueryPlanHash();
-
-  /**
-   * Return the sql executed.
-   */
-  String getSql();
-
-  /**
-   * Return the total number of queries executed.
-   */
-  long getExecutionCount();
-
-  /**
-   * Return the total number of beans loaded by the queries.
-   * <p>
-   * This excludes background fetching.
-   * </p>
-   */
-  long getTotalLoadedBeans();
-
-  /**
-   * Return the total time taken by executions of this query.
-   */
-  long getTotalTimeMicros();
-
-  /**
-   * Return the max execution time for this query.
-   */
-  long getMaxTimeMicros();
-
-  /**
-   * Return the time collection started (or was last reset).
-   */
-  long getCollectionStart();
-
-  /**
-   * Return the time of the last query executed using this plan.
-   */
-  long getLastQueryTime();
-
-  /**
-   * Return the average query execution time in microseconds.
-   * <p>
-   * This excludes background fetching.
-   * </p>
-   */
-  long getAvgTimeMicros();
-
-  /**
-   * Return the average number of bean loaded per query.
-   * <p>
-   * This excludes background fetching.
-   * </p>
-   */
-  long getAvgLoadedBeans();
-
-  /**
-   * Return the 'origin' points and paths that resulted in the query being
-   * executed and the associated number of times the query was executed via that
-   * path.
-   * <p>
-   * This includes direct and lazy loading paths.
-   * </p>
-   */
-  List<MetaQueryPlanOriginCount> getOrigins();
-
-}
@@ -1,32 +0,0 @@
-package com.avaje.ebean.util;
-
-public class CamelCaseHelper {
-
-  /**
-   * To camel from underscore.
-   *
-   * @param underscore the underscore
-   * @return the string
-   */
-  public static String toCamelFromUnderscore(String underscore) {
-
-    String[] vals = underscore.split("_");
-    if (vals.length == 1) {
-      return underscore;
-    }
-
-    StringBuilder result = new StringBuilder();
-    for (int i = 0; i < vals.length; i++) {
-      String lower = vals[i].toLowerCase();
-      if (i > 0) {
-        char c = Character.toUpperCase(lower.charAt(0));
-        result.append(c);
-        result.append(lower.substring(1));
-      } else {
-        result.append(lower);
-      }
-    }
-
-    return result.toString();
-  }
-}
@@ -1,47 +0,0 @@
-package com.avaje.ebean.util;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Arrays;
-
-/**
- * Helper to find classes taking into account the context class loader.
- */
-public class ClassUtil {
-
-  /**
-   * Returns the raw type for the 2nd generic parameter for a subclass.
-   */
-  public static Class<?> getSecondArgumentType(Class<?> subclass) {
-    Type[] typeArguments = getSuperclassTypeParameter(subclass);
-    if (typeArguments.length != 2) {
-      throw new IllegalArgumentException("Expected type with 2 generic argument types but got "
-        + typeArguments.length + " - " + Arrays.toString(typeArguments));
-    }
-
-    return getRawType(typeArguments[1]);
-  }
-
-  static Type[] getSuperclassTypeParameter(Class<?> subclass) {
-    Type superclass = subclass.getGenericSuperclass();
-    if (superclass instanceof Class) {
-      throw new RuntimeException("Missing generics type parameters on subclass " + subclass);
-    }
-    return ((ParameterizedType) superclass).getActualTypeArguments();
-  }
-
-  private static Class<?> getRawType(Type type) {
-
-    if (type instanceof Class<?>) {
-      return (Class<?>) type;
-
-    } else if (type instanceof ParameterizedType) {
-      ParameterizedType parameterizedType = (ParameterizedType) type;
-      Type rawType = parameterizedType.getRawType();
-      if (rawType instanceof Class<?>) {
-        return (Class<?>) rawType;
-      }
-    }
-    throw new RuntimeException("Unable to obtain raw class type from " + type);
-  }
-}
@@ -1,54 +0,0 @@
-package com.avaje.ebeaninternal.api;
-
-/**
- * A hash for a query plan.
- */
-public class HashQueryPlan {
-
-  private final String rawSql;
-
-  private final int planHash;
-
-  private final int bindCount;
-
-  public HashQueryPlan(String rawSql, int planHash, int bindCount) {
-    this.rawSql = rawSql;
-    this.planHash = planHash;
-    this.bindCount = bindCount;
-  }
-
-  public String toString() {
-    return planHash + ":" + bindCount + (rawSql != null ? ":r" : "");
-  }
-
-  /**
-   * Return as a partial key. For rawSql hash the sql is part of the key and as such
-   * needs to be included in order to have a complete key. Typically the MD5 of the sql
-   * can be used as a shot form proxy for the actual sql.
-   */
-  public String getPartialKey() {
-    return planHash + "_" + bindCount;
-  }
-
-  public int hashCode() {
-    int hc = planHash;
-    hc = hc * 31 + bindCount;
-    hc = hc * 31 + (rawSql == null ? 0 : rawSql.hashCode());
-    return hc;
-  }
-
-  public boolean equals(Object obj) {
-    if (obj == this) {
-      return true;
-    }
-    if (!(obj instanceof HashQueryPlan)) {
-      return false;
-    }
-
-    HashQueryPlan e = (HashQueryPlan) obj;
-    //noinspection StringEquality
-    return e.planHash == planHash
-      && e.bindCount == bindCount
-      && ((e.rawSql == rawSql) || (e.rawSql != null && e.rawSql.equals(rawSql)));
-  }
-}
@@ -1,96 +0,0 @@
-package com.avaje.ebeaninternal.api;
-
-import java.util.Set;
-
-/**
- * Used to build HashQueryPlan instances.
- */
-public class HashQueryPlanBuilder {
-
-  private int planHash;
-
-  private int bindCount;
-
-  public HashQueryPlanBuilder() {
-    this.planHash = 92821;
-  }
-
-  public String toString() {
-    return planHash + ":" + bindCount;
-  }
-
-  /**
-   * Add a class to the hash calculation.
-   */
-  public HashQueryPlanBuilder add(Class<?> cls) {
-    planHash = planHash * 92821 + cls.getName().hashCode();
-    return this;
-  }
-
-  /**
-   * Add an object to the hash calculation.
-   */
-  public HashQueryPlanBuilder add(Object object) {
-    planHash = planHash * 92821 + (object == null ? 0 : object.hashCode());
-    return this;
-  }
-
-  /**
-   * Add the set with order being important.
-   */
-  public HashQueryPlanBuilder addOrdered(Set<?> set) {
-    if (set == null) {
-      add(false);
-    } else {
-      add(true);
-      for (Object o : set) {
-        add(o);
-      }
-    }
-    return this;
-  }
-
-  /**
-   * Add an integer to the hash calculation.
-   */
-  public HashQueryPlanBuilder add(int hashValue) {
-    planHash = planHash * 92821 + (hashValue);
-    return this;
-  }
-
-  /**
-   * Add a boolean to the hash calculation.
-   */
-  public HashQueryPlanBuilder add(boolean booleanValue) {
-    planHash = planHash * 92821 + (booleanValue ? 92821 : 0);
-    return this;
-  }
-
-  /**
-   * Add a number to the bind count for the hash.
-   */
-  public void bind(int extraBindCount) {
-    bindCount += extraBindCount;
-  }
-
-  public void bindIfNotNull(Object someValue) {
-    if (someValue != null) {
-      bindCount++;
-    }
-  }
-
-  /**
-   * Build and return the calculated HashQueryPlan.
-   */
-  public String build() {
-    return planHash + "_" + bindCount;
-  }
-
-  public int getPlanHash() {
-    return planHash;
-  }
-
-  public int getBindCount() {
-    return bindCount;
-  }
-}
@@ -1,37 +0,0 @@
-package com.avaje.ebeaninternal.api;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.TxScope;
-
-/**
- * Helper object to make AOP generated code simpler.
- */
-public class HelpScopeTrans {
-
-  /**
-   * Create a ScopeTrans for a given methods TxScope.
-   */
-  public static ScopeTrans createScopeTrans(TxScope txScope) {
-
-    EbeanServer server = Ebean.getServer(txScope.getServerName());
-    SpiEbeanServer iserver = (SpiEbeanServer) server;
-    return iserver.createScopeTrans(txScope);
-  }
-
-  /**
-   * Exiting the method in an expected fashion.
-   * <p>
-   * That is returning successfully or via a caught exception.
-   * Unexpected exceptions are caught via the Thread uncaughtExceptionHandler.
-   * </p>
-   *
-   * @param returnOrThrowable the return or throwable object
-   * @param opCode            the opcode for ATHROW or ARETURN etc
-   * @param scopeTrans        the scoped transaction the method was run with.
-   */
-  public static void onExitScopeTrans(Object returnOrThrowable, int opCode, ScopeTrans scopeTrans) {
-
-    scopeTrans.onExit(returnOrThrowable, opCode);
-  }
-}
@@ -1,10 +0,0 @@
-package com.avaje.ebeaninternal.api;
-
-import com.avaje.ebean.SqlUpdate;
-
-public interface SpiSqlUpdate extends SqlUpdate {
-
-  BindParams getBindParams();
-
-  void setGeneratedSql(String sql);
-}
@@ -1 +0,0 @@
-package com.avaje.ebeaninternal.api;
@@ -1,14 +0,0 @@
-package com.avaje.ebeaninternal.server.autotune.service;
-
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import com.avaje.ebeaninternal.server.autotune.AutoTuneService;
-
-public class AutoTuneServiceFactory {
-
-  public static AutoTuneService create(SpiEbeanServer server, ServerConfig serverConfig) {
-
-    return new DefaultAutoTuneService(server, serverConfig);
-  }
-
-}
@@ -1,74 +0,0 @@
-package com.avaje.ebeaninternal.server.cache;
-
-import com.avaje.ebean.cache.ServerCache;
-import com.avaje.ebean.cache.ServerCacheFactory;
-import com.avaje.ebean.cache.ServerCacheOptions;
-import com.avaje.ebean.cache.ServerCacheType;
-import com.avaje.ebean.config.CurrentTenantProvider;
-
-import java.util.function.Supplier;
-
-
-/**
- * Manages the bean and query caches.
- */
-public class DefaultServerCacheManager implements SpiCacheManager {
-
-  private final DefaultCacheHolder cacheHolder;
-
-  private final boolean localL2Caching;
-
-  /**
-   * Create with a cache factory and default cache options.
-   */
-  public DefaultServerCacheManager(boolean localL2Caching, CurrentTenantProvider tenantProvider, ServerCacheFactory cacheFactory,
-                                   ServerCacheOptions beanDefault, ServerCacheOptions queryDefault) {
-    this.localL2Caching = localL2Caching;
-    this.cacheHolder = new DefaultCacheHolder(cacheFactory, beanDefault, queryDefault, tenantProvider);
-  }
-
-  /**
-   * Construct when l2 cache is disabled.
-   */
-  public DefaultServerCacheManager() {
-    this(true, null, new DefaultServerCacheFactory(), new ServerCacheOptions(), new ServerCacheOptions());
-  }
-
-  public boolean isLocalL2Caching() {
-    return localL2Caching;
-  }
-
-  /**
-   * Clear all caches.
-   */
-  public void clearAll() {
-    cacheHolder.clearAll();
-  }
-
-  public Supplier<ServerCache> getCollectionIdsCache(Class<?> beanType, String propertyName) {
-    return cacheHolder.getCache(beanType, name(beanType) + "." + propertyName, ServerCacheType.COLLECTION_IDS);
-  }
-
-  public Supplier<ServerCache> getNaturalKeyCache(Class<?> beanType) {
-    return cacheHolder.getCache(beanType, name(beanType), ServerCacheType.NATURAL_KEY);
-  }
-
-  /**
-   * Return the query cache for a given bean type.
-   */
-  public Supplier<ServerCache> getQueryCache(Class<?> beanType) {
-    return cacheHolder.getCache(beanType, name(beanType), ServerCacheType.QUERY);
-  }
-
-  /**
-   * Return the bean cache for a given bean type.
-   */
-  public Supplier<ServerCache> getBeanCache(Class<?> beanType) {
-    return cacheHolder.getCache(beanType, name(beanType), ServerCacheType.BEAN);
-  }
-
-  private String name(Class<?> beanType) {
-    return beanType.getName();
-  }
-
-}
@@ -1,46 +0,0 @@
-package com.avaje.ebeaninternal.server.cache;
-
-import com.avaje.ebean.cache.ServerCache;
-
-import java.util.function.Supplier;
-
-/**
- * The cache service for server side caching of beans and query results.
- */
-public interface SpiCacheManager {
-
-  /**
-   * Return true if the L2 caching is local.
-   * <p>
-   * Local L2 caching means that the cache updates should occur in foreground
-   * rather than background processing.
-   * </p>
-   */
-  boolean isLocalL2Caching();
-
-  /**
-   * Return the cache for mapping natural keys to id values.
-   */
-  Supplier<ServerCache> getNaturalKeyCache(Class<?> beanType);
-
-  /**
-   * Return the cache for beans of a particular type.
-   */
-  Supplier<ServerCache> getBeanCache(Class<?> beanType);
-
-  /**
-   * Return the cache for associated many properties of a bean type.
-   */
-  Supplier<ServerCache> getCollectionIdsCache(Class<?> beanType, String propertyName);
-
-  /**
-   * Return the cache for query results of a particular type of bean.
-   */
-  Supplier<ServerCache> getQueryCache(Class<?> beanType);
-
-  /**
-   * Clear all the caches.
-   */
-  void clearAll();
-
-}
@@ -1 +0,0 @@
-package com.avaje.ebeaninternal.server.cache;
@@ -1,130 +0,0 @@
-package com.avaje.ebeaninternal.server.changelog;
-
-import com.avaje.ebean.ValuePair;
-import com.avaje.ebean.event.changelog.BeanChange;
-import com.avaje.ebean.event.changelog.ChangeSet;
-import com.avaje.ebean.event.changelog.ChangeType;
-import com.avaje.ebean.text.json.JsonContext;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Map;
-
-/**
- * Builds JSON document for a bean change.
- */
-public class ChangeJsonBuilder {
-
-  protected final JsonFactory jsonFactory = new JsonFactory();
-
-  protected final JsonContext json;
-
-  protected ChangeJsonBuilder(JsonContext json) {
-    this.json = json;
-  }
-
-  /**
-   * Write the bean change as JSON.
-   */
-  public void writeBeanJson(Writer writer, BeanChange bean, ChangeSet changeSet, int position) throws IOException {
-
-    JsonGenerator generator = jsonFactory.createGenerator(writer);
-
-    writeBeanChange(generator, bean, changeSet, position);
-
-    generator.flush();
-    generator.close();
-  }
-
-  /**
-   * Write the bean change as JSON document containing the transaction header details.
-   */
-  protected void writeBeanChange(JsonGenerator gen, BeanChange bean, ChangeSet changeSet, int position) throws IOException {
-
-    gen.writeStartObject();
-
-    writeBeanTransactionDetails(gen, changeSet, position);
-
-    gen.writeStringField("object", bean.getTable());
-    gen.writeStringField("objectId", bean.getId().toString());
-    gen.writeStringField("change", bean.getType().getCode());
-    gen.writeNumberField("eventTime", bean.getEventTime());
-
-    writeBeanValues(gen, bean);
-
-    gen.writeEndObject();
-  }
-
-  /**
-   * Denormalise by writing the transaction header details.
-   */
-  protected void writeBeanTransactionDetails(JsonGenerator gen, ChangeSet changeSet, int position) throws IOException {
-
-    gen.writeStringField("txnId", changeSet.getTxnId());
-    gen.writeStringField("txnState", changeSet.getTxnState().getCode());
-    gen.writeNumberField("txnBatch", changeSet.getTxnBatch());
-    gen.writeNumberField("txnPosition", position);
-    String source = changeSet.getSource();
-    if (source != null) {
-      gen.writeStringField("source", source);
-    }
-    String userId = changeSet.getUserId();
-    if (userId != null) {
-      gen.writeStringField("userId", userId);
-    }
-    String userIpAddress = changeSet.getUserIpAddress();
-    if (userIpAddress != null) {
-      gen.writeStringField("userIpAddress", userIpAddress);
-    }
-    Map<String, String> userContext = changeSet.getUserContext();
-    if (userContext != null && !userContext.isEmpty()) {
-      gen.writeObjectFieldStart("userContext");
-      for (Map.Entry<String, String> entry : userContext.entrySet()) {
-        gen.writeStringField(entry.getKey(), entry.getValue());
-      }
-      gen.writeEndObject();
-    }
-  }
-
-  /**
-   * For insert and update write the new/old values.
-   */
-  protected void writeBeanValues(JsonGenerator gen, BeanChange bean) throws IOException {
-
-    if (bean.getType() != ChangeType.DELETE) {
-      gen.writeFieldName("values");
-      gen.writeStartObject();
-      writeValuePairs(bean, gen);
-      gen.writeEndObject();
-    }
-  }
-
-  /**
-   * Write all the value pairs suppressing null values.
-   * <p>
-   * We are intentionally keeping the same new/old structure for both inserts and updates.
-   * </p>
-   */
-  protected void writeValuePairs(BeanChange bean, JsonGenerator gen) throws IOException {
-
-    for (Map.Entry<String, ValuePair> entry : bean.getValues().entrySet()) {
-      gen.writeFieldName(entry.getKey());
-      gen.writeStartObject();
-      ValuePair value = entry.getValue();
-      Object newValue = value.getNewValue();
-      if (newValue != null) {
-        gen.writeFieldName("new");
-        json.writeScalar(gen, newValue);
-      }
-      Object oldValue = value.getOldValue();
-      if (oldValue != null) {
-        gen.writeFieldName("old");
-        json.writeScalar(gen, oldValue);
-      }
-      gen.writeEndObject();
-    }
-  }
-
-}
@@ -1,42 +0,0 @@
-package com.avaje.ebeaninternal.server.core;
-
-import com.avaje.ebeaninternal.api.SpiBackgroundExecutor;
-import com.avaje.ebeaninternal.server.lib.DaemonExecutorService;
-import com.avaje.ebeaninternal.server.lib.DaemonScheduleThreadPool;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * The default implementation of the BackgroundExecutor.
- */
-public class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
-
-  private final DaemonScheduleThreadPool schedulePool;
-
-  private final DaemonExecutorService pool;
-
-  /**
-   * Construct the default implementation of BackgroundExecutor.
-   */
-  public DefaultBackgroundExecutor(int schedulePoolSize, int shutdownWaitSeconds, String namePrefix) {
-    this.pool = new DaemonExecutorService(shutdownWaitSeconds, namePrefix);
-    this.schedulePool = new DaemonScheduleThreadPool(schedulePoolSize, shutdownWaitSeconds, namePrefix + "-periodic-");
-  }
-
-  /**
-   * Execute a Runnable using a background thread.
-   */
-  public void execute(Runnable r) {
-    pool.execute(r);
-  }
-
-  public void executePeriodically(Runnable r, long delay, TimeUnit unit) {
-    schedulePool.scheduleWithFixedDelay(r, delay, delay, unit);
-  }
-
-  public void shutdown() {
-    pool.shutdown();
-    schedulePool.shutdown();
-  }
-
-}
@@ -1,27 +0,0 @@
-package com.avaje.ebeaninternal.server.core;
-
-import com.avaje.ebean.bean.CallStack;
-
-/**
- * Default CallStackFactory where the Hash function for StackTraceElement includes the line number.
- */
-public class DefaultCallStackFactory implements CallStackFactory {
-
-  @Override
-  public CallStack createCallStack(StackTraceElement[] finalTrace) {
-    return new CallStack(finalTrace, finalTrace[0].hashCode(), pathHash(finalTrace));
-  }
-
-  /**
-   * Return the hash code for the path excluding the first element.
-   */
-  private int pathHash(StackTraceElement[] callStack) {
-
-    int hc = 0;
-    for (int i = 1; i < callStack.length; i++) {
-      hc = 92821 * hc + callStack[i].hashCode();
-    }
-    return hc;
-  }
-
-}
@@ -1,57 +0,0 @@
-package com.avaje.ebeaninternal.server.core;
-
-import com.avaje.ebean.meta.MetaBeanInfo;
-import com.avaje.ebean.meta.MetaInfoManager;
-import com.avaje.ebean.meta.MetaObjectGraphNodeStats;
-import com.avaje.ebean.meta.MetaQueryPlanStatistic;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * DefaultServer based implementation of MetaInfoManager.
- */
-public class DefaultMetaInfoManager implements MetaInfoManager {
-
-  private final DefaultServer server;
-
-  public DefaultMetaInfoManager(DefaultServer server) {
-    this.server = server;
-  }
-
-  @Override
-  public MetaBeanInfo getMetaBeanInfo(Class<?> beanClass) {
-    return server.getBeanDescriptor(beanClass);
-  }
-
-  @Override
-  public List<MetaBeanInfo> getMetaBeanInfoList() {
-
-    return new ArrayList<>(server.getBeanDescriptors());
-  }
-
-  @Override
-  public List<MetaQueryPlanStatistic> collectQueryPlanStatistics(boolean reset) {
-
-    List<MetaQueryPlanStatistic> list = new ArrayList<>();
-    for (MetaBeanInfo metaBeanInfo : getMetaBeanInfoList()) {
-      list.addAll(metaBeanInfo.collectQueryPlanStatistics(reset));
-    }
-    return list;
-  }
-
-  public List<MetaObjectGraphNodeStats> collectNodeStatistics(boolean reset) {
-
-    List<MetaObjectGraphNodeStats> list = new ArrayList<>();
-
-    for (CObjectGraphNodeStatistics nodeStatistics : server.objectGraphStats.values()) {
-      MetaObjectGraphNodeStats nodeStats = nodeStatistics.get(reset);
-      if (nodeStats.getCount() > 0) {
-        // Only collection non-empty statistics
-        list.add(nodeStats);
-      }
-    }
-    return list;
-  }
-
-}
@@ -1,104 +0,0 @@
-package com.avaje.ebeaninternal.server.core;
-
-import com.avaje.ebean.ValuePair;
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
-import com.avaje.ebeaninternal.server.deploy.BeanProperty;
-import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne;
-
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * Helper to perform a diff given two beans of the same type.
- * <p>
- * This intentionally does not include any OneToMany or ManyToMany properties.
- * </p>
- */
-public class DiffHelp {
-
-  private DiffHelp() {
-  }
-
-  /**
-   * Return a map of the differences between a and b.
-   * <p>
-   * A and B must be of the same type. B can be null, in which case the 'dirty
-   * values' of a is returned.
-   * </p>
-   * <p>
-   * This intentionally does not include as OneToMany or ManyToMany properties.
-   * </p>
-   */
-  public static Map<String, ValuePair> diff(Object newBean, Object oldBean, BeanDescriptor<?> desc) {
-
-    if (!(newBean instanceof EntityBean)) {
-      throw new IllegalArgumentException("First bean expected to be an enhanced EntityBean? bean:" + newBean);
-    }
-
-    if (oldBean != null) {
-      if (!(oldBean instanceof EntityBean)) {
-        throw new IllegalArgumentException("Second bean expected to be an enhanced EntityBean? bean:" + oldBean);
-      }
-      if (!newBean.getClass().isAssignableFrom(oldBean.getClass())) {
-        throw new IllegalArgumentException("Second bean not assignable to the first bean?");
-      }
-    }
-
-    if (oldBean == null) {
-      return ((EntityBean) newBean)._ebean_getIntercept().getDirtyValues();
-    }
-
-    return desc.diff((EntityBean) newBean, (EntityBean) oldBean);
-  }
-
-
-  /**
-   * Flattens an existing diff map converting assoc one beans into the associated id changes.
-   */
-  public static Map<String, ValuePair> flatten(Map<String, ValuePair> values, BeanDescriptor<?> desc) {
-
-    Map<String, ValuePair> flattened = null;
-
-    Iterator<Map.Entry<String, ValuePair>> iterator = values.entrySet().iterator();
-    while (iterator.hasNext()) {
-      Map.Entry<String, ValuePair> entry = iterator.next();
-      BeanProperty beanProperty = desc.getBeanProperty(entry.getKey());
-      if (beanProperty instanceof BeanPropertyAssocMany) {
-        // filter out assoc many bean properties
-        iterator.remove();
-
-      } else if (beanProperty instanceof BeanPropertyAssocOne) {
-        BeanPropertyAssocOne<?> assoc = (BeanPropertyAssocOne<?>) beanProperty;
-        if (!assoc.isEmbedded()) {
-          // flatten for assoc one beans
-          if (flattened == null) {
-            flattened = new LinkedHashMap<>();
-          }
-          flattenToId(flattened, entry, beanProperty, assoc);
-          iterator.remove();
-        }
-      }
-    }
-
-    if (flattened != null) {
-      values.putAll(flattened);
-    }
-
-    return values;
-  }
-
-  private static void flattenToId(Map<String, ValuePair> flattened, Map.Entry<String, ValuePair> entry, BeanProperty beanProperty, BeanPropertyAssocOne<?> assoc) {
-
-    BeanDescriptor<?> oneDesc = assoc.getTargetDescriptor();
-
-    ValuePair value = entry.getValue();
-    Object newId = value.getNewValue() == null ? null : oneDesc.getId((EntityBean) value.getNewValue());
-    Object oldId = value.getOldValue() == null ? null : oneDesc.getId((EntityBean) value.getOldValue());
-
-    String propName = beanProperty.getName() + "." + oneDesc.getIdProperty().getName();
-    flattened.put(propName, new ValuePair(newId, oldId));
-  }
-}
@@ -1,104 +0,0 @@
-package com.avaje.ebeaninternal.server.core;
-
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import com.avaje.ebeaninternal.api.SpiTransaction;
-import com.avaje.ebeaninternal.server.persist.BatchControl;
-import com.avaje.ebeaninternal.server.persist.BatchPostExecute;
-import com.avaje.ebeaninternal.server.persist.PersistExecute;
-
-/**
- * Wraps all the objects used to persist a bean.
- */
-public abstract class PersistRequest extends BeanRequest implements BatchPostExecute {
-
-  public enum Type {
-    INSERT, UPDATE, DELETE, SOFT_DELETE, DELETE_PERMANENT, UPDATESQL, CALLABLESQL
-  }
-
-  protected boolean persistCascade;
-
-  /**
-   * One of INSERT, UPDATE, DELETE, UPDATESQL or CALLABLESQL.
-   */
-  protected Type type;
-
-  protected final PersistExecute persistExecute;
-
-  /**
-   * Used by CallableSqlRequest and UpdateSqlRequest.
-   */
-  public PersistRequest(SpiEbeanServer server, SpiTransaction t, PersistExecute persistExecute) {
-    super(server, t);
-    this.persistExecute = persistExecute;
-  }
-
-  /**
-   * Execute a the request or queue/batch it for later execution.
-   */
-  public abstract int executeOrQueue();
-
-  /**
-   * Execute the request right now.
-   */
-  public abstract int executeNow();
-
-  public boolean isLogSql() {
-    return transaction.isLogSql();
-  }
-
-  public boolean isLogSummary() {
-    return transaction.isLogSummary();
-  }
-
-
-  /**
-   * Return true if this persist request should use JDBC batch.
-   */
-  public boolean isBatchThisRequest() {
-    return transaction.isBatchThisRequest(type);
-  }
-
-  /**
-   * Execute the statement.
-   */
-  public int executeStatement() {
-
-    boolean batch = isBatchThisRequest();
-
-    int rows;
-    BatchControl control = transaction.getBatchControl();
-    if (control != null) {
-      rows = control.executeStatementOrBatch(this, batch);
-
-    } else if (batch) {
-      // need to create the BatchControl
-      control = persistExecute.createBatchControl(transaction);
-      rows = control.executeStatementOrBatch(this, true);
-    } else {
-      rows = executeNow();
-    }
-
-    return rows;
-  }
-
-  public void initTransIfRequired() {
-    createImplicitTransIfRequired();
-    persistCascade = transaction.isPersistCascade();
-  }
-
-  /**
-   * Return the type of this request. One of INSERT, UPDATE, DELETE, UPDATESQL
-   * or CALLABLESQL.
-   */
-  public Type getType() {
-    return type;
-  }
-
-  /**
-   * Return true if save and delete should cascade.
-   */
-  public boolean isPersistCascade() {
-    return persistCascade;
-  }
-
-}
@@ -1,274 +0,0 @@
-package com.avaje.ebeaninternal.server.core;
-
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.SqlQuery;
-import com.avaje.ebean.SqlRow;
-import com.avaje.ebean.Transaction;
-import com.avaje.ebeaninternal.api.BindParams;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import com.avaje.ebeaninternal.api.SpiSqlQuery;
-import com.avaje.ebeaninternal.api.SpiTransaction;
-import com.avaje.ebeaninternal.server.lib.util.Str;
-import com.avaje.ebeaninternal.server.persist.Binder;
-import com.avaje.ebeaninternal.server.query.DefaultSqlRow;
-import com.avaje.ebeaninternal.server.transaction.TransactionManager;
-import com.avaje.ebeaninternal.server.util.BindParamsParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-/**
- * Wraps the objects involved in executing a SqlQuery.
- */
-public final class RelationalQueryRequest {
-
-  private static final Logger logger = LoggerFactory.getLogger(RelationalQueryRequest.class);
-
-  private final SpiSqlQuery query;
-
-  private final RelationalQueryEngine queryEngine;
-
-  private final SpiEbeanServer ebeanServer;
-
-  private SpiTransaction trans;
-
-  private boolean createdTransaction;
-
-  private String sql;
-
-  private ResultSet resultSet;
-
-  private int rowCount;
-
-  private String bindLog = "";
-
-  private String[] propertyNames;
-
-  private int estimateCapacity;
-
-  private PreparedStatement pstmt;
-
-  /**
-   * Create the BeanFindRequest.
-   */
-  public RelationalQueryRequest(SpiEbeanServer server, RelationalQueryEngine engine, SqlQuery q, Transaction t) {
-    this.ebeanServer = server;
-    this.queryEngine = engine;
-    this.query = (SpiSqlQuery) q;
-    this.trans = (SpiTransaction) t;
-  }
-
-  /**
-   * Create a transaction if none currently exists.
-   */
-  public void initTransIfRequired() {
-    if (trans == null) {
-      trans = ebeanServer.getCurrentServerTransaction();
-      if (trans == null || !trans.isActive()) {
-        // create a local readOnly transaction
-        trans = ebeanServer.createServerTransaction(false, -1);
-        createdTransaction = true;
-      }
-    }
-  }
-
-  /**
-   * End the transaction if it was locally created.
-   */
-  public void endTransIfRequired() {
-    if (createdTransaction) {
-      trans.commit();
-    }
-  }
-
-  public void findEach(Consumer<SqlRow> consumer) {
-    queryEngine.findEach(this, consumer);
-  }
-
-  public void findEachWhile(Predicate<SqlRow> consumer) {
-    queryEngine.findEach(this, consumer);
-  }
-
-  public List<SqlRow> findList() {
-    return queryEngine.findList(this);
-  }
-
-  /**
-   * Return the find that is to be performed.
-   */
-  public SpiSqlQuery getQuery() {
-    return query;
-  }
-
-  public EbeanServer getEbeanServer() {
-    return ebeanServer;
-  }
-
-  public SpiTransaction getTransaction() {
-    return trans;
-  }
-
-  public boolean isLogSql() {
-    return trans.isLogSql();
-  }
-
-  public boolean isLogSummary() {
-    return trans.isLogSummary();
-  }
-
-  private void setResultSet(ResultSet resultSet) throws SQLException {
-    this.resultSet = resultSet;
-    this.propertyNames = getPropertyNames();
-    // calculate the initialCapacity of the Map to reduce rehashing
-    float initCap = (propertyNames.length) / 0.7f;
-    this.estimateCapacity = (int) initCap + 1;
-  }
-
-  /**
-   * Build the list of property names.
-   */
-  private String[] getPropertyNames() throws SQLException {
-
-    ArrayList<String> propNames = new ArrayList<>();
-    ResultSetMetaData metaData = resultSet.getMetaData();
-
-    int columnsPlusOne = metaData.getColumnCount() + 1;
-    for (int i = 1; i < columnsPlusOne; i++) {
-      propNames.add(metaData.getColumnLabel(i));
-    }
-    return propNames.toArray(new String[propNames.size()]);
-  }
-
-  /**
-   * Return the bindLog for this request.
-   */
-  public String getBindLog() {
-    return bindLog;
-  }
-
-  /**
-   * Return true if we can navigate to the next row.
-   */
-  public boolean next() throws SQLException {
-    rowCount++;
-    return resultSet.next();
-  }
-
-  /**
-   * Close the underlying resources.
-   */
-  public void close() {
-    try {
-      if (resultSet != null) {
-        resultSet.close();
-      }
-    } catch (SQLException e) {
-      logger.error(null, e);
-    }
-    try {
-      if (pstmt != null) {
-        pstmt.close();
-      }
-    } catch (SQLException e) {
-      logger.error(null, e);
-    }
-  }
-
-  /**
-   * Read and return the next SqlRow.
-   */
-  public SqlRow createNewRow(String dbTrueValue) throws SQLException {
-
-    SqlRow sqlRow = new DefaultSqlRow(estimateCapacity, 0.75f, dbTrueValue);
-
-    int index = 0;
-    for (String propertyName : propertyNames) {
-      index++;
-      Object value = resultSet.getObject(index);
-      sqlRow.set(propertyName, value);
-    }
-    return sqlRow;
-  }
-
-  /**
-   * Prepare the SQL taking into account named bind parameters.
-   */
-  private void prepareSql() {
-
-    String sql = query.getQuery();
-    BindParams bindParams = query.getBindParams();
-    if (!bindParams.isEmpty()) {
-      // convert any named parameters if required
-      sql = BindParamsParser.parse(bindParams, sql);
-    }
-    this.sql = limitOffset(sql);
-  }
-
-  private String limitOffset(String sql) {
-
-    int firstRow = query.getFirstRow();
-    int maxRows = query.getMaxRows();
-    if (firstRow > 0 || maxRows > 0) {
-      return ebeanServer.getDatabasePlatform().getBasicSqlLimiter().limit(sql, firstRow, maxRows);
-    }
-    return sql;
-  }
-
-  /**
-   * Prepare and execute the SQL using the Binder.
-   */
-  public void executeSql(Binder binder) throws SQLException {
-
-    prepareSql();
-
-    Connection conn = trans.getInternalConnection();
-
-    // synchronise for query.cancel() support
-    pstmt = conn.prepareStatement(sql);
-    if (query.getTimeout() > 0) {
-      pstmt.setQueryTimeout(query.getTimeout());
-    }
-    if (query.getBufferFetchSizeHint() > 0) {
-      pstmt.setFetchSize(query.getBufferFetchSizeHint());
-    }
-
-    BindParams bindParams = query.getBindParams();
-    if (!bindParams.isEmpty()) {
-      this.bindLog = binder.bind(bindParams, pstmt, conn);
-    }
-
-    if (isLogSql()) {
-      String logSql = sql;
-      if (TransactionManager.SQL_LOGGER.isTraceEnabled()) {
-        logSql = Str.add(logSql, "; --bind(", bindLog, ")");
-      }
-      trans.logSql(logSql);
-    }
-
-    setResultSet(pstmt.executeQuery());
-
-  }
-
-  /**
-   * Return the SQL executed for this query.
-   */
-  public String getSql() {
-    return sql;
-  }
-
-  /**
-   * Return the rows read.
-   */
-  public int getRowCount() {
-    return rowCount - 1;
-  }
-}
@@ -1,30 +0,0 @@
-package com.avaje.ebeaninternal.server.core;
-
-import com.avaje.ebeaninternal.server.transaction.DataSourceSupplier;
-import org.avaje.datasource.DataSourcePool;
-
-import javax.sql.DataSource;
-
-/**
- * Simple DataSource supplier when no multi-tenancy used.
- */
-class SimpleDataSourceProvider implements DataSourceSupplier {
-
-  private final DataSource dataSource;
-
-  SimpleDataSourceProvider(DataSource dataSource) {
-    this.dataSource = dataSource;
-  }
-
-  @Override
-  public DataSource getDataSource() {
-    return dataSource;
-  }
-
-  @Override
-  public void shutdown(boolean deregisterDriver) {
-    if (dataSource instanceof DataSourcePool){
-      ((DataSourcePool) dataSource).shutdown(deregisterDriver);
-    }
-  }
-}
@@ -1,56 +0,0 @@
-package com.avaje.ebeaninternal.server.core;
-
-import com.avaje.ebeaninternal.api.SpiTransaction;
-
-/**
- * Used to temporarily wrap a thread local based transaction.
- * <p>
- * Additionally notes if the transaction was created by the request in which
- * case it needs to be commited after the request has been processed.
- * </p>
- */
-final class TransWrapper {
-
-  final SpiTransaction transaction;
-
-  private final boolean wasCreated;
-
-  /**
-   * Wrap the transaction indicating if it was just created.
-   */
-  TransWrapper(SpiTransaction t, boolean created) {
-    transaction = t;
-    wasCreated = created;
-  }
-
-  void batchEscalateOnCollection() {
-    transaction.checkBatchEscalationOnCollection();
-  }
-
-  void flushBatchOnCollection() {
-    if (!wasCreated) {
-      transaction.flushBatchOnCollection();
-    }
-  }
-
-  void commitIfCreated() {
-    if (wasCreated) {
-      transaction.commit();
-    }
-  }
-
-  void rollbackIfCreated() {
-    if (wasCreated) {
-      transaction.rollbackIfActive();
-    }
-  }
-
-  /**
-   * Return true if the transaction was just created. If true it should be
-   * committed after the request has been processed.
-   */
-  boolean wasCreated() {
-    return wasCreated;
-  }
-
-}
@@ -1,175 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebean.text.json.EJson;
-import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyCompound;
-import com.avaje.ebeaninternal.server.el.ElPropertyChainBuilder;
-import com.avaje.ebeaninternal.server.el.ElPropertyValue;
-import com.avaje.ebeaninternal.server.query.SqlBeanLoad;
-import com.avaje.ebeaninternal.server.text.json.ReadJson;
-import com.avaje.ebeaninternal.server.text.json.WriteJson;
-import com.avaje.ebeaninternal.server.type.CtCompoundProperty;
-import com.avaje.ebeaninternal.server.type.CtCompoundPropertyElAdapter;
-import com.avaje.ebeaninternal.server.type.CtCompoundType;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Property mapped to an Immutable Compound Value Object.
- * <p>
- * An Immutable Compound Value Object is similar to an Embedded bean but it
- * doesn't require enhancement and MUST be treated as an Immutable type.
- * </p>
- */
-public class BeanPropertyCompound extends BeanProperty {
-
-  private final CtCompoundType<?> compoundType;
-
-  private final BeanProperty[] scalarProperties;
-
-  private final LinkedHashMap<String, BeanProperty> propertyMap = new LinkedHashMap<>();
-
-  private final LinkedHashMap<String, CtCompoundPropertyElAdapter> nonScalarMap = new LinkedHashMap<>();
-
-  /**
-   * Create the property.
-   */
-  public BeanPropertyCompound(BeanDescriptor<?> descriptor, DeployBeanPropertyCompound deploy) {
-
-    super(descriptor, deploy);
-    this.compoundType = deploy.getCompoundType();
-
-    BeanPropertyCompoundRoot root = deploy.getFlatProperties();
-    this.scalarProperties = root.getScalarProperties();
-
-    for (BeanProperty scalarProperty : scalarProperties) {
-      propertyMap.put(scalarProperty.getName(), scalarProperty);
-    }
-
-    List<CtCompoundProperty> nonScalarPropsList = root.getNonScalarProperties();
-
-    for (CtCompoundProperty ctProp : nonScalarPropsList) {
-      CtCompoundPropertyElAdapter adapter = new CtCompoundPropertyElAdapter(ctProp);
-      nonScalarMap.put(ctProp.getRelativeName(), adapter);
-    }
-
-  }
-
-  @Override
-  public void initialise() {
-    // do nothing for normal BeanProperty
-    if (!isTransient && compoundType == null) {
-      String msg = "No cvoInternalType assigned to " + descriptor.getFullName() + "." + getName();
-      throw new RuntimeException(msg);
-    }
-  }
-
-  @Override
-  public void setDeployOrder(int deployOrder) {
-    this.deployOrder = deployOrder;
-    for (CtCompoundPropertyElAdapter adapter : nonScalarMap.values()) {
-      adapter.setDeployOrder(deployOrder);
-    }
-  }
-
-  public ElPropertyValue buildElPropertyValue(String propName, String remainder, ElPropertyChainBuilder chain, boolean propertyDeploy) {
-
-    if (chain == null) {
-      chain = new ElPropertyChainBuilder(true, propName);
-    }
-
-    // first add this property
-    chain.add(this);
-
-    // handle all the rest of the chain handled by the
-    // BeanProperty (all depth for nested compound type)
-    BeanProperty p = propertyMap.get(remainder);
-    if (p != null) {
-      return chain.add(p).build();
-    }
-    CtCompoundPropertyElAdapter elAdapter = nonScalarMap.get(remainder);
-    if (elAdapter == null) {
-      throw new RuntimeException("property [" + remainder + "] not found in " + getFullBeanName());
-    }
-    return chain.add(elAdapter).build();
-  }
-
-  @Override
-  public void appendSelect(DbSqlContext ctx, boolean subQuery) {
-    if (!isTransient) {
-      for (BeanProperty scalarProperty : scalarProperties) {
-        scalarProperty.appendSelect(ctx, subQuery);
-      }
-    }
-  }
-
-  public BeanProperty[] getScalarProperties() {
-    return scalarProperties;
-  }
-
-  @Override
-  public Object readSet(DbReadContext ctx, EntityBean bean) throws SQLException {
-
-    Object v = compoundType.read(ctx.getDataReader());
-    setValue(bean, v);
-
-    return v;
-  }
-
-  /**
-   * Read the data from the resultSet effectively ignoring it and returning
-   * null.
-   */
-  @Override
-  public Object read(DbReadContext ctx) throws SQLException {
-    return compoundType.read(ctx.getDataReader());
-  }
-
-  @Override
-  public void loadIgnore(DbReadContext ctx) {
-    compoundType.loadIgnore(ctx.getDataReader());
-  }
-
-  @Override
-  public void load(SqlBeanLoad sqlBeanLoad) {
-    sqlBeanLoad.load(this);
-  }
-
-  @Override
-  public Object pathGetNested(Object bean) {
-    return bean;
-  }
-
-  public void jsonWrite(WriteJson ctx, EntityBean bean) throws IOException {
-    if (!jsonSerialize) {
-      return;
-    }
-    Object value = getValueIntercept(bean);
-    if (value == null) {
-      ctx.writeNullField(name);
-    } else {
-      ctx.writeFieldName(name);
-      compoundType.jsonWrite(ctx, value, name);
-    }
-  }
-
-  @Override
-  public void jsonRead(ReadJson readJson, EntityBean bean) throws IOException {
-
-    if (!jsonDeserialize) {
-      return;
-    }
-
-    Map<String, Object> map = EJson.parseObject(readJson.getParser());
-    if (map == null) {
-      setValue(bean, null);
-    } else {
-      Object objValue = compoundType.jsonConvert(map);
-      setValue(bean, objValue);
-    }
-  }
-}
@@ -1,80 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty;
-import com.avaje.ebeaninternal.server.properties.BeanPropertySetter;
-import com.avaje.ebeaninternal.server.type.CtCompoundProperty;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents the root BeanProperty for properties of a compound type.
- * <p>
- * Holds all the scalar and non-scalar properties of the compound type. The
- * scalar properties match to DB columns and the non-scalar ones are here solely
- * to support EL expression language for nested compound types.
- * </p>
- */
-public class BeanPropertyCompoundRoot {
-
-  private final BeanPropertySetter setter;
-
-  private final String name;
-  private final String fullBeanName;
-
-  private final ArrayList<BeanPropertyCompoundScalar> propList;
-
-  private List<CtCompoundProperty> nonScalarProperties;
-
-  public BeanPropertyCompoundRoot(DeployBeanProperty deploy) {
-    this.fullBeanName = deploy.getFullBeanName();
-    this.name = deploy.getName();
-    this.setter = deploy.getSetter();
-    this.propList = new ArrayList<>();
-  }
-
-  public BeanProperty[] getScalarProperties() {
-
-    return propList.toArray(new BeanProperty[propList.size()]);
-  }
-
-  public void register(BeanPropertyCompoundScalar prop) {
-    propList.add(prop);
-  }
-
-  public List<CtCompoundProperty> getNonScalarProperties() {
-    return nonScalarProperties;
-  }
-
-  public void setNonScalarProperties(List<CtCompoundProperty> nonScalarProperties) {
-    this.nonScalarProperties = nonScalarProperties;
-  }
-
-  /**
-   * Set the value of the property without interception or
-   * PropertyChangeSupport.
-   */
-  public void setRootValue(EntityBean bean, Object value) {
-    try {
-      setter.set(bean, value);
-    } catch (Exception ex) {
-      String beanType = bean == null ? "null" : bean.getClass().getName();
-      String msg = "set " + name + " with arg[" + value + "] on [" + fullBeanName + "] with type[" + beanType + "] threw error";
-      throw new RuntimeException(msg, ex);
-    }
-  }
-
-  /**
-   * Set the value of the property.
-   */
-  public void setRootValueIntercept(EntityBean bean, Object value) {
-    try {
-      setter.setIntercept(bean, value);
-    } catch (Exception ex) {
-      String beanType = bean == null ? "null" : bean.getClass().getName();
-      String msg = "setIntercept " + name + " arg[" + value + "] on [" + fullBeanName + "] with type[" + beanType + "] threw error";
-      throw new RuntimeException(msg, ex);
-    }
-  }
-}
@@ -1,81 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty;
-import com.avaje.ebeaninternal.server.type.CtCompoundProperty;
-
-/**
- * A BeanProperty owned by a Compound value object that maps to
- * a real scalar type.
- */
-public class BeanPropertyCompoundScalar extends BeanProperty {
-
-  private final BeanPropertyCompoundRoot rootProperty;
-
-  private final CtCompoundProperty ctProperty;
-
-  public BeanPropertyCompoundScalar(BeanPropertyCompoundRoot rootProperty, DeployBeanProperty scalarDeploy, CtCompoundProperty ctProperty) {
-    super(scalarDeploy);
-    this.rootProperty = rootProperty;
-    this.ctProperty = ctProperty;
-  }
-
-  /**
-   * Return one of the scalar values from a compound type.
-   */
-  public Object getValueObject(Object compoundValue) {
-    return ctProperty.getValue(compoundValue);
-  }
-
-  @Override
-  public Object getValue(EntityBean valueObject) {
-    return ctProperty.getValue(valueObject);
-  }
-
-  @Override
-  public void setValue(EntityBean bean, Object value) {
-    setValueInCompound(bean, value, false);
-  }
-
-  public void setValueInCompound(EntityBean bean, Object value, boolean intercept) {
-
-    Object compoundValue = ctProperty.setValue(bean, value);
-
-    if (compoundValue != null) {
-      // we are at the top level and we have a compound value
-      // that we can set using the root property
-      if (intercept) {
-        rootProperty.setRootValueIntercept(bean, compoundValue);
-      } else {
-        rootProperty.setRootValue(bean, compoundValue);
-      }
-    }
-  }
-
-  /**
-   * No interception on embedded scalar values inside a CVO.
-   */
-  @Override
-  public void setValueIntercept(EntityBean bean, Object value) {
-    setValueInCompound(bean, value, true);
-  }
-
-  /**
-   * No interception on embedded scalar values inside a CVO.
-   */
-  @Override
-  public Object getValueIntercept(EntityBean bean) {
-    return getValue(bean);
-  }
-
-  @Override
-  public Object pathGetNested(Object bean) {
-    return pathGet(bean);
-  }
-
-  @Override
-  public Object pathGet(Object bean) {
-    return ctProperty.getValue(bean);
-  }
-
-}
@@ -1,11 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertySimpleCollection;
-
-public class BeanPropertySimpleCollection<T> extends BeanPropertyAssocMany<T> {
-
-  public BeanPropertySimpleCollection(BeanDescriptor<?> descriptor, DeployBeanPropertySimpleCollection<T> deploy) {
-    super(descriptor, deploy);
-  }
-
-}
@@ -1,121 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-import com.avaje.ebeaninternal.server.core.InternString;
-import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanTable;
-import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoin;
-import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Used for associated beans in place of a BeanDescriptor. This is done to avoid
- * recursion issues due to the potentially bi-directional and circular
- * relationships between beans.
- * <p>
- * It holds the main deployment information and not all the detail that is held
- * in a BeanDescriptor.
- * </p>
- */
-public class BeanTable {
-
-	private static final Logger logger = LoggerFactory.getLogger(BeanTable.class);
-
-    private final Class<?> beanType;
-
-    /**
-     * The base table.
-     */
-    private final String baseTable;
-
-    private final BeanProperty[] idProperties;
-
-    /**
-     * Create the BeanTable.
-     */
-    public BeanTable(DeployBeanTable mutable, BeanDescriptorMap owner) {
-        this.beanType = mutable.getBeanType();
-        this.baseTable = InternString.intern(mutable.getBaseTable());
-        this.idProperties = mutable.createIdProperties(owner);
-    }
-
-    public String toString(){
-    	return baseTable;
-    }
-
-    /**
-     * Return the base table for this BeanTable.
-     * This is used to determine the join information
-     * for associations.
-     */
-    public String getBaseTable() {
-        return baseTable;
-    }
-
-    /**
-     * Gets the unqualified base table.
-     *
-     * @return the unqualified base table
-     */
-    public String getUnqualifiedBaseTable(){
-		final String[] chunks = baseTable.split("\\.");
-		return chunks.length == 2 ? chunks[1] :chunks[0];
-    }
-
-    /**
-     * Return the Id properties.
-     */
-    public BeanProperty[] getIdProperties() {
-		return idProperties;
-	}
-
-	/**
-     * Return the class for this beanTable.
-     */
-    public Class<?> getBeanType() {
-        return beanType;
-    }
-
-	public void createJoinColumn(String foreignKeyPrefix, DeployTableJoin join, boolean reverse, String sqlFormulaSelect) {
-
-		boolean complexKey = false;
-		BeanProperty[] props = idProperties;
-
-		if (idProperties.length == 1){
-			if (idProperties[0] instanceof BeanPropertyAssocOne<?>) {
-				BeanPropertyAssocOne<?> assocOne = (BeanPropertyAssocOne<?>)idProperties[0];
-				props = assocOne.getProperties();
-				complexKey = true;
-			}
-		}
-
-    for (BeanProperty prop : props) {
-
-      String lc = prop.getDbColumn();
-      String fk = lc;
-      if (foreignKeyPrefix != null) {
-        fk = foreignKeyPrefix + "_" + fk;
-      }
-
-      if (complexKey) {
-        // just to copy the column name rather than prefix with the foreignKeyPrefix.
-        // I think that with complex keys this is the more common approach.
-        String msg = "On table[" + baseTable + "] foreign key column [" + lc + "]";
-        logger.debug(msg);
-        fk = lc;
-      }
-      if (sqlFormulaSelect != null) {
-        fk = sqlFormulaSelect;
-      }
-
-      DeployTableJoinColumn joinCol = new DeployTableJoinColumn(lc, fk);
-      joinCol.setForeignSqlFormula(sqlFormulaSelect);
-      if (reverse) {
-        joinCol = joinCol.reverse();
-      }
-      join.addJoinColumn(joinCol);
-    }
-
-	}
-
-}
@@ -1,185 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-import com.avaje.ebean.event.BeanPersistController;
-import com.avaje.ebean.event.BeanPersistRequest;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * Chains multiple BeanPersistController's together.
- *
- * Used when multiple BeanPersistController register for the same bean type.
- */
-public class ChainedBeanPersistController implements BeanPersistController {
-
-	private static final Sorter SORTER = new Sorter();
-
-	private final List<BeanPersistController> list;
-
-	private final BeanPersistController[] chain;
-
-	/**
-	 * Construct adding 2 BeanPersistController's.
-	 */
-	public ChainedBeanPersistController(BeanPersistController c1, BeanPersistController c2) {
-		this(addList(c1, c2));
-	}
-
-	/**
-	 * Helper method used to create a list from 2 BeanPersistController's.
-	 */
-	private static List<BeanPersistController> addList(BeanPersistController c1, BeanPersistController c2) {
-		ArrayList<BeanPersistController> addList = new ArrayList<>(2);
-		addList.add(c1);
-		addList.add(c2);
-		return addList;
-	}
-
-	/**
-	 * Construct given the list of BeanPersistController's.
-	 */
-	public ChainedBeanPersistController(List<BeanPersistController> list) {
-		this.list = list;
-		BeanPersistController[] c = list.toArray(new BeanPersistController[list.size()]);
-		Arrays.sort(c, SORTER);
-		this.chain = c;
-	}
-
-  /**
-   * Return the size of the chain.
-   */
-	protected int size() {
-		return chain.length;
-	}
-
-	/**
-	 * Register a new BeanPersistController and return the resulting chain.
-	 */
-	public ChainedBeanPersistController register(BeanPersistController c) {
-		if (list.contains(c)){
-			return this;
-		} else {
-			ArrayList<BeanPersistController> newList = new ArrayList<>();
-			newList.addAll(list);
-			newList.add(c);
-
-			return new ChainedBeanPersistController(newList);
-		}
-	}
-
-	/**
-	 * De-register a BeanPersistController and return the resulting chain.
-	 */
-	public ChainedBeanPersistController deregister(BeanPersistController c) {
-		if (!list.contains(c)){
-			return this;
-		} else {
-			ArrayList<BeanPersistController> newList = new ArrayList<>();
-			newList.addAll(list);
-			newList.remove(c);
-
-			return new ChainedBeanPersistController(newList);
-		}
-	}
-
-	/**
-	 * Always returns 0 (not used for this object).
-	 */
-  @Override
-	public int getExecutionOrder() {
-		return 0;
-	}
-
-	/**
-	 * Always returns false (not used for this object).
-	 */
-  @Override
-	public boolean isRegisterFor(Class<?> cls) {
-		return false;
-	}
-
-  @Override
-	public void postDelete(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      aChain.postDelete(request);
-    }
-	}
-
-  @Override
-	public void postInsert(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      aChain.postInsert(request);
-    }
-	}
-
-  @Override
-	public void postUpdate(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      aChain.postUpdate(request);
-    }
-	}
-
-	@Override
-	public void postSoftDelete(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      aChain.postSoftDelete(request);
-    }
-	}
-
-  @Override
-	public boolean preDelete(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      if (!aChain.preDelete(request)) {
-        return false;
-      }
-    }
-		return true;
-	}
-
-	@Override
-	public boolean preSoftDelete(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      if (!aChain.preSoftDelete(request)) {
-        return false;
-      }
-    }
-		return true;
-	}
-
-  @Override
-	public boolean preInsert(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      if (!aChain.preInsert(request)) {
-        return false;
-      }
-    }
-		return true;
-	}
-
-  @Override
-	public boolean preUpdate(BeanPersistRequest<?> request) {
-    for (BeanPersistController aChain : chain) {
-      if (!aChain.preUpdate(request)) {
-        return false;
-      }
-    }
-		return true;
-	}
-
-	/**
-	 * Helper to order the BeanPersistController's in a chain.
-	 */
-	private static class Sorter implements Comparator<BeanPersistController> {
-
-		public int compare(BeanPersistController o1, BeanPersistController o2) {
-
-			int i1 = o1.getExecutionOrder() ;
-			int i2 = o2.getExecutionOrder() ;
-			return (i1<i2 ? -1 : (i1==i2 ? 0 : 1));
-		}
-
-	}
-}
@@ -1,109 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import com.avaje.ebean.event.BeanPersistListener;
-
-/**
- * Handles multiple BeanPersistListener's for a given entity type.
- */
-public class ChainedBeanPersistListener implements BeanPersistListener {
-
-	private final List<BeanPersistListener> list;
-
-	private final BeanPersistListener[] chain;
-
-	/**
-	 * Construct adding 2 BeanPersistListener's.
-	 */
-	ChainedBeanPersistListener(BeanPersistListener c1, BeanPersistListener c2) {
-		this(addList(c1, c2));
-	}
-
-	/**
-	 * Return the size of the chain.
-	 */
-	protected int size() {
-		return chain.length;
-	}
-
-  @Override
-  public boolean isRegisterFor(Class<?> cls) {
-    // never called
-    return false;
-  }
-
-  /**
-	 * Helper method used to create a list from 2 BeanPersistListener.
-	 */
-	private static List<BeanPersistListener> addList(BeanPersistListener c1, BeanPersistListener c2) {
-		ArrayList<BeanPersistListener> addList = new ArrayList<>(2);
-		addList.add(c1);
-		addList.add(c2);
-		return addList;
-	}
-
-	/**
-	 * Construct given the list of BeanPersistListener's.
-	 */
-	public ChainedBeanPersistListener(List<BeanPersistListener> list) {
-		this.list = list;
-		this.chain = list.toArray(new BeanPersistListener[list.size()]);
-	}
-
-	/**
-	 * Register a new BeanPersistListener and return the resulting chain.
-	 */
-	public ChainedBeanPersistListener register(BeanPersistListener c) {
-		if (list.contains(c)){
-			return this;
-		} else {
-			List<BeanPersistListener> newList = new ArrayList<>();
-			newList.addAll(list);
-			newList.add(c);
-
-			return new ChainedBeanPersistListener(newList);
-		}
-	}
-
-	/**
-	 * De-register a BeanPersistListener and return the resulting chain.
-	 */
-	public ChainedBeanPersistListener deregister(BeanPersistListener c) {
-		if (!list.contains(c)){
-			return this;
-		} else {
-			ArrayList<BeanPersistListener> newList = new ArrayList<>();
-			newList.addAll(list);
-			newList.remove(c);
-
-			return new ChainedBeanPersistListener(newList);
-		}
-	}
-
-	public void deleted(Object bean) {
-    for (BeanPersistListener aChain : chain) {
-      aChain.deleted(bean);
-    }
-	}
-
-	public void softDeleted(Object bean) {
-    for (BeanPersistListener aChain : chain) {
-      aChain.softDeleted(bean);
-    }
-	}
-
-	public void inserted(Object bean) {
-    for (BeanPersistListener aChain : chain) {
-      aChain.inserted(bean);
-    }
-	}
-
-	public void updated(Object bean, Set<String> updatedProperties) {
-    for (BeanPersistListener aChain : chain) {
-      aChain.updated(bean, updatedProperties);
-    }
-	}
-}
@@ -1,77 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-import com.avaje.ebean.event.BeanPostLoad;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Handles multiple BeanPostLoad's for a given entity type.
- */
-public class ChainedBeanPostLoad implements BeanPostLoad {
-
-	private final List<BeanPostLoad> list;
-
-	private final BeanPostLoad[] chain;
-
-	/**
-	 * Construct given the list of BeanPostLoad's.
-	 */
-	public ChainedBeanPostLoad(List<BeanPostLoad> list) {
-		this.list = list;
-		this.chain = list.toArray(new BeanPostLoad[list.size()]);
-	}
-
-	/**
-	 * Register a new BeanPostLoad and return the resulting chain.
-	 */
-	public ChainedBeanPostLoad register(BeanPostLoad c) {
-		if (list.contains(c)){
-			return this;
-		} else {
-			List<BeanPostLoad> newList = new ArrayList<>();
-			newList.addAll(list);
-			newList.add(c);
-
-			return new ChainedBeanPostLoad(newList);
-		}
-	}
-
-	/**
-	 * De-register a BeanPostLoad and return the resulting chain.
-	 */
-	public ChainedBeanPostLoad deregister(BeanPostLoad c) {
-		if (!list.contains(c)){
-			return this;
-		} else {
-			ArrayList<BeanPostLoad> newList = new ArrayList<>();
-			newList.addAll(list);
-			newList.remove(c);
-
-			return new ChainedBeanPostLoad(newList);
-		}
-	}
-
-  /**
-   * Return the size of the chain.
-   */
-  protected int size() {
-    return chain.length;
-  }
-
-  @Override
-  public boolean isRegisterFor(Class<?> cls) {
-    // never called
-    return false;
-  }
-
-  /**
-   * Fire postLoad on all registered BeanPostLoad implementations.
-   */
-  @Override
-	public void postLoad(Object bean) {
-    for (BeanPostLoad aChain : chain) {
-      aChain.postLoad(bean);
-    }
-	}
-}
@@ -1,96 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import com.avaje.ebean.event.BeanQueryAdapter;
-import com.avaje.ebean.event.BeanQueryRequest;
-
-/**
- * Handles multiple BeanQueryAdapter for a given entity type.
- */
-public class ChainedBeanQueryAdapter implements BeanQueryAdapter {
-
-	private static final Sorter SORTER = new Sorter();
-
-	private final List<BeanQueryAdapter> list;
-
-	private final BeanQueryAdapter[] chain;
-
-	/**
-	 * Construct given the list of BeanQueryAdapter's.
-	 */
-	public ChainedBeanQueryAdapter(List<BeanQueryAdapter> list) {
-		this.list = list;
-		BeanQueryAdapter[] c = list.toArray(new BeanQueryAdapter[list.size()]);
-		Arrays.sort(c, SORTER);
-		this.chain = c;
-	}
-
-	/**
-	 * Register a new BeanQueryAdapter and return the resulting chain.
-	 */
-	public ChainedBeanQueryAdapter register(BeanQueryAdapter c) {
-		if (list.contains(c)){
-			return this;
-		} else {
-			List<BeanQueryAdapter> newList = new ArrayList<>();
-			newList.addAll(list);
-			newList.add(c);
-
-			return new ChainedBeanQueryAdapter(newList);
-		}
-	}
-
-	/**
-	 * De-register a BeanQueryAdapter and return the resulting chain.
-	 */
-	public ChainedBeanQueryAdapter deregister(BeanQueryAdapter c) {
-		if (!list.contains(c)){
-			return this;
-		} else {
-			ArrayList<BeanQueryAdapter> newList = new ArrayList<>();
-			newList.addAll(list);
-			newList.remove(c);
-
-			return new ChainedBeanQueryAdapter(newList);
-		}
-	}
-
-
-	/**
-	 * Return 0 as not used by this Chained adapter.
-	 */
-	public int getExecutionOrder() {
-		return 0;
-	}
-
-	/**
-	 * Return false as only individual adapters are registered.
-	 */
-	public boolean isRegisterFor(Class<?> cls) {
-		return false;
-	}
-
-	public void preQuery(BeanQueryRequest<?> request) {
-
-    for (BeanQueryAdapter aChain : chain) {
-      aChain.preQuery(request);
-    }
-	}
-	/**
-	 * Helper to order the BeanQueryAdapter's in a chain.
-	 */
-	private static class Sorter implements Comparator<BeanQueryAdapter> {
-
-		public int compare(BeanQueryAdapter o1, BeanQueryAdapter o2) {
-
-			int i1 = o1.getExecutionOrder() ;
-			int i2 = o2.getExecutionOrder() ;
-			return (i1<i2 ? -1 : (i1==i2 ? 0 : 1));
-		}
-
-	}
-}
@@ -1,170 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-import java.util.Set;
-
-/**
- * Converts logical property names to database columns.
- */
-public abstract class DeployParser {
-
-	/**
-	 * used to identify sql literal.
-	 */
-	protected static final char SINGLE_QUOTE = '\'';
-
-	/**
-	 * used to identify query named parameters.
-	 */
-	protected static final char COLON = ':';
-
-	/**
-	 * Used to determine when a column name terminates.
-	 */
-	protected static final char UNDERSCORE = '_';
-
-	/**
-	 * Used to determine when a column name terminates.
-	 */
-	protected static final char PERIOD = '.';
-	
-	protected boolean encrypted;
-	
-	protected String source;
-
-	protected StringBuilder sb;
-
-	protected int sourceLength;
-
-	protected int pos;
-
-	protected String word;
-
-	protected char wordTerminator;
-	
-	protected abstract String convertWord();
-
-	public abstract String getDeployWord(String expression);
-
-	       
-	/**
-	 * Return the join includes.
-	 */
-	public abstract Set<String> getIncludes();
-
-	public void setEncrypted(boolean encrypted) {
-		this.encrypted = encrypted;
-	}
-
-	public String parse(String source) {
-
-		if (source == null) {
-			return null;
-		}
-		
-		pos = -1;
-		this.source = source;
-		this.sourceLength = source.length();
-		this.sb = new StringBuilder(source.length() + 20);
-
-		while (nextWord()) {
-			String deployWord = convertWord();
-			sb.append(deployWord);
-			if (pos < sourceLength) {
-				sb.append(wordTerminator);
-				if (wordTerminator == SINGLE_QUOTE) {
-				  readLiteral();
-				}
-			}
-		}
-
-		return sb.toString();
-	}
-
-	private boolean nextWord() {
-
-		if (!findWordStart()) {
-			return false;
-		}
-
-		StringBuilder wordBuffer = new StringBuilder();
-		wordBuffer.append(source.charAt(pos));
-		while (++pos < sourceLength) {
-			char ch = source.charAt(pos);
-			if (isWordPart(ch)) {
-				wordBuffer.append(ch);
-			} else {
-				wordTerminator = ch;
-				break;
-			}
-		}
-
-		word = wordBuffer.toString();
-
-		return true;
-	}
-
-	private boolean findWordStart() {
-		while (++pos < sourceLength) {
-			char ch = source.charAt(pos);
-			if (ch == SINGLE_QUOTE) {
-				// read a literal value and just
-				// append to string builder
-				sb.append(ch);
-				readLiteral();
-			} else if (ch == COLON) {
-				// read a named parameter
-				// just append to string builder
-				sb.append(ch);
-				readNamedParameter();
-			} else if (isWordStart(ch)) {
-				// its the start of a word that could
-				// be translated
-				return true;
-			} else {
-				sb.append(ch);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Read the rest of a literal value. These do not get translated so are just
-	 * read and appended to the string builder.
-	 */
-	private void readLiteral() {
-		while (++pos < sourceLength) {
-			char ch = source.charAt(pos);
-			sb.append(ch);
-			if (ch == SINGLE_QUOTE) {
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Read a named parameter. These are not translated. They will be replaced
-	 * by positioned parameters later.
-	 */
-	private void readNamedParameter() {
-		while (++pos < sourceLength) {
-			char ch = source.charAt(pos);
-			sb.append(ch);
-			if (Character.isWhitespace(ch)) {
-				break;
-			} else if (ch == ',') {
-				break;
-			}
-		}
-	}
-
-	/**
-	 * return true if the char is a letter, digit or underscore.
-	 */
-	private boolean isWordPart(char ch) {
-    return Character.isLetterOrDigit(ch) || ch == UNDERSCORE || ch == PERIOD;
-  }
-
-	private boolean isWordStart(char ch) {
-    return Character.isLetter(ch);
-	}
-}
@@ -1,52 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.avaje.ebeaninternal.server.el.ElPropertyDeploy;
-
-/**
- * Converts logical property names to database columns with table alias.
- * <p>
- * In doing so it builds an 'includes' set which becomes the joins required to
- * support the properties parsed.
- * </p>
- */
-public final class DeployPropertyParser extends DeployParser {
-
-	
-	private final BeanDescriptor<?> beanDescriptor;
-	
-	private final Set<String> includes = new HashSet<>();
-
-	public DeployPropertyParser(BeanDescriptor<?> beanDescriptor) {
-		this.beanDescriptor = beanDescriptor;
-	}
-
-    public Set<String> getIncludes() {
-		return includes;
-	}
-	
-	@Override
-    public String getDeployWord(String expression) {
-        ElPropertyDeploy elProp = beanDescriptor.getElPropertyDeploy(expression);
-        if (elProp == null){
-            return null;
-        } else {
-            addIncludes(elProp.getElPrefix());
-            return elProp.getElPlaceholder(encrypted);
-        }
-    }
-
-	@Override
-    public String convertWord() {
-		String r = getDeployWord(word);
-		return r == null ? word : r;
-	}
-
-	private void addIncludes(String prefix) {
-		if (prefix != null){
-			includes.add(prefix);
-		}
-	}
-}
@@ -1,90 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-import java.util.Set;
-
-import com.avaje.ebeaninternal.server.el.ElPropertyDeploy;
-
-/**
- * For updates converts logical property names to database columns and bean type to base table.
- */
-public final class DeployUpdateParser extends DeployParser {
-
-	private final BeanDescriptor<?> beanDescriptor;
-	
-	public DeployUpdateParser(BeanDescriptor<?> beanDescriptor) {
-		this.beanDescriptor = beanDescriptor;
-	}
-	
-	/**
-	 * Return null as not used for updates.
-	 */
-	@Override
-	public Set<String> getIncludes() {
-		return null;
-	}
-
-	public String convertWord() {
-
-		String dbWord = getDeployWord(word);
-
-		if (dbWord != null) {
-			return dbWord;
-		} 
-		// maybe tableAlias.propertyName
-		return convertSubword(0, word, null);			
-	}
-
-	private String convertSubword(int start, String currentWord, StringBuilder localBuffer) {
-		
-		int dotPos = currentWord.indexOf('.', start);
-		if (start == 0 && dotPos == -1){
-			return currentWord;
-		}
-		if (start == 0){
-			localBuffer = new StringBuilder();
-		}
-		if (dotPos == -1){
-			// no match... 
-			localBuffer.append(currentWord.substring(start));
-			return localBuffer.toString();
-		}
-		
-		// append up to the dot
-		localBuffer.append(currentWord.substring(start, dotPos+1));
-		
-		if (dotPos == currentWord.length()-1){
-			// ends with a "." ???
-			return localBuffer.toString();
-		}
-		
-		// get the remainder after the dot
-		start = dotPos+1;
-		String remainder = currentWord.substring(start, currentWord.length());
-		
-		//String dbWord = deployMap.get(remainder.toLowerCase());
-		String dbWord = getDeployWord(remainder);
-		if (dbWord != null){
-			// we have found a match for the remainder
-			localBuffer.append(dbWord);
-			return localBuffer.toString();
-		} else {
-			//
-			return convertSubword(start, currentWord, localBuffer);
-		}
-	}
-	
-	public String getDeployWord(String expression) {
-	
-		if (expression.equalsIgnoreCase(beanDescriptor.getName())){
-			return beanDescriptor.getBaseTable();
-		}
-
-		ElPropertyDeploy elProp = beanDescriptor.getElPropertyDeploy(expression);
-		if (elProp != null){
-			return elProp.getDbColumn();
-		} else {
-			return null;
-		}
-	}
-	
-}
@@ -1,13 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-/**
- * Used to visit all the InheritInfo in a single inheritance hierarchy.
- */
-public interface InheritInfoVisitor {
-
-	/**
- 	 * visit the InheritInfo for this node.
-	 */
-	void visit(InheritInfo inheritInfo);
-	
-}
@@ -1,78 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-/**
- * Helper object to find generic parameter types for a given class.
- */
-public class ParamTypeUtil {
-
-	/**
-	 * Find and return the parameter type given a generic interface or class.
-	 * <p>
-	 * This assumes there is only one generic parameter.
-	 * </p>
-	 * <p>
-	 * Returns null if no match was found.
-	 * </p>
-	 * @param cls the class to search for the parameter type
-	 * @param matchType the type which has the generic parameter
-	 */
-	public static Class<?> findParamType(Class<?> cls, Class<?> matchType) {
-
-		// search for: implementing a generic interface
-		Type paramType = matchByInterfaces(cls, matchType);
-		if (paramType == null){
-			// search for: extending a generic class
-			Type genericSuperclass = cls.getGenericSuperclass();
-			if (genericSuperclass != null){
-				paramType = matchParamType(genericSuperclass, matchType);
-			}
-		}
-
-		if (paramType instanceof Class<?>){
-			// only interested in classes
-			return (Class<?>)paramType;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Check if the type is a generic one with parameters and of the correct type we are
-	 * searching for. Return the parameter type if this matches otherwise return null.
-	 */
-	private static Type matchParamType(Type type, Class<?> matchType) {
-		if (type instanceof ParameterizedType){
-			ParameterizedType pt = (ParameterizedType)type;
-			Type rawType = pt.getRawType();
-			boolean isAssignable = matchType.isAssignableFrom((Class<?>) rawType);
-			if (isAssignable) {
-				// assume there is only one parameter type
-				Type[] typeArguments = pt.getActualTypeArguments();
-				if (typeArguments.length != 1){
-					String m = "Expecting only 1 generic paramater but got "+typeArguments.length+" for "+type;
-					throw new RuntimeException(m);
-				}
-				return typeArguments[0];
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Search the interfaces this class implements.
-	 */
-	private static Type matchByInterfaces(Class<?> cls, Class<?> matchType) {
-
-		Type[] gis = cls.getGenericInterfaces();
-    for (Type gi : gis) {
-      Type match = matchParamType(gi, matchType);
-      if (match != null) {
-        return match;
-      }
-    }
-		return null;
-	}
-}
@@ -1,42 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy;
-
-import com.avaje.ebean.event.BeanPersistListener;
-import com.avaje.ebeaninternal.server.core.bootup.BootupClasses;
-import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-/**
- * Manages the assignment/registration of BeanPersistListener with their
- * respective DeployBeanDescriptor's.
- */
-public class PersistListenerManager {
-
-	private static final Logger logger = LoggerFactory.getLogger(PersistListenerManager.class);
-
-	private final List<BeanPersistListener> list;
-
-	public PersistListenerManager(BootupClasses bootupClasses) {
-		list = bootupClasses.getBeanPersistListeners();
-	}
-
-	public int getRegisterCount() {
-		return list.size();
-	}
-
-	/**
-	 * Return the BeanPersistController for a given entity type.
-	 */
-	public <T> void addPersistListeners(DeployBeanDescriptor<T> deployDesc) {
-
-    for (BeanPersistListener listener : list) {
-      if (listener.isRegisterFor(deployDesc.getBeanType())) {
-        logger.debug("BeanPersistListener on[{}] {}", deployDesc.getFullName(), listener.getClass().getName());
-        deployDesc.addPersistListener(listener);
-      }
-    }
-	}
-
-}
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
-	<TITLE>Helpers for Id property conversion</TITLE>
-</HEAD>
-<Body BGCOLOR="#ffffff">
-Helpers for Id property conversion
-
-</Body>
-</HTML>
@@ -1,150 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy.meta;
-
-import com.avaje.ebeaninternal.server.deploy.BeanCascadeInfo;
-import com.avaje.ebeaninternal.server.deploy.BeanTable;
-
-/**
- * Abstract base for properties mapped to an associated bean, list, set or map.
- */
-public abstract class DeployBeanPropertyAssoc<T> extends DeployBeanProperty {
-
-	/**
-	 * The type of the joined bean.
-	 */
-	protected Class<T> targetType;
-
-	/**
-	 * Persist settings.
-	 */
-  private final BeanCascadeInfo cascadeInfo = new BeanCascadeInfo();
-
-	/**
-	 * The join table information.
-	 */
-  private BeanTable beanTable;
-
-	/**
-	 * Join between the beans.
-	 */
-  protected final DeployTableJoin tableJoin = new DeployTableJoin();
-
-	/**
-	 * Literal added to where clause of lazy loading query.
-	 */
-  private String extraWhere;
-
-	/**
-	 * From the deployment mappedBy attribute.
-	 */
-  private String mappedBy;
-
-	private String docStoreDoc;
-
-	/**
-	 * Construct the property.
-	 */
-	DeployBeanPropertyAssoc(DeployBeanDescriptor<?> desc, Class<T> targetType) {
-		super(desc, targetType, null, null);
-		this.targetType = targetType;
-	}
-
-  /**
-   * Return the target DeployBeanDescriptor for this associated bean property.
-   */
-	public DeployBeanDescriptor<?> getTargetDeploy() {
-		return desc.getDeploy(targetType).getDescriptor();
-	}
-
-	/**
-	 * Return the type of the target.
-	 * <p>
-	 * This is the class of the associated bean, or beans contained in a list,
-	 * set or map.
-	 * </p>
-	 */
-	public Class<T> getTargetType() {
-		return targetType;
-	}
-
-	/**
-	 * Return a literal expression that is added to the query that lazy loads
-	 * the collection.
-	 */
-	public String getExtraWhere() {
-		return extraWhere;
-	}
-
-	/**
-	 * Set a literal expression to add to the query that lazy loads the
-	 * collection.
-	 */
-	public void setExtraWhere(String extraWhere) {
-		this.extraWhere = extraWhere;
-	}
-	
-	/**
-	 * return the join to use for the bean.
-	 */
-	public DeployTableJoin getTableJoin() {
-		return tableJoin;
-	}
-
-	/**
-	 * Return the BeanTable for this association.
-	 * <p>
-	 * This has the table name which is used to determine the relationship for
-	 * this association.
-	 * </p>
-	 */
-	public BeanTable getBeanTable() {
-		return beanTable;
-	}
-
-	/**
-	 * Set the bean table.
-	 */
-	public void setBeanTable(BeanTable beanTable) {
-		this.beanTable = beanTable;
-		getTableJoin().setTable(beanTable.getBaseTable());
-	}
-
-	/**
-	 * Get the persist info.
-	 */
-	public BeanCascadeInfo getCascadeInfo() {
-		return cascadeInfo;
-	}
-
-
-	/**
-	 * Return the mappedBy deployment attribute.
-	 * <p>
-	 * This is the name of the property in the 'detail' bean that maps back to
-	 * this 'master' bean.
-	 * </p>
-	 */
-	public String getMappedBy() {
-		return mappedBy;
-	}
-
-	/**
-	 * Set mappedBy deployment attribute.
-	 */
-	public void setMappedBy(String mappedBy) {
-		if (!"".equals(mappedBy)) {
-			this.mappedBy = mappedBy;
-		}
-	}
-
-	/**
-	 * Set DocStoreEmbedded deployment information.
-	 */
-	public void setDocStoreEmbedded(String embeddedDoc) {
-		this.docStoreDoc = embeddedDoc;
-	}
-
-  public String getDocStoreDoc() {
-    return docStoreDoc;
-  }
-
-}
@@ -1,209 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy.meta;
-
-import com.avaje.ebean.bean.BeanCollection.ModifyListenMode;
-import com.avaje.ebeaninternal.server.deploy.ManyType;
-import com.avaje.ebeaninternal.server.deploy.TableJoin;
-
-/**
- * Property mapped to a List Set or Map.
- */
-public class DeployBeanPropertyAssocMany<T> extends DeployBeanPropertyAssoc<T> {
-
-  /**
-   * The type of the many, set, list or map.
-   */
-  final ManyType manyType;
-
-	ModifyListenMode modifyListenMode = ModifyListenMode.NONE;
-	
-	/**
-	 * Flag to indicate manyToMany relationship.
-	 */
-	boolean manyToMany;
-
-	/**
-	 * Flag to indicate this is a unidirectional relationship.
-	 */
-	boolean unidirectional;
-
-	/**
-	 * Join for manyToMany intersection table.
-	 */
-	DeployTableJoin intersectionJoin;
-
-	/**
-	 * For ManyToMany this is the Inverse join used to build reference queries.
-	 */
-	DeployTableJoin inverseJoin;
-
-	String fetchOrderBy;
-
-	String mapKey;
-
-  String intersectionDraftTable;
-
-  /**
-	 * Create this property.
-	 */
-	public DeployBeanPropertyAssocMany(DeployBeanDescriptor<?> desc, Class<T> targetType, ManyType manyType) {
-		super(desc, targetType);
-		this.manyType = manyType;
-	}
-
-	/**
-	 * When generics is not used for manyType you can specify via annotations.
-	 * <p>
-	 * Really only expect this for Scala due to a Scala compiler bug at the moment.
-	 * Otherwise I'd probably not bother support this.
-	 * </p>
-	 */
-	@SuppressWarnings("unchecked")
-	public void setTargetType(Class<?> cls){
-		this.targetType = (Class<T>)cls;
-	}
-	
-	
-	/**
-	 * Return the many type.
-	 */
-	public ManyType getManyType() {
-		return manyType;
-	}
-
-	/**
-	 * Return true if this is many to many.
-	 */
-	public boolean isManyToMany() {
-		return manyToMany;
-	}
-
-	/**
-	 * Set to true if this is a many to many.
-	 */
-	public void setManyToMany() {
-		this.manyToMany = true;
-	}
-
-	/**
-	 * Return the mode for listening to changes to the List Set or Map.
-	 */
-	public ModifyListenMode getModifyListenMode() {
-		return modifyListenMode;
-	}
-
-	/**
-	 * Set the mode for listening to changes to the List Set or Map.
-	 */
-	public void setModifyListenMode(ModifyListenMode modifyListenMode) {
-		this.modifyListenMode = modifyListenMode;
-	}
-
-	/**
-	 * Return true if this is a unidirectional relationship.
-	 */
-	public boolean isUnidirectional() {
-		return unidirectional;
-	}
-
-	/**
-	 * Set to true if this is a unidirectional relationship.
-	 */
-	public void setUnidirectional() {
-		this.unidirectional = true;
-	}
-
-	/**
-	 * Create the immutable version of the intersection join.
-	 */
-	public TableJoin createIntersectionTableJoin() {
-		if (intersectionJoin != null){
-			return new TableJoin(intersectionJoin);
-		} else {
-			return null;
-		}
-	}
-	
-	/**
-	 * Create the immutable version of the inverse join.
-	 */
-	public TableJoin createInverseTableJoin() {
-		if (inverseJoin != null){
-			return new TableJoin(inverseJoin);
-		} else {
-			return null;
-		}
-	}
-	
-	/**
-	 * ManyToMany only, join from local table to intersection table.
-	 */
-	public DeployTableJoin getIntersectionJoin() {
-		return intersectionJoin;
-	}
-
-	public DeployTableJoin getInverseJoin() {
-		return inverseJoin;
-	}
-
-	/**
-	 * ManyToMany only, join from local table to intersection table.
-	 */
-	public void setIntersectionJoin(DeployTableJoin intersectionJoin) {
-		this.intersectionJoin = intersectionJoin;
-	}
-
-	/**
-	 * ManyToMany only, join from foreign table to intersection table.
-	 */
-	public void setInverseJoin(DeployTableJoin inverseJoin) {
-		this.inverseJoin = inverseJoin;
-	}
-
-	/**
-	 * Return the order by clause used to order the fetching of the data for
-	 * this list, set or map.
-	 */
-	public String getFetchOrderBy() {
-		return fetchOrderBy;
-	}
-
-	/**
-	 * Return the default mapKey when returning a Map.
-	 */
-	public String getMapKey() {
-		return mapKey;
-	}
-
-	/**
-	 * Set the default mapKey to use when returning a Map.
-	 */
-	public void setMapKey(String mapKey) {
-		if (mapKey != null && !mapKey.isEmpty()) {
-			this.mapKey = mapKey;
-		}
-	}
-
-	/**
-	 * Set the order by clause used to order the fetching or the data for this
-	 * list, set or map.
-	 */
-	public void setFetchOrderBy(String orderBy) {
-		if (orderBy != null && !orderBy.isEmpty()) {
-			fetchOrderBy = orderBy;
-		}
-	}
-
-  /**
-   * Return a draft table for intersection between 2 @Draftable entities.
-   */
-  public String getIntersectionDraftTable() {
-    return (intersectionDraftTable != null) ? intersectionDraftTable : intersectionJoin.getTable();
-  }
-
-  /**
-   * ManyToMany between 2 @Draftable entities to also need draft intersection table.
-   */
-  public void setIntersectionDraftTable() {
-    this.intersectionDraftTable = intersectionJoin.getTable()+"_draft";
-  }
-}
@@ -1,100 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy.meta;
-
-import com.avaje.ebeaninternal.server.deploy.BeanPropertyCompoundRoot;
-import com.avaje.ebeaninternal.server.deploy.BeanPropertyCompoundScalar;
-import com.avaje.ebeaninternal.server.type.CtCompoundProperty;
-import com.avaje.ebeaninternal.server.type.CtCompoundType;
-import com.avaje.ebeaninternal.server.type.CtCompoundTypeScalarList;
-import com.avaje.ebeaninternal.server.type.ScalarType;
-
-import java.util.Map.Entry;
-
-
-/**
- * Property mapped to a joined bean.
- */
-public class DeployBeanPropertyCompound extends DeployBeanProperty {
-
-  private final CtCompoundType<?> compoundType;
-
-  private DeployBeanEmbedded deployEmbedded;
-
-  /**
-   * Create the property.
-   */
-  public DeployBeanPropertyCompound(DeployBeanDescriptor<?> desc, Class<?> targetType, CtCompoundType<?> compoundType) {
-
-    super(desc, targetType, null, null);
-    this.compoundType = compoundType;
-  }
-
-  public BeanPropertyCompoundRoot getFlatProperties() {
-
-    // get a 'flat' list of all the scalar types, their relative property names
-    // and also set their matching dbColumn
-
-    // represents the root property
-    BeanPropertyCompoundRoot rootProperty = new BeanPropertyCompoundRoot(this);
-
-    // Walk the tree of a compound type collecting the
-    // scalar types and non-scalar properties
-    CtCompoundTypeScalarList ctMeta = new CtCompoundTypeScalarList();
-
-    compoundType.accumulateScalarTypes(null, ctMeta);
-
-
-    // for each of the scalar types inside a compound value object
-    // build a BeanPropertyCompoundScalar with appropriate deployment
-    // information.
-
-    for (Entry<String, ScalarType<?>> entry : ctMeta.entries()) {
-
-      String relativePropertyName = entry.getKey();
-      ScalarType<?> scalarType = entry.getValue();
-
-      CtCompoundProperty ctProp = ctMeta.getCompoundType(relativePropertyName);
-
-
-      String dbColumn = (getName() + "." + relativePropertyName).replace(".", "_");
-      dbColumn = getDbColumn(relativePropertyName, dbColumn);
-
-      DeployBeanProperty deploy = new DeployBeanProperty(null, scalarType.getType(), scalarType, null);
-      deploy.setScalarType(scalarType);
-      deploy.setDbColumn(dbColumn);
-      deploy.setName(relativePropertyName);
-      deploy.setDbInsertable(true);
-      deploy.setDbUpdateable(true);
-      deploy.setDbRead(true);
-
-      rootProperty.register(new BeanPropertyCompoundScalar(rootProperty, deploy, ctProp));
-    }
-
-    rootProperty.setNonScalarProperties(ctMeta.getNonScalarProperties());
-    return rootProperty;
-  }
-
-  private String getDbColumn(String propName, String defaultDbColumn) {
-    if (deployEmbedded == null) {
-      return defaultDbColumn;
-    }
-    String dbColumn = deployEmbedded.getPropertyColumnMap().get(propName);
-    return dbColumn == null ? defaultDbColumn : dbColumn;
-  }
-
-  /**
-   * Return the deploy information specifically for the deployment
-   * of Embedded beans.
-   */
-  public DeployBeanEmbedded getDeployEmbedded() {
-    // deployment should be single threaded
-    if (deployEmbedded == null) {
-      deployEmbedded = new DeployBeanEmbedded();
-    }
-    return deployEmbedded;
-  }
-
-  public CtCompoundType<?> getCompoundType() {
-    return compoundType;
-  }
-
-}
@@ -1,90 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy.meta;
-
-import java.util.List;
-
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptorMap;
-import com.avaje.ebeaninternal.server.deploy.BeanProperty;
-import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne;
-
-
-/**
- * Used for associated beans in place of a BeanDescriptor. This is done to avoid
- * recursion issues due to the potentially bi-directional and circular
- * relationships between beans.
- * <p>
- * It holds the main deployment information and not all the detail that is held
- * in a BeanDescriptor.
- * </p>
- */
-public class DeployBeanTable {
-
-    private final Class<?> beanType;
-
-    /**
-     * The base table.
-     */
-    private String baseTable;
-
-    private List<DeployBeanProperty> idProperties;
-    
-    /**
-     * Create the BeanTable.
-     */
-    public DeployBeanTable(Class<?> beanType) {
-        this.beanType = beanType;
-    }
-    
-    /**
-     * Return the base table for this BeanTable.
-     * This is used to determine the join information
-     * for associations.
-     */
-    public String getBaseTable() {
-        return baseTable;
-    }
-
-    /**
-     * Set the base table for this BeanTable.
-     */
-    public void setBaseTable(String baseTable) {
-        this.baseTable = baseTable;
-    }
-    
-    /**
-     * Return the id properties.
-     */
-    public BeanProperty[] createIdProperties(BeanDescriptorMap owner) {
-    	BeanProperty[] props = new BeanProperty[idProperties.size()];
-    	for (int i = 0; i < idProperties.size(); i++) {
-    		props[i] = createProperty(owner, idProperties.get(i));
-		}
-		return props;
-	}
-    
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-	private BeanProperty createProperty(BeanDescriptorMap owner, DeployBeanProperty prop){
-    	
-    	if (prop instanceof DeployBeanPropertyAssocOne<?>){
-    		return new BeanPropertyAssocOne(owner, (DeployBeanPropertyAssocOne<?>)prop);
-    		
-    	} else {
-    		return new BeanProperty(prop);
-    	}
-    	
-    }
-
-    /**
-     * Set the Id properties.
-     */
-	public void setIdProperties(List<DeployBeanProperty> idProperties) {
-		this.idProperties = idProperties;
-	}
-
-	/**
-     * Return the class for this beanTable.
-     */
-    public Class<?> getBeanType() {
-        return beanType;
-    }
-
-}
@@ -1,185 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy.meta;
-
-import javax.persistence.JoinColumn;
-
-import com.avaje.ebeaninternal.server.deploy.BeanProperty;
-import com.avaje.ebeaninternal.server.deploy.BeanTable;
-
-/**
- * A join pair of local and foreign properties.
- */
-public class DeployTableJoinColumn {
-
-	/**
-	 * The local database column name.
-	 */
-	String localDbColumn;
-
-	/**
-	 * SQL formula used for local column
-	 */
-  String localSqlFormula;
-
-	/**
-	 * The foreign database column name.
-	 */
-	String foreignDbColumn;
-	
-	/**
-   * SQL formula used for foreign column
-   */
-  String foreignSqlFormula;
-
-  boolean insertable;
-
-  boolean updateable;
-  
-
-	
-	/**
-	 * Construct when automatically determining the join.
-	 * <p>
-	 * Assume that we want the foreign key to be insertable and updateable.
-	 * </p>
-	 */
-	public DeployTableJoinColumn(String localDbColumn, String foreignDbColumn) {
-		this(localDbColumn, foreignDbColumn, true, true);
-	}
-	    
-	/**
-	 * Construct with explicit insertable and updateable flags.
-	 */
-	public DeployTableJoinColumn(String localDbColumn, String foreignDbColumn, boolean insertable, boolean updateable) {
-		this.localDbColumn = nullEmptyString(localDbColumn);
-		this.foreignDbColumn = nullEmptyString(foreignDbColumn);
-		this.insertable = insertable;
-		this.updateable = updateable;
-	}
-  
-	public void setLocalSqlFormula(String localSqlFormula) {
-	  if (localSqlFormula != null) {
-	    this.localSqlFormula = localSqlFormula;
-	    this.localDbColumn = null;
-	    this.insertable = false;
-	    this.updateable = false;
-	  }
-  }
-	
-	public String getLocalSqlFormula() {
-    return localSqlFormula;
-  }
-	
-	public void setForeignSqlFormula(String foreignSqlFormula) {
-	  if (foreignSqlFormula != null) {
-	    this.foreignSqlFormula = foreignSqlFormula;
-	    this.foreignDbColumn = null;
-	    this.insertable = false;
-	    this.updateable = false;
-	  }
-  }
-	
-	public String getForeignSqlFormula() {
-    return foreignSqlFormula;
-  }
-	
-	
-    public DeployTableJoinColumn(boolean order, JoinColumn jc, BeanTable beanTable) {
-    	this(jc.referencedColumnName(), jc.name(), jc.insertable(), jc.updatable());
-    	setReferencedColumn(beanTable);
-    	if (!order){
-    		reverse();
-    	}
-    }
-
-    private void setReferencedColumn(BeanTable beanTable){
-    	if (localDbColumn == null){
-    		BeanProperty[] idProperties = beanTable.getIdProperties();
-    		if (idProperties.length == 1){
-    			localDbColumn = idProperties[0].getDbColumn();
-    		}
-    	}
-    }
-    
-    /**
-     * Reverse the direction of the join.
-     */
-    public DeployTableJoinColumn reverse() {
-    	String temp = localDbColumn;
-    	localDbColumn = foreignDbColumn;
-    	foreignDbColumn = temp;
-    	
-    	temp = localSqlFormula;
-    	localSqlFormula = foreignSqlFormula;
-    	foreignSqlFormula = temp;
-    	return this;
-    }
-
-    /**
-     * Helper method to null out empty strings.
-     */
-	private String nullEmptyString(String s){
-		if ("".equals(s)){
-			return null;
-		}
-		return s;
-	}
-	
-	
-	public DeployTableJoinColumn copy(boolean reverse) {
-		// Note that the insertable and updateable are just copied 
-		// which may not always be the correct thing to do
-		// but will leave it like this for now
-	  DeployTableJoinColumn ret;
-		if (reverse){
-			ret = new DeployTableJoinColumn(foreignDbColumn, localDbColumn, insertable, updateable);
-			ret.setLocalSqlFormula(foreignSqlFormula);
-			ret.setForeignSqlFormula(localSqlFormula);
-			
-		} else {
-			ret = new DeployTableJoinColumn(localDbColumn, foreignDbColumn, insertable, updateable);			
-      ret.setLocalSqlFormula(localSqlFormula);
-      ret.setForeignSqlFormula(foreignSqlFormula);
-		}
-		return ret;
-	}
-
-	public String toString() {
-		return localDbColumn + " = " + foreignDbColumn;
-	}
-
-	/**
-	 * Return true if this column should be insertable.
-	 */
-	public boolean isInsertable() {
-		return insertable;
-	}
-
-	/**
-	 * Return true if this column should be updateable.
-	 */
-	public boolean isUpdateable() {
-		return updateable;
-	}
-
-	/**
-	 * Return the foreign database column name.
-	 */
-	public String getForeignDbColumn() {
-		return foreignDbColumn;
-	}
-
-	/**
-	 * Return the local database column name.
-	 */
-	public String getLocalDbColumn() {
-		return localDbColumn;
-	}
-
-	/**
-	 * Set the local database column name.
-   */
-	public void setLocalDbColumn(String localDbColumn) {
-		this.localDbColumn = localDbColumn;
-	}
-
-}
@@ -1,10 +0,0 @@
-<html>
-<head>
-	<meta HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
-	<title>Temporary objects used to collect deployment information</title>
-</head>
-<body BGCOLOR="#ffffff">
-Temporary objects used to collect deployment information
-
-</body>
-</html>
@@ -1,14 +0,0 @@
-<html>
-<head>
-	<meta HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
-	<title>Bean description</title>
-</head>
-<body BGCOLOR="#ffffff">
-Bean description
-
-<p>
-Describes beans with their properties and configuration.
-</p>
-
-</body>
-</html>
@@ -1,23 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy.parse;
-
-import com.avaje.ebean.annotation.Sql;
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
-
-/**
- * Read the class level deployment annotations.
- */
-public class AnnotationSql extends AnnotationParser {
-
-  public AnnotationSql(DeployBeanInfo<?> info, boolean javaxValidationAnnotations) {
-    super(info, javaxValidationAnnotations);
-  }
-
-  public void parse() {
-    Class<?> cls = descriptor.getBeanType();
-    Sql sql = AnnotationBase.findAnnotation(cls,Sql.class);
-    if (sql != null) {
-      descriptor.setEntityType(BeanDescriptor.EntityType.SQL);
-    }
-  }
-
-}
@@ -1,92 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy.parse;
-
-import com.avaje.ebean.RawSql;
-import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
-import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoin;
-import com.avaje.ebeaninternal.server.query.SqlJoinType;
-
-import java.util.HashMap;
-
-/**
- * Wraps information about a bean during deployment parsing.
- */
-public class DeployBeanInfo<T> {
-
-	/**
-	 * Holds TableJoins for secondary table properties.
-	 */
-	private final HashMap<String,DeployTableJoin> tableJoinMap = new HashMap<>();
-
-	private final DeployUtil util;
-
-	private final DeployBeanDescriptor<T> descriptor;
-
-	/**
-	 * Create with a DeployUtil and BeanDescriptor.
-	 */
-	public DeployBeanInfo(DeployUtil util, DeployBeanDescriptor<T> descriptor) {
-		this.util = util;
-		this.descriptor = descriptor;
-	}
-
-	public String toString() {
-		return ""+descriptor;
-	}
-
-	/**
-	 * Return the BeanDescriptor currently being processed.
-	 */
-	public DeployBeanDescriptor<T> getDescriptor() {
-		return descriptor;
-	}
-
-	/**
-	 * Return the DeployUtil we are using.
-	 */
-	public DeployUtil getUtil() {
-		return util;
-	}
-	
-	/**
-	 * Appropriate TableJoin for a property mapped to a secondary table.
-	 */
-	public DeployTableJoin getTableJoin(String tableName) {
-
-		String key = tableName.toLowerCase();
-
-		DeployTableJoin tableJoin = tableJoinMap.get(key);
-		if (tableJoin == null) {
-			tableJoin = new DeployTableJoin();
-			tableJoin.setTable(tableName);
-			tableJoin.setType(SqlJoinType.INNER);
-			descriptor.addTableJoin(tableJoin);
-
-			tableJoinMap.put(key, tableJoin);
-		}
-		return tableJoin;
-	}
-
-	/**
-	 * Set a the join alias for a assoc one property.
-	 */
-	public void setBeanJoinType(DeployBeanPropertyAssocOne<?> beanProp, boolean outerJoin) {
-
-		DeployTableJoin tableJoin = beanProp.getTableJoin();
-		tableJoin.setType(outerJoin ? SqlJoinType.OUTER : SqlJoinType.INNER);
-	}
-
-  /**
-   * Add named RawSql from ebean.xml.
-   */
-	public void addRawSql(String name, RawSql rawSql) {
-		descriptor.addRawSql(name, rawSql);
-	}
-
-	/**
-	 * Add the named query.
-   */
-	public void addNamedQuery(String name, String query) {
-		descriptor.addNamedQuery(name, query);
-	}
-}
@@ -1,91 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy.parse;
-
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager;
-import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory;
-
-
-/**
- * Read the deployment annotations for the bean.
- */
-public class ReadAnnotations {
-
-  /**
-   * Creates appropriate generated properties - WhenXXX, WhoXXX, Version etc.
-   */
-  private final GeneratedPropertyFactory generatedPropFactory;
-
-  /**
-   * Typically _with_history and when appended to the base table derives the name of
-   * the view that unions the base table with the history table to support asOf queries.
-   */
-  private final String asOfViewSuffix;
-
-  private final String versionsBetweenSuffix;
-
-  /**
-   * True if the javax validation annotations are present in the classpath.
-   */
-  private final boolean javaxValidationAnnotations;
-
-  /**
-   * True if the jackson annotations are present in the classpath.
-   */
-  private final boolean jacksonAnnotations;
-
-  private final boolean disableL2Cache;
-
-  public ReadAnnotations(GeneratedPropertyFactory generatedPropFactory, String asOfViewSuffix, String versionsBetweenSuffix, boolean disableL2Cache) {
-    this.generatedPropFactory = generatedPropFactory;
-    this.asOfViewSuffix = asOfViewSuffix;
-    this.versionsBetweenSuffix = versionsBetweenSuffix;
-    this.javaxValidationAnnotations = generatedPropFactory.getClassLoadConfig().isJavaxValidationAnnotationsPresent();
-    this.jacksonAnnotations = generatedPropFactory.getClassLoadConfig().isJacksonAnnotationsPresent();
-    this.disableL2Cache = disableL2Cache;
-  }
-
-  /**
-   * Read the initial non-relationship annotations included Id and EmbeddedId.
-   * <p>
-   * We then have enough to create BeanTables which are used in readAssociations
-   * to resolve the relationships etc.
-   * </p>
-   */
-  public void readInitial(DeployBeanInfo<?> info, boolean eagerFetchLobs) {
-
-    try {
-      new AnnotationClass(info, javaxValidationAnnotations, asOfViewSuffix, versionsBetweenSuffix, disableL2Cache).parse();
-      new AnnotationFields(generatedPropFactory, info, javaxValidationAnnotations, jacksonAnnotations, eagerFetchLobs).parse();
-
-    } catch (RuntimeException e) {
-      throw new RuntimeException("Error reading annotations for " + info, e);
-    }
-  }
-
-  /**
-   * Read and process the associated relationship annotations.
-   * <p>
-   * These can only be processed after the BeanTables have been created
-   * </p>
-   * <p>
-   * This uses the factory as a call back to get the BeanTable for a given
-   * associated bean.
-   * </p>
-   */
-  public void readAssociations(DeployBeanInfo<?> info, BeanDescriptorManager factory) {
-
-    try {
-
-      new AnnotationAssocOnes(info, javaxValidationAnnotations, factory).parse();
-      new AnnotationAssocManys(info, javaxValidationAnnotations, factory).parse();
-
-      // read the Sql annotations last because they may be
-      // dependent on field level annotations
-      new AnnotationSql(info, javaxValidationAnnotations).parse();
-
-      new AnnotationClass(info).parseAttributeOverride();
-
-    } catch (RuntimeException e) {
-      throw new RuntimeException("Error reading annotations for " + info, e);
-    }
-  }
-}
@@ -1,78 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy.parse;
-
-import java.util.HashSet;
-
-/**
- * Keywords deemed inappropriate for use as table alias' column or table name.
- * <p>
- * That is, they might cause sql syntax errors if used.
- * </p>
- */
-public class SqlReservedWords {
-
-	private static final String baseKeyWords =
-		"ALIAS,ALTER,ADD,ALL,ARE,AND,ANY,ARRAY"
-		+",AS,ASC,AT"
-		+",AVG,BEGIN,BETWEEN,BIGINT,BINARY,BIT,BIT_LENGTH,BLOB,BOOLEAN"
-		+",BOTH,BY,CALL,CALLED,CASCADE,CASCADED,CASE,CAST,CATALOG,CHAR"
-		+",CHARACTER,CHECK,CLOB,CLOSE,COALESCE,COLLATE"
-		+",COLLATION,COLUMN,COMMIT,CONDITION,CONNECT,CONNECTION,CONSTRAINT"
-		+",CONSTRAINTS,CONSTRUCTOR,CONTAINS,CONTINUE,CONVERT"
-		+",COUNT,CREATE,CROSS,CURRENT_DATE"
-		+",CURRENT_PATH,CURRENT_ROLE,CURRENT_TIME,CURRENT_TIMESTAMP"
-		+",CURRENT_USER,CURSOR,DATE"
-		+",DAY,DEC,DECIMAL,DECLARE,DEFAULT,DELETE"
-		+",DESC"
-		+",DISTINCT,DO,DOUBLE,DROP,ELSE,ELSEIF,END,EQUALS"
-		+",EXEC,EXIT,EXISTS,EXTRACT"
-		+",FLOAT,FROM,FOR,FREE"
-		+",GET,GLOBAL,GO,GOTO,GRANT,GROUP,HAVING,HOUR"
-		+",IF,IN,INNER,INOUT,INSERT"
-		+",INT,INTEGER,INTO,IS,JOIN"
-		+",LAST,LIKE,LIMIT"
-		+",MAX,MIN"
-		+",NCHAR,NCLOB,NOT"
-		+",NULL,NULLIF,NUMERIC,"
-		+",OR,ORDER,OUTER"
-		+",REAL,REF,REFERENCES"
-		+",RETURN,RETURNS"
-		+",SELECT,SSL"
-		+",SMALLINT,"
-		+",SYSTEM,SYSTEM_USER,TABLE"
-		+",TO"
-		+",TRIGGER,UNION,UNIQUE"
-		+",UPDATE,USER,VARCHAR,VIEW,WHEN"
-		+",WHERE,WITH";
-
-
-	private static final HashSet<String> keywords = new HashSet<>();
-	static {
-
-		String[] initialKeywords = baseKeyWords.split(",");
-    for (String initialKeyword : initialKeywords) {
-      keywords.add(initialKeyword.trim());
-    }
-
-	}
-
-
-	/**
-	 * Return true if the tableAlias is a keyword.
-	 */
-	public static synchronized boolean isKeyword(String keyword){
-		String s = keyword.trim().toUpperCase();
-		return keywords.contains(s);
-	}
-
-	/**
-	 * Add a sql keyword to the known set.
-	 */
-	public static synchronized void addKeyword(String keyword){
-		if (keyword != null){
-			keyword = keyword.trim().toUpperCase();
-			if (!keyword.isEmpty()){
-				keywords.add(keyword);
-			}
-		}
-	}
-}
@@ -1,48 +0,0 @@
-package com.avaje.ebeaninternal.server.deploy.parse;
-
-import java.util.List;
-
-import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty;
-import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany;
-import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
-
-/**
- * Mark transient properties.
- */
-public class TransientProperties {
-
-	public TransientProperties() {
-	}
-
-    /**
-     * Mark any additional properties as transient.
-     */
-    public void process(DeployBeanDescriptor<?> desc) {
-
-        List<DeployBeanProperty> props = desc.propertiesBase();
-      for (DeployBeanProperty prop : props) {
-        if (!prop.isDbRead() && !prop.isDbInsertable() && !prop.isDbUpdateable()) {
-          // non-transient...
-          prop.setTransient();
-        }
-      }
-
-        List<DeployBeanPropertyAssocOne<?>> ones = desc.propertiesAssocOne();
-      for (DeployBeanPropertyAssocOne<?> prop : ones) {
-        if (prop.getBeanTable() == null) {
-          if (!prop.isEmbedded()) {
-            prop.setTransient();
-          }
-        }
-      }
-
-        List<DeployBeanPropertyAssocMany<?>> manys = desc.propertiesAssocMany();
-      for (DeployBeanPropertyAssocMany<?> prop : manys) {
-        if (prop.getBeanTable() == null) {
-          prop.setTransient();
-        }
-      }
-
-    }
-}
@@ -1,16 +0,0 @@
-<!ELEMENT ebean (table | iudextender | findextender | datasource | primarykeys | property)* >
-  <!ELEMENT table EMPTY >
-    <!ATTLIST table name CDATA #REQUIRED>
-  <!ELEMENT iudextender EMPTY >
-    <!ATTLIST iudextender classname CDATA #REQUIRED>
-  <!ELEMENT findextender EMPTY >
-    <!ATTLIST findextender classname CDATA #REQUIRED>
-  <!ELEMENT datasource EMPTY >
-    <!ATTLIST datasource name CDATA #REQUIRED>
-  <!ELEMENT primarykeys EMPTY >
-    <!ATTLIST primarykeys keys CDATA #REQUIRED>
-  <!ELEMENT property EMPTY >
-    <!ATTLIST property name CDATA #REQUIRED
-                     datatype CDATA #REQUIRED
-                     deploydatatype CDATA #IMPLIED
-                     deployname CDATA #IMPLIED >
@@ -1,11 +0,0 @@
-<HTML>
-<HEAD>
-	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
-	<TITLE>Deployment information parsing</TITLE>
-</HEAD>
-<Body BGCOLOR="#ffffff">
-Deployment information parsing
-
-
-</Body>
-</HTML>
@@ -1 +0,0 @@
-package com.avaje.ebeaninternal.server.el;
@@ -1,121 +0,0 @@
-package com.avaje.ebeaninternal.server.expression;
-
-import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
-import com.avaje.ebeaninternal.api.ManyWhereJoins;
-import com.avaje.ebeaninternal.api.SpiExpression;
-import com.avaje.ebeaninternal.api.SpiExpressionRequest;
-import com.avaje.ebeaninternal.api.SpiExpressionValidation;
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
-import com.avaje.ebeaninternal.server.deploy.id.IdBinder;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * Slightly redundant as Query.setId() ultimately also does the same job.
- */
-public class IdInExpression extends NonPrepareExpression {
-
-  private final List<?> idList;
-
-  public IdInExpression(List<?> idList) {
-    this.idList = idList;
-  }
-
-  @Override
-  public String nestedPath(BeanDescriptor<?> desc) {
-    return null;
-  }
-
-  @Override
-  public void containsMany(BeanDescriptor<?> desc, ManyWhereJoins manyWhereJoin) {
-  }
-
-  @Override
-  public void writeDocQuery(DocQueryContext context) throws IOException {
-    context.writeIds(idList);
-  }
-
-  @Override
-  public void validate(SpiExpressionValidation validation) {
-    // always valid
-  }
-
-  @Override
-  public void addBindValues(SpiExpressionRequest request) {
-
-    // Bind the Id values including EmbeddedId and multiple Id
-
-    DefaultExpressionRequest r = (DefaultExpressionRequest) request;
-    BeanDescriptor<?> descriptor = r.getBeanDescriptor();
-    IdBinder idBinder = descriptor.getIdBinder();
-
-    for (Object anIdList : idList) {
-      idBinder.addIdInBindValue(request, anIdList);
-    }
-  }
-
-  /**
-   * For use with deleting non attached detail beans during stateless update.
-   */
-  public void addSqlNoAlias(SpiExpressionRequest request) {
-
-    DefaultExpressionRequest r = (DefaultExpressionRequest) request;
-    BeanDescriptor<?> descriptor = r.getBeanDescriptor();
-    IdBinder idBinder = descriptor.getIdBinder();
-
-    request.append(descriptor.getIdBinder().getBindIdInSql(null));
-    String inClause = idBinder.getIdInValueExpr(idList.size());
-    request.append(inClause);
-  }
-
-  @Override
-  public void addSql(SpiExpressionRequest request) {
-
-    DefaultExpressionRequest r = (DefaultExpressionRequest) request;
-    BeanDescriptor<?> descriptor = r.getBeanDescriptor();
-    IdBinder idBinder = descriptor.getIdBinder();
-
-    request.append(descriptor.getIdBinderInLHSSql());
-    String inClause = idBinder.getIdInValueExpr(idList.size());
-    request.append(inClause);
-  }
-
-  /**
-   * Incorporates the number of Id values to bind.
-   */
-  @Override
-  public void queryPlanHash(HashQueryPlanBuilder builder) {
-    builder.add(IdInExpression.class).add(idList.size());
-    builder.bind(idList.size());
-  }
-
-  @Override
-  public int queryBindHash() {
-    return idList.hashCode();
-  }
-
-  @Override
-  public boolean isSameByPlan(SpiExpression other) {
-    if (!(other instanceof IdInExpression)) {
-      return false;
-    }
-
-    IdInExpression that = (IdInExpression) other;
-    return this.idList.size() == that.idList.size();
-  }
-
-  @Override
-  public boolean isSameByBind(SpiExpression other) {
-    IdInExpression that = (IdInExpression) other;
-    if (this.idList.size() != that.idList.size()) {
-      return false;
-    }
-    for (int i = 0; i < idList.size(); i++) {
-      if (!idList.get(i).equals(that.idList.get(i))) {
-        return false;
-      }
-    }
-    return true;
-  }
-}
@@ -1,154 +0,0 @@
-package com.avaje.ebeaninternal.server.expression;
-
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebean.event.BeanQueryRequest;
-import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
-import com.avaje.ebeaninternal.api.SpiExpression;
-import com.avaje.ebeaninternal.api.SpiExpressionRequest;
-import com.avaje.ebeaninternal.server.el.ElPropertyValue;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-class InExpression extends AbstractExpression {
-
-  private final boolean not;
-
-  private final Collection<?> sourceValues;
-
-  private Object[] bindValues;
-
-  InExpression(String propertyName, Collection<?> sourceValues, boolean not) {
-    super(propertyName);
-    this.sourceValues = sourceValues;
-    this.not = not;
-  }
-
-  InExpression(String propertyName, Object[] array, boolean not) {
-    super(propertyName);
-    this.sourceValues = Arrays.asList(array);
-    this.not = not;
-  }
-
-  private Object[] values() {
-    List<Object> vals = new ArrayList<>();
-    for (Object sourceValue : sourceValues) {
-      NamedParamHelp.valueAdd(vals, sourceValue);
-    }
-    return vals.toArray();
-  }
-
-  @Override
-  public void prepareExpression(BeanQueryRequest<?> request) {
-    bindValues = values();
-  }
-
-  @Override
-  public void writeDocQuery(DocQueryContext context) throws IOException {
-    context.writeIn(propName, values(), not);
-  }
-
-  @Override
-  public void addBindValues(SpiExpressionRequest request) {
-
-    ElPropertyValue prop = getElProp(request);
-    if (prop != null && !prop.isAssocId()) {
-      prop = null;
-    }
-
-    for (Object bindValue : bindValues) {
-      if (prop == null) {
-        request.addBindValue(bindValue);
-
-      } else {
-        // extract the id values from the bean
-        Object[] ids = prop.getAssocIdValues((EntityBean) bindValue);
-        if (ids != null) {
-          for (Object id : ids) {
-            request.addBindValue(id);
-          }
-        }
-      }
-    }
-  }
-
-  @Override
-  public void addSql(SpiExpressionRequest request) {
-
-    if (bindValues.length == 0) {
-      String expr = not ? "1=1" : "1=0";
-      request.append(expr);
-      return;
-    }
-
-    ElPropertyValue prop = getElProp(request);
-    if (prop != null && !prop.isAssocId()) {
-      prop = null;
-    }
-
-    if (prop != null) {
-      request.append(prop.getAssocIdInExpr(propName));
-      String inClause = prop.getAssocIdInValueExpr(bindValues.length);
-      request.append(inClause);
-
-    } else {
-      request.append(propName);
-      if (not) {
-        request.append(" not");
-      }
-      request.append(" in (?");
-      for (int i = 1; i < bindValues.length; i++) {
-        request.append(", ").append("?");
-      }
-
-      request.append(" ) ");
-    }
-  }
-
-  /**
-   * Based on the number of values in the in clause.
-   */
-  @Override
-  public void queryPlanHash(HashQueryPlanBuilder builder) {
-    builder.add(InExpression.class).add(propName).add(bindValues.length).add(not);
-    builder.bind(bindValues.length);
-  }
-
-  @Override
-  public int queryBindHash() {
-    int hc = 92821;
-    for (Object bindValue : bindValues) {
-      hc = 92821 * hc + bindValue.hashCode();
-    }
-    return hc;
-  }
-
-  @Override
-  public boolean isSameByPlan(SpiExpression other) {
-    if (!(other instanceof InExpression)) {
-      return false;
-    }
-
-    InExpression that = (InExpression) other;
-    return propName.equals(that.propName)
-      && not == that.not
-      && bindValues.length == that.bindValues.length;
-  }
-
-  @Override
-  public boolean isSameByBind(SpiExpression other) {
-    InExpression that = (InExpression) other;
-    if (this.bindValues.length != that.bindValues.length) {
-      return false;
-    }
-    for (int i = 0; i < bindValues.length; i++) {
-      if (!bindValues[i].equals(that.bindValues[i])) {
-        return false;
-      }
-    }
-    return true;
-  }
-}
@@ -1,292 +0,0 @@
-package com.avaje.ebeaninternal.server.lib.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Utility String class that supports String manipulation functions.
- */
-public class StringHelper {
-
-  /**
-   * Parses out a list of Name Value pairs that are delimited together. Will
-   * always return a StringMap. If allNameValuePairs is null, or no name
-   * values can be parsed out an empty StringMap is returned.
-   *
-   * @param allNameValuePairs  the entire string to be parsed.
-   * @param listDelimiter      (typically ';') the delimited between the list
-   * @param nameValueSeparator (typically '=') the separator between the name and value
-   */
-  public static Map<String, String> delimitedToMap(String allNameValuePairs,
-                                                   String listDelimiter, String nameValueSeparator) {
-
-    HashMap<String, String> params = new HashMap<>();
-    if ((allNameValuePairs == null) || (allNameValuePairs.isEmpty())) {
-      return params;
-    }
-    // trim off any leading listDelimiter...
-    allNameValuePairs = trimFront(allNameValuePairs, listDelimiter);
-    return getKeyValue(params, 0, allNameValuePairs, listDelimiter, nameValueSeparator);
-  }
-
-  /**
-   * Trims off recurring strings from the front of a string.
-   *
-   * @param source the source string
-   * @param trim   the string to trim off the front
-   */
-  public static String trimFront(String source, String trim) {
-    if (source == null) {
-      return null;
-    }
-    if (source.indexOf(trim) == 0) {
-      // dp("trim ...");
-      return trimFront(source.substring(trim.length()), trim);
-    } else {
-      return source;
-    }
-  }
-
-  /**
-   * Return true if the value is null or an empty string.
-   */
-  public static boolean isNull(String value) {
-    return value == null || value.trim().isEmpty();
-  }
-
-  /**
-   * Recursively pulls out the key value pairs from a raw string.
-   */
-  private static HashMap<String, String> getKeyValue(HashMap<String, String> map, int pos,
-                                                     String allNameValuePairs, String listDelimiter, String nameValueSeparator) {
-
-    if (pos >= allNameValuePairs.length()) {
-      // dp("end as "+pos+" >= "+allNameValuePairs.length() );
-      return map;
-    }
-
-    int equalsPos = allNameValuePairs.indexOf(nameValueSeparator, pos);
-    int delimPos = allNameValuePairs.indexOf(listDelimiter, pos);
-
-    if (delimPos == -1) {
-      delimPos = allNameValuePairs.length();
-    }
-    if (equalsPos == -1) {
-      // dp("no more equals...");
-      return map;
-    }
-    if (delimPos == (equalsPos + 1)) {
-      // dp("Ignoring as nothing between delim and equals...
-      // delim:"+delimPos+" eq:"+equalsPos);
-      return getKeyValue(map, delimPos + 1, allNameValuePairs, listDelimiter,
-        nameValueSeparator);
-    }
-    if (equalsPos > delimPos) {
-      // there is a key without a value?
-      String key = allNameValuePairs.substring(pos, delimPos);
-      key = key.trim();
-      if (!key.isEmpty()) {
-        map.put(key, null);
-      }
-      return getKeyValue(map, delimPos + 1, allNameValuePairs, listDelimiter,
-        nameValueSeparator);
-
-    }
-    String key = allNameValuePairs.substring(pos, equalsPos);
-
-    if (delimPos > -1) {
-      String value = allNameValuePairs.substring(equalsPos + 1, delimPos);
-      // dp("cont "+key+","+value+" pos:"+pos+"
-      // len:"+allNameValuePairs.length());
-      key = key.trim();
-
-      map.put(key, value);
-      pos = delimPos + 1;
-
-      // recurse the rest of the values...
-      return getKeyValue(map, pos, allNameValuePairs, listDelimiter, nameValueSeparator);
-    } else {
-      // dp("ERROR: delimPos < 0 ???");
-      return map;
-    }
-  }
-
-  /**
-   * This method takes a String and will replace all occurrences of the match
-   * String with that of the replace String.
-   *
-   * @param source  the source string
-   * @param match   the string used to find a match
-   * @param replace the string used to replace match with
-   * @return the source string after the search and replace
-   */
-  public static String replaceString(String source, String match, String replace) {
-    if (source == null) {
-      return null;
-    }
-    if (replace == null) {
-      return source;
-    }
-    if (match == null) {
-      throw new NullPointerException("match is null?");
-    }
-    if (match.equals(replace)) {
-      return source;
-    }
-    return replaceString(source, match, replace, 30, 0, source.length());
-  }
-
-  /**
-   * Additionally specify the additionalSize to add to the buffer. This will
-   * make the buffer bigger so that it doesn't have to grow when replacement
-   * occurs.
-   */
-  public static String replaceString(String source, String match, String replace,
-                                     int additionalSize, int startPos, int endPos) {
-
-    if (source == null) {
-      return null;
-    }
-
-    char match0 = match.charAt(0);
-
-    int matchLength = match.length();
-
-    if (matchLength == 1 && replace.length() == 1) {
-      char replace0 = replace.charAt(0);
-      return source.replace(match0, replace0);
-    }
-    if (matchLength >= replace.length()) {
-      additionalSize = 0;
-    }
-
-
-    int sourceLength = source.length();
-    int lastMatch = endPos - matchLength;
-
-    StringBuilder sb = new StringBuilder(sourceLength + additionalSize);
-
-    if (startPos > 0) {
-      sb.append(source.substring(0, startPos));
-    }
-
-    char sourceChar;
-    boolean isMatch;
-    int sourceMatchPos;
-
-    for (int i = startPos; i < sourceLength; i++) {
-      sourceChar = source.charAt(i);
-      if (i > lastMatch || sourceChar != match0) {
-        sb.append(sourceChar);
-
-      } else {
-        // check to see if this is a match
-        isMatch = true;
-        sourceMatchPos = i;
-
-        // check each following character...
-        for (int j = 1; j < matchLength; j++) {
-          sourceMatchPos++;
-          if (source.charAt(sourceMatchPos) != match.charAt(j)) {
-            isMatch = false;
-            break;
-          }
-        }
-        if (isMatch) {
-          i = i + matchLength - 1;
-          sb.append(replace);
-        } else {
-          // was not a match
-          sb.append(sourceChar);
-        }
-      }
-    }
-
-    return sb.toString();
-  }
-
-  /**
-   * A search and replace with multiple matching strings.
-   * <p>
-   * Useful when converting CRNL CR and NL all to a BR tag for example.
-   * </p>
-   * <p>
-   * <pre><code>
-   * String[] multi = { &quot;\r\n&quot;, &quot;\r&quot;, &quot;\n&quot; };
-   * content = StringHelper.replaceStringMulti(content, multi, &quot;&lt;br/&gt;&quot;);
-   * </code></pre>
-   */
-  public static String replaceStringMulti(String source, String[] match, String replace) {
-    return replaceStringMulti(source, match, replace, 30, 0, source.length());
-  }
-
-  /**
-   * Additionally specify an additional size estimate for the buffer plus
-   * start and end positions.
-   * <p>
-   * The start and end positions can limit the search and replace. Otherwise
-   * these default to startPos = 0 and endPos = source.length().
-   * </p>
-   */
-  public static String replaceStringMulti(String source, String[] match, String replace,
-                                          int additionalSize, int startPos, int endPos) {
-
-    int shortestMatch = match[0].length();
-
-    char[] match0 = new char[match.length];
-    for (int i = 0; i < match0.length; i++) {
-      match0[i] = match[i].charAt(0);
-      if (match[i].length() < shortestMatch) {
-        shortestMatch = match[i].length();
-      }
-    }
-
-    StringBuilder sb = new StringBuilder(source.length() + additionalSize);
-
-    char sourceChar;
-
-    int len = source.length();
-    int lastMatch = endPos - shortestMatch;
-
-    if (startPos > 0) {
-      sb.append(source.substring(0, startPos));
-    }
-
-    int matchCount;
-
-    for (int i = startPos; i < len; i++) {
-      sourceChar = source.charAt(i);
-      if (i > lastMatch) {
-        sb.append(sourceChar);
-      } else {
-        matchCount = 0;
-        for (int k = 0; k < match0.length; k++) {
-          if (matchCount == 0 && sourceChar == match0[k]) {
-            if (match[k].length() + i <= len) {
-
-              ++matchCount;
-              int j = 1;
-              for (; j < match[k].length(); j++) {
-                if (source.charAt(i + j) != match[k].charAt(j)) {
-                  --matchCount;
-                  break;
-                }
-              }
-              if (matchCount > 0) {
-                i = i + j - 1;
-                sb.append(replace);
-                break;
-              }
-            }
-          }
-        }
-        if (matchCount == 0) {
-          sb.append(sourceChar);
-        }
-      }
-    }
-
-    return sb.toString();
-  }
-
-}
@@ -1 +0,0 @@
-package com.avaje.ebeaninternal.server.loadcontext;
@@ -1,65 +0,0 @@
-package com.avaje.ebeaninternal.server.persist;
-
-import com.avaje.ebeaninternal.api.SpiTransaction;
-import com.avaje.ebeaninternal.server.core.PersistRequestCallableSql;
-import com.avaje.ebeaninternal.server.core.PersistRequestOrmUpdate;
-import com.avaje.ebeaninternal.server.core.PersistRequestUpdateSql;
-
-/**
- * Default PersistExecute implementation using DML statements.
- * <p>
- * Supports the use of PreparedStatement batching.
- * </p>
- */
-final class DefaultPersistExecute implements PersistExecute {
-
-  private final ExeCallableSql exeCallableSql;
-
-  private final ExeUpdateSql exeUpdateSql;
-
-  private final ExeOrmUpdate exeOrmUpdate;
-
-  /**
-   * The default batch size.
-   */
-  private final int defaultBatchSize;
-
-  /**
-   * Construct this DmlPersistExecute.
-   */
-  DefaultPersistExecute(Binder binder, int defaultBatchSize) {
-
-    this.exeOrmUpdate = new ExeOrmUpdate(binder);
-    this.exeUpdateSql = new ExeUpdateSql(binder);
-    this.exeCallableSql = new ExeCallableSql(binder);
-    this.defaultBatchSize = defaultBatchSize;
-  }
-
-  public BatchControl createBatchControl(SpiTransaction t) {
-
-    // create a BatchControl and set its defaults
-    return new BatchControl(t, defaultBatchSize, true);
-  }
-
-  /**
-   * Execute the updateSqlRequest
-   */
-  public int executeOrmUpdate(PersistRequestOrmUpdate request) {
-    return exeOrmUpdate.execute(request);
-  }
-
-  /**
-   * Execute the updateSqlRequest
-   */
-  public int executeSqlUpdate(PersistRequestUpdateSql request) {
-    return exeUpdateSql.execute(request);
-  }
-
-  /**
-   * Execute the CallableSqlRequest.
-   */
-  public int executeSqlCallable(PersistRequestCallableSql request) {
-    return exeCallableSql.execute(request);
-  }
-
-}
@@ -1,37 +0,0 @@
-package com.avaje.ebeaninternal.server.persist;
-
-import com.avaje.ebeaninternal.api.SpiTransaction;
-import com.avaje.ebeaninternal.server.core.PersistRequestCallableSql;
-import com.avaje.ebeaninternal.server.core.PersistRequestOrmUpdate;
-import com.avaje.ebeaninternal.server.core.PersistRequestUpdateSql;
-
-/**
- * The actual execution of persist requests.
- * <p>
- * A Persister 'front-ends' this object and handles the
- * batching, cascading, concurrency mode detection etc.
- * </p>
- */
-public interface PersistExecute {
-
-  /**
-   * Create a BatchControl for the current transaction.
-   */
-  BatchControl createBatchControl(SpiTransaction t);
-
-  /**
-   * Execute a Update.
-   */
-  int executeOrmUpdate(PersistRequestOrmUpdate request);
-
-  /**
-   * Execute a CallableSql.
-   */
-  int executeSqlCallable(PersistRequestCallableSql request);
-
-  /**
-   * Execute a UpdateSql.
-   */
-  int executeSqlUpdate(PersistRequestUpdateSql request);
-
-}
@@ -1,59 +0,0 @@
-package com.avaje.ebeaninternal.server.persist.dmlbind;
-
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebeaninternal.server.core.PersistRequestBean;
-import com.avaje.ebeaninternal.server.deploy.BeanPropertyCompound;
-import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest;
-
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Bindable for a Immutable Compound value object.
- */
-public class BindableCompound implements Bindable {
-
-  private final BindableProperty[] items;
-
-  private final BeanPropertyCompound compound;
-
-  public BindableCompound(BeanPropertyCompound embProp, List<BindableProperty> list) {
-    this.compound = embProp;
-    this.items = list.toArray(new BindableProperty[list.size()]);
-  }
-
-  public String toString() {
-    return "BindableCompound " + compound + " items:" + Arrays.toString(items);
-  }
-
-  @Override
-  public boolean isDraftOnly() {
-    return false;
-  }
-
-  public void dmlAppend(GenerateDmlRequest request) {
-
-    for (BindableProperty item : items) {
-      item.dmlAppend(request);
-    }
-  }
-
-  public void addToUpdate(PersistRequestBean<?> request, List<Bindable> list) {
-    if (request.isAddToUpdate(compound)) {
-      list.add(this);
-    }
-  }
-
-  public void dmlBind(BindableRequest bindRequest, EntityBean bean) throws SQLException {
-
-    // get the compound type value
-    Object valueObject = compound.getValue(bean);
-
-    // bind each of the underlying scalar values for this compound type
-    for (BindableProperty item : items) {
-      item.dmlBindObject(bindRequest, valueObject);
-    }
-  }
-
-}
@@ -1,46 +0,0 @@
-package com.avaje.ebeaninternal.server.persist.dmlbind;
-
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebeaninternal.server.deploy.BeanProperty;
-import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
-import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest;
-
-import java.sql.SQLException;
-
-/**
- * Bindable for insert on a property with a GeneratedProperty.
- * <p>
- * This is typically a 'insert timestamp', 'update timestamp' or 'counter'.
- * </p>
- */
-public class BindablePropertyInsertGenerated extends BindableProperty {
-
-  private final GeneratedProperty gen;
-
-  public BindablePropertyInsertGenerated(BeanProperty prop, GeneratedProperty gen) {
-    super(prop);
-    this.gen = gen;
-  }
-
-  public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
-
-    Object value = gen.getInsertValue(prop, bean, request.now());
-
-    // generated value should be the correct type
-    if (bean != null) {
-      // support PropertyChangeSupport
-      //prop.setValueIntercept(bean, value);
-      prop.setValue(bean, value);
-    }
-    request.bind(value, prop);
-  }
-
-  /**
-   * Always bind on Insert SET.
-   */
-  @Override
-  public void dmlAppend(GenerateDmlRequest request) {
-    request.appendColumn(prop.getDbColumn());
-  }
-
-}
@@ -1,64 +0,0 @@
-package com.avaje.ebeaninternal.server.persist.dmlbind;
-
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebeaninternal.server.core.PersistRequestBean;
-import com.avaje.ebeaninternal.server.deploy.BeanProperty;
-import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
-import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest;
-
-import java.sql.SQLException;
-import java.util.List;
-
-/**
- * Bindable for update on a property with a GeneratedProperty.
- * <p>
- * This is typically a 'update timestamp' or 'counter'.
- * </p>
- */
-public class BindablePropertyUpdateGenerated extends BindableProperty {
-
-  private final GeneratedProperty gen;
-
-  public BindablePropertyUpdateGenerated(BeanProperty prop, GeneratedProperty gen) {
-    super(prop);
-    this.gen = gen;
-  }
-
-  /**
-   * Add BindablePropertyUpdateGenerated if the property is loaded.
-   */
-  public void addToUpdate(PersistRequestBean<?> request, List<Bindable> list) {
-    if (gen.includeInAllUpdates()) {
-      list.add(this);
-    } else if (request.isLoadedProperty(prop)) {
-      list.add(this);
-    }
-  }
-
-  public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
-
-    Object value = gen.getUpdateValue(prop, bean, request.now());
-
-    // generated value should be the correct type
-    request.bind(value, prop);
-
-    if (prop.isVersion()) {
-      if (request.getPersistRequest().isLoadedProperty(prop)) {
-        // set to the bean after the where clause has been generated
-        request.registerGeneratedVersion(value);
-      }
-    } else {
-      // @WhenModified set without invoking interception
-      prop.setValueChanged(bean, value);
-    }
-  }
-
-  /**
-   * Always bind on Insert SET.
-   */
-  @Override
-  public void dmlAppend(GenerateDmlRequest request) {
-    request.appendColumn(prop.getDbColumn());
-  }
-
-}
@@ -1,67 +0,0 @@
-package com.avaje.ebeaninternal.server.persist.dmlbind;
-
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
-import com.avaje.ebeaninternal.server.deploy.BeanProperty;
-import com.avaje.ebeaninternal.server.deploy.BeanPropertyCompound;
-import com.avaje.ebeaninternal.server.persist.dml.DmlMode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Add base properties to the BindableList for a bean type.
- * <p>
- * This excludes unique embedded and associated properties.
- * </p>
- */
-public class FactoryBaseProperties {
-
-  private final FactoryProperty factoryProperty;
-
-
-  public FactoryBaseProperties(boolean bindEncryptDataFirst) {
-    factoryProperty = new FactoryProperty(bindEncryptDataFirst);
-  }
-
-  /**
-   * Add Bindable for the base properties to the list.
-   */
-  public void create(List<Bindable> list, BeanDescriptor<?> desc, DmlMode mode, boolean withLobs) {
-
-    add(desc.propertiesBaseScalar(), list, mode, withLobs);
-
-    BeanPropertyCompound[] compoundProps = desc.propertiesBaseCompound();
-    for (BeanPropertyCompound compoundProp : compoundProps) {
-      BeanProperty[] props = compoundProp.getScalarProperties();
-
-      List<BindableProperty> newList = new ArrayList<>(props.length);
-      addCompound(props, newList, mode, withLobs);
-
-      BindableCompound compoundBindable = new BindableCompound(compoundProp, newList);
-
-      list.add(compoundBindable);
-    }
-  }
-
-  private void add(BeanProperty[] props, List<Bindable> list, DmlMode mode, boolean withLobs) {
-
-    for (BeanProperty prop : props) {
-      Bindable item = factoryProperty.create(prop, mode, withLobs);
-      if (item != null) {
-        list.add(item);
-      }
-    }
-  }
-
-  private void addCompound(BeanProperty[] props, List<BindableProperty> list, DmlMode mode, boolean withLobs) {
-
-    for (BeanProperty prop : props) {
-      BindableProperty item = (BindableProperty) factoryProperty.create(prop, mode, withLobs);
-      if (item != null) {
-        list.add(item);
-      }
-    }
-
-  }
-
-}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`package com.avaje.ebeaninternal.server.cache;`