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

Bump ebean-annotation to 2.2 for meta-annotation support on @Formula
#940 - Allow findNative to use @Formula properties (add test for MySql := use with RawSql and findNative)
2024-04-21 10:51:47 +00:00 · 2017-01-09 22:39:36 +13:00 · 2017-01-09 22:37:10 +13:00 · 2017-01-09 22:29:15 +13:00 · 2017-01-09 19:40:23 +13:00 · 2017-01-09 19:39:54 +13:00
2134 changed files with 11552 additions and 13644 deletions
@@ -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

@@ -7,9 +7,9 @@
    <version>1.1</version>
  </parent>

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

  <name>ebean</name>
@@ -21,7 +21,7 @@

  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-9.3.1</tag>
+    <tag>ebean-10.1.4</tag>
  </scm>

  <dependencies>
@@ -33,15 +33,15 @@
    </dependency>

    <dependency>
-      <groupId>org.avaje.ebean</groupId>
+      <groupId>io.ebean</groupId>
      <artifactId>persistence-api</artifactId>
-      <version>2.1.3</version>
+      <version>2.2.1</version>
    </dependency>

    <dependency>
-      <groupId>org.avaje.ebean</groupId>
+      <groupId>io.ebean</groupId>
      <artifactId>ebean-annotation</artifactId>
-      <version>1.4</version>
+      <version>2.2</version>
    </dependency>

    <dependency>
@@ -53,7 +53,7 @@
    <dependency>
      <groupId>org.avaje</groupId>
      <artifactId>avaje-datasource</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.4</version>
    </dependency>

    <dependency>
@@ -65,13 +65,13 @@
    <dependency>
      <groupId>org.avaje</groupId>
      <artifactId>avaje-classpath-scanner</artifactId>
-      <version>2.2.1</version>
+      <version>2.2.2</version>
    </dependency>

    <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-dbmigration</artifactId>
-      <version>1.2.1</version>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-dbmigration</artifactId>
+      <version>10.1.2</version>
    </dependency>

    <dependency>
@@ -83,7 +83,7 @@
    <dependency>
      <groupId>org.antlr</groupId>
      <artifactId>antlr4-runtime</artifactId>
-      <version>4.5.3</version>
+      <version>4.6</version>
    </dependency>

    <!-- Jackson core used internally by Ebean -->
@@ -112,21 +112,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 +134,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>9.4-1202-jdbc41</version>
+      <version>9.4.1212.jre7</version>
      <scope>provided</scope>
    </dependency>

@@ -157,14 +157,14 @@
    <dependency>
      <groupId>org.avaje</groupId>
      <artifactId>avaje-agentloader</artifactId>
-      <version>1.1.1</version>
+      <version>2.1.2</version>
      <scope>test</scope>
    </dependency>

    <dependency>
-      <groupId>org.avaje.ebean</groupId>
+      <groupId>io.ebean</groupId>
      <artifactId>ebean-agent</artifactId>
-      <version>8.1.1</version>
+      <version>10.1.2</version>
      <scope>test</scope>
    </dependency>

@@ -173,28 +173,28 @@
    <dependency>
      <groupId>com.h2database</groupId>
      <artifactId>h2</artifactId>
-      <version>1.4.192</version>
+      <version>1.4.193</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>mysql</groupId>
      <artifactId>mysql-connector-java</artifactId>
-      <version>5.1.36</version>
+      <version>6.0.5</version>
      <scope>test</scope>
    </dependency>

@@ -209,14 +209,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,9 +227,9 @@
    <plugins>

      <plugin>
-        <groupId>org.avaje.ebean</groupId>
+        <groupId>io.ebean</groupId>
        <artifactId>ebean-maven-plugin</artifactId>
-        <version>8.1.1</version>
+        <version>10.1.2</version>
        <executions>
          <execution>
            <id>test</id>
@@ -283,11 +283,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:io.ebean.dbmigration.ddlgeneration:io.ebean.dbmigration.migration:io.ebean.dbmigration.migrationreader:io.ebean.dbmigration.model</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,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,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,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 +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 +0,0 @@
-package com.avaje.ebeaninternal.server.cache;
@@ -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,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 +0,0 @@
-package com.avaje.ebeaninternal.server.el;
@@ -1 +0,0 @@
-package com.avaje.ebeaninternal.server.loadcontext;
@@ -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,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);
-      }
-    }
-
-  }
-
-}
@@ -1 +0,0 @@
-package com.avaje.ebeaninternal.server.query;
@@ -1 +0,0 @@
-package com.avaje.ebeaninternal.server.querydefn;
@@ -1 +0,0 @@
-package com.avaje.ebeaninternal.server.text.csv;
@@ -1,25 +0,0 @@
-package com.avaje.ebeaninternal.server.transaction;
-
-import javax.sql.DataSource;
-
-/**
- * Supply the DataSource to the transaction manager.
- * <p>
- * Implementations can support multi-tenancy via DB or SCHEMA.
- * </p>
- */
-public interface DataSourceSupplier {
-
-  /**
-   * Return the DataSource to use for the current request.
-   * <p>
-   *   This should take into account multi-tenancy and the current tenantId.
-   * </p>
-   */
-  DataSource getDataSource();
-
-  /**
-   * Shutdown the datasource de-registering the JDBC driver if requested.
-   */
-  void shutdown(boolean deregisterDriver);
-}
@@ -1,82 +0,0 @@
-package com.avaje.ebeaninternal.server.type;
-
-import com.avaje.ebean.config.CompoundType;
-import com.avaje.ebean.config.CompoundTypeProperty;
-
-import java.time.Period;
-
-/**
- * Compound type for Period value type.
- * <p>
- * Persists the Period into 3 separate integer columns for years, months and days.
- * </p>
- */
-public class CompoundTypePeriod implements CompoundType<Period> {
-
-  final CompoundTypeProperty[] properties = new CompoundTypeProperty[3];
-
-  public CompoundTypePeriod() {
-    properties[0] = new CTPeriodYear();
-    properties[1] = new CTPeriodMonth();
-    properties[2] = new CTPeriodDay();
-  }
-
-  @Override
-  public Period create(Object[] propertyValues) {
-    return Period.of((Integer) propertyValues[0], (Integer) propertyValues[1], (Integer) propertyValues[2]);
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public CompoundTypeProperty<Period, ?>[] getProperties() {
-    return properties;
-  }
-
-  static class CTPeriodYear implements CompoundTypeProperty<Period, Integer> {
-
-    public String getName() {
-      return "years";
-    }
-
-    public Integer getValue(Period valueObject) {
-      return valueObject.getYears();
-    }
-
-    public int getDbType() {
-      return 0;
-    }
-
-  }
-
-  static class CTPeriodMonth implements CompoundTypeProperty<Period, Integer> {
-
-    public String getName() {
-      return "months";
-    }
-
-    public Integer getValue(Period valueObject) {
-      return valueObject.getMonths();
-    }
-
-    public int getDbType() {
-      return 0;
-    }
-
-  }
-
-  static class CTPeriodDay implements CompoundTypeProperty<Period, Integer> {
-
-    public String getName() {
-      return "days";
-    }
-
-    public Integer getValue(Period valueObject) {
-      return valueObject.getDays();
-    }
-
-    public int getDbType() {
-      return 0;
-    }
-
-  }
-}
@@ -1,80 +0,0 @@
-package com.avaje.ebeaninternal.server.type;
-
-import com.avaje.ebean.config.CompoundTypeProperty;
-
-/**
- * Wraps a CompoundTypeProperty with it's type and parent for nested compound
- * types.
- */
-public class CtCompoundProperty {
-
-  private final String relativeName;
-
-  private final CtCompoundProperty parent;
-
-  private final CtCompoundType<?> compoundType;
-
-  @SuppressWarnings({"rawtypes"})
-  private final CompoundTypeProperty property;
-
-  public CtCompoundProperty(String relativeName, CtCompoundProperty parent, CtCompoundType<?> ctType,
-                            CompoundTypeProperty<?, ?> property) {
-
-    this.relativeName = relativeName;
-    this.parent = parent;
-    this.compoundType = ctType;
-    this.property = property;
-  }
-
-  /**
-   * The property name relative to the root of the compound type.
-   */
-  public String getRelativeName() {
-    return relativeName;
-  }
-
-  /**
-   * The property name local to its type.
-   */
-  public String getPropertyName() {
-    return property.getName();
-  }
-
-  public String toString() {
-    return relativeName;
-  }
-
-  @SuppressWarnings("unchecked")
-  public Object getValue(Object valueObject) {
-    if (valueObject == null) {
-      return null;
-    }
-    if (parent != null) {
-      valueObject = parent.getValue(valueObject);
-    }
-    return property.getValue(valueObject);
-  }
-
-  /**
-   * Set a scalar value that is used to build the immutable compound value
-   * object.
-   * <p>
-   * When all the scalar values have been collected then the compound value
-   * object is built and this can be recursive for nested compound types.
-   * </p>
-   */
-  public Object setValue(Object bean, Object value) {
-
-    // compoundType and propertyName should be correct depth
-    Object compoundValue = ImmutableCompoundTypeBuilder.set(compoundType, property.getName(), value);
-
-    if (compoundValue != null && parent != null) {
-      // Continue up the tree
-      return parent.setValue(bean, compoundValue);
-
-    } else {
-      return compoundValue;
-    }
-  }
-
-}
@@ -1,153 +0,0 @@
-package com.avaje.ebeaninternal.server.type;
-
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebean.text.StringParser;
-import com.avaje.ebeaninternal.api.SpiExpressionRequest;
-import com.avaje.ebeaninternal.server.deploy.BeanProperty;
-import com.avaje.ebeaninternal.server.el.ElPropertyValue;
-
-/**
- * Adapter for CtCompoundProperty to ElPropertyValue.
- * <p>
- * This is used for non-scalar properties of a Compound Value Object. These only
- * occur in nested compound types.
- * </p>
- *
- * @author rbygrave
- */
-public class CtCompoundPropertyElAdapter implements ElPropertyValue {
-
-  private final CtCompoundProperty prop;
-
-  private int deployOrder;
-
-  public CtCompoundPropertyElAdapter(CtCompoundProperty prop) {
-    this.prop = prop;
-  }
-
-  public void setDeployOrder(int deployOrder) {
-    this.deployOrder = deployOrder;
-  }
-
-  @Override
-  public boolean isAggregation() {
-    return false;
-  }
-
-  @Override
-  public Object convert(Object value) {
-    return value;
-  }
-
-  @Override
-  public Object pathGetNested(Object bean) {
-    return bean;
-  }
-
-  @Override
-  public Object pathGet(Object bean) {
-    return prop.getValue(bean);
-  }
-
-  @Override
-  public void pathSet(Object bean, Object value) {
-    prop.setValue(bean, value);
-  }
-
-  public String getAssocIdExpression(String prefix, String operator) {
-    throw new RuntimeException("Not Supported or Expected");
-  }
-
-  @Override
-  public String getAssocIsEmpty(SpiExpressionRequest request, String path) {
-    throw new RuntimeException("Not Supported or Expected");
-  }
-
-  public Object[] getAssocIdValues(EntityBean bean) {
-    throw new RuntimeException("Not Supported or Expected");
-  }
-
-  public String getAssocIdInExpr(String prefix) {
-    throw new RuntimeException("Not Supported or Expected");
-  }
-
-  public String getAssocIdInValueExpr(int size) {
-    throw new RuntimeException("Not Supported or Expected");
-  }
-
-  public BeanProperty getBeanProperty() {
-    return null;
-  }
-
-  public StringParser getStringParser() {
-    return null;
-  }
-
-  public boolean isDbEncrypted() {
-    return false;
-  }
-
-  public boolean isLocalEncrypted() {
-    return false;
-  }
-
-  @Override
-  public boolean isAssocMany() {
-    return false;
-  }
-
-  @Override
-  public boolean isAssocId() {
-    return false;
-  }
-
-  public boolean isAssocProperty() {
-    return false;
-  }
-
-  public boolean isDateTimeCapable() {
-    return false;
-  }
-
-  public int getJdbcType() {
-    return 0;
-  }
-
-  public Object parseDateTime(long systemTimeMillis) {
-    throw new RuntimeException("Not Supported or Expected");
-  }
-
-  @Override
-  public boolean containsFormulaWithJoin() {
-    return false;
-  }
-
-  public boolean containsMany() {
-    return false;
-  }
-
-  public boolean containsManySince(String sinceProperty) {
-    return containsMany();
-  }
-
-  public String getDbColumn() {
-    return null;
-  }
-
-  public String getElPlaceholder(boolean encrypted) {
-    return null;
-  }
-
-  public String getElPrefix() {
-    return null;
-  }
-
-  public String getName() {
-    return prop.getPropertyName();
-  }
-
-  public String getElName() {
-    return prop.getPropertyName();
-  }
-
-}
@@ -1,201 +0,0 @@
-package com.avaje.ebeaninternal.server.type;
-
-import com.avaje.ebean.config.CompoundType;
-import com.avaje.ebean.config.CompoundTypeProperty;
-import com.avaje.ebeaninternal.server.text.json.WriteJson;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.Map;
-
-/**
- * The internal representation of a Compound Type (Immutable Compound Value Object).
- *
- * @param <V> The Type of the "Immutable Compound Value Object".
- */
-public final class CtCompoundType<V> implements ScalarDataReader<V> {
-
-  private final Class<V> cvoClass;
-
-  private final CompoundType<V> cvoType;
-
-  private final ScalarDataReader<Object>[] propReaders;
-
-  private final CompoundTypeProperty<V, ?>[] properties;
-
-  public CtCompoundType(Class<V> cvoClass, CompoundType<V> cvoType, ScalarDataReader<Object>[] propReaders) {
-
-    this.cvoClass = cvoClass;
-    this.cvoType = cvoType;
-    this.properties = cvoType.getProperties();
-    this.propReaders = propReaders;
-  }
-
-  public String toString() {
-    return cvoClass.toString();
-  }
-
-  public Class<V> getCompoundTypeClass() {
-    return cvoClass;
-  }
-
-  public V create(Object[] propertyValues) {
-    return cvoType.create(propertyValues);
-  }
-
-
-  public V create(Map<String, Object> valueMap) {
-
-    if (valueMap.size() != properties.length) {
-      // not enough elements in the map
-      return null;
-    }
-
-    // we expect the map to contain a value for
-    // each property and that the values are the
-    // correct type
-    Object[] propertyValues = new Object[properties.length];
-    for (int i = 0; i < properties.length; i++) {
-      propertyValues[i] = valueMap.get(properties[i].getName());
-      if (propertyValues[i] == null) {
-        String m = "Null value for " + properties[i].getName() + " in map " + valueMap;
-        throw new RuntimeException(m);
-      }
-    }
-
-    return create(propertyValues);
-  }
-
-  public V read(DataReader source) throws SQLException {
-
-    boolean nullValue = false;
-    Object[] values = new Object[propReaders.length];
-
-    for (int i = 0; i < propReaders.length; i++) {
-      Object o = propReaders[i].read(source);
-      values[i] = o;
-      if (o == null) {
-        nullValue = true;
-      }
-    }
-
-    if (nullValue) {
-      return null;
-    }
-
-    return create(values);
-  }
-
-  public void loadIgnore(DataReader dataReader) {
-    for (ScalarDataReader<Object> propReader : propReaders) {
-      propReader.loadIgnore(dataReader);
-    }
-  }
-
-  public void bind(DataBind b, V value) throws SQLException {
-
-    CompoundTypeProperty<V, ?>[] props = cvoType.getProperties();
-
-    for (int i = 0; i < props.length; i++) {
-      Object o = props[i].getValue(value);
-      propReaders[i].bind(b, o);
-    }
-  }
-
-  /**
-   * Recursively accumulate all the scalar types (in depth first order).
-   * <p>
-   * This creates a flat list of scalars even when compound types are embedded
-   * inside compound types.
-   * </p>
-   */
-  public void accumulateScalarTypes(String parent, CtCompoundTypeScalarList list) {
-
-    CompoundTypeProperty<V, ?>[] props = cvoType.getProperties();
-
-    for (int i = 0; i < propReaders.length; i++) {
-      String propName = getFullPropName(parent, props[i].getName());
-
-      list.addCompoundProperty(propName, this, props[i]);
-
-      propReaders[i].accumulateScalarTypes(propName, list);
-    }
-
-  }
-
-  /**
-   * Return the full property name (for compound types embedded in other
-   * compound types).
-   *
-   * @param parent   the parent property name
-   * @param propName the local property name
-   */
-  private String getFullPropName(String parent, String propName) {
-    if (parent == null) {
-      return propName;
-    } else {
-      return parent + "." + propName;
-    }
-  }
-
-  public Object jsonConvert(Map<String, Object> map) {
-    return readJsonElementObject(map);
-  }
-
-  @SuppressWarnings("unchecked")
-  private Object readJsonElementObject(Map<String, Object> jsonObject) {
-
-    boolean nullValue = false;
-    Object[] values = new Object[propReaders.length];
-
-    for (int i = 0; i < propReaders.length; i++) {
-      String propName = properties[i].getName();
-      Object jsonElement = jsonObject.get(propName);
-
-      if (propReaders[i] instanceof CtCompoundType<?>) {
-        values[i] = ((CtCompoundType<?>) propReaders[i]).readJsonElementObject((Map<String, Object>) jsonElement);
-      } else {
-        values[i] = ((ScalarType<?>) propReaders[i]).parse(jsonElement.toString());
-      }
-      if (values[i] == null) {
-        nullValue = true;
-      }
-    }
-
-    if (nullValue) {
-      return null;
-    }
-
-    return create(values);
-  }
-
-
-  public void jsonWrite(WriteJson ctx, Object valueObject, String propertyName) throws IOException {
-
-    ctx.beginAssocOne(propertyName, valueObject);
-    jsonWriteProps(ctx, valueObject);
-    ctx.endAssocOne();
-  }
-
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  private void jsonWriteProps(WriteJson ctx, Object valueObject) throws IOException {
-
-    ctx.gen().writeStartObject();
-
-    for (int i = 0; i < properties.length; i++) {
-      String propName = properties[i].getName();
-      Object value = properties[i].getValue((V) valueObject);
-      if (propReaders[i] instanceof CtCompoundType<?>) {
-        ctx.writeFieldName(propName);
-        ((CtCompoundType) propReaders[i]).jsonWrite(ctx, value, propName);
-
-      } else {
-        ctx.writeFieldName(propName);
-        ((ScalarType) propReaders[i]).jsonWrite(ctx.gen(), value);
-      }
-    }
-
-    ctx.gen().writeEndObject();
-  }
-
-}
@@ -1,67 +0,0 @@
-package com.avaje.ebeaninternal.server.type;
-
-import com.avaje.ebean.config.CompoundTypeProperty;
-import com.avaje.ebeaninternal.server.query.SplitName;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-
-/**
- * Used to build a flat list of all the scalar types nested in a compound type.
- */
-public final class CtCompoundTypeScalarList {
-
-  private final LinkedHashMap<String, ScalarType<?>> scalarProps = new LinkedHashMap<>();
-
-  private final LinkedHashMap<String, CtCompoundProperty> compoundProperties = new LinkedHashMap<>();
-
-  /**
-   * Return the list of non-scalar properties. These occur when compound types are nested.
-   */
-  public List<CtCompoundProperty> getNonScalarProperties() {
-
-    List<CtCompoundProperty> nonScalarProps = new ArrayList<>();
-
-    for (String propKey : compoundProperties.keySet()) {
-      if (!scalarProps.containsKey(propKey)) {
-        nonScalarProps.add(compoundProperties.get(propKey));
-      }
-    }
-
-    return nonScalarProps;
-  }
-
-  /**
-   * Register a property with it's associated compound type and relative name.
-   */
-  public void addCompoundProperty(String propName, CtCompoundType<?> t, CompoundTypeProperty<?, ?> prop) {
-
-    CtCompoundProperty parent = null;
-    String[] split = SplitName.split(propName);
-    if (split[0] != null) {
-      parent = compoundProperties.get(split[0]);
-    }
-
-    CtCompoundProperty p = new CtCompoundProperty(propName, parent, t, prop);
-    compoundProperties.put(propName, p);
-  }
-
-  /**
-   * Register a scalarType used in the compound type with its given property name.
-   */
-  public void addScalarType(String propName, ScalarType<?> scalar) {
-    scalarProps.put(propName, scalar);
-  }
-
-  public CtCompoundProperty getCompoundType(String propName) {
-    return compoundProperties.get(propName);
-  }
-
-  public Set<Entry<String, ScalarType<?>>> entries() {
-    return scalarProps.entrySet();
-  }
-
-}
@@ -1,95 +0,0 @@
-package com.avaje.ebeaninternal.server.type;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Used to build Immutable Compound Value objects.
- * <p>
- * The individual values are collected for a given type and when they have all
- * been collected then the immutable compound value object is created and
- * returned.
- * </p>
- */
-public final class ImmutableCompoundTypeBuilder {
-
-  private static final ThreadLocal<ImmutableCompoundTypeBuilder> local = new ThreadLocal<ImmutableCompoundTypeBuilder>() {
-    protected synchronized ImmutableCompoundTypeBuilder initialValue() {
-      return new ImmutableCompoundTypeBuilder();
-    }
-  };
-
-  private final Map<Class<?>, Entry> entryMap = new HashMap<>();
-
-  /**
-   * Clear the cache of partial compound objects.
-   */
-  public static void clear() {
-    local.get().entryMap.clear();
-  }
-
-  /**
-   * Set the value for the property of a compound type.
-   * <p>
-   * If this is the last value required for the compound type then the
-   * compound type is created and returned, otherwise null is returned (and we
-   * need more values set).
-   * </p>
-   */
-  public static Object set(CtCompoundType<?> ct, String propName, Object value) {
-    return local.get().setValue(ct, propName, value);
-  }
-
-  private Object setValue(CtCompoundType<?> ct, String propName, Object value) {
-
-    Entry e = getEntry(ct);
-    Object compoundValue = e.set(propName, value);
-    if (compoundValue != null) {
-      removeEntry(ct);
-    }
-    return compoundValue;
-  }
-
-  /**
-   * Once we have built a compound value we remove the entry.
-   */
-  private void removeEntry(CtCompoundType<?> ct) {
-    entryMap.remove(ct.getCompoundTypeClass());
-  }
-
-  /**
-   * Get the Entry which contains the values collected so far for this type.
-   */
-  private Entry getEntry(CtCompoundType<?> ct) {
-    Entry e = entryMap.get(ct.getCompoundTypeClass());
-    if (e == null) {
-      e = new Entry(ct);
-      entryMap.put(ct.getCompoundTypeClass(), e);
-    }
-    return e;
-  }
-
-  /**
-   * Holds the values collected so far for a given compound type.
-   */
-  private static class Entry {
-
-    private final CtCompoundType<?> ct;
-
-    private final Map<String, Object> valueMap;
-
-    private Entry(CtCompoundType<?> ct) {
-      this.ct = ct;
-      this.valueMap = new HashMap<>();
-    }
-
-    private Object set(String propName, Object value) {
-      // collect the values...
-      valueMap.put(propName, value);
-
-      // when got all the values this returns the
-      // compound value, otherwise null
-      return ct.create(valueMap);
-    }
-  }
-}
@@ -1,38 +0,0 @@
-package com.avaje.ebeaninternal.server.type;
-
-import java.util.Set;
-
-/**
- * Wraps a Set for the purposes of detecting modifications.
- */
-public class ModifyAwareSet<E> extends ModifyAwareCollection<E> implements Set<E>, ModifyAwareOwner {
-
-  /**
-   * Create with an Owner that is notified of modifications.
-   */
-  public ModifyAwareSet(ModifyAwareOwner owner, Set<E> s) {
-    super(owner, s);
-  }
-
-  /**
-   * Create as top level with it's own ModifyAwareOwner instance wrapping the given Set.
-   */
-  public ModifyAwareSet(Set<E> s) {
-    super(new ModifyAwareFlag(), s);
-  }
-
-  @Override
-  public boolean isMarkedDirty() {
-    return owner.isMarkedDirty();
-  }
-
-  @Override
-  public void markAsModified() {
-    owner.markAsModified();
-  }
-
-  @Override
-  public void resetMarkedDirty() {
-    owner.resetMarkedDirty();
-  }
-}
@@ -1,128 +0,0 @@
-package com.avaje.ebeaninternal.server.type.reflect;
-
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
-
-public class CheckImmutable {
-
-  private static final Logger logger = LoggerFactory.getLogger(CheckImmutable.class);
-
-  private final KnownImmutable knownImmutable;
-
-  public CheckImmutable(KnownImmutable knownImmutable) {
-    this.knownImmutable = knownImmutable;
-  }
-
-  public CheckImmutableResponse checkImmutable(Class<?> cls) {
-
-    CheckImmutableResponse res = new CheckImmutableResponse();
-
-    isImmutable(cls, res);
-
-    if (res.isImmutable()) {
-      res.setCompoundType(isCompoundType(cls));
-    }
-
-    return res;
-  }
-
-  private boolean isCompoundType(Class<?> cls) {
-
-    int maxLength = 0;
-    Constructor<?> chosen = null;
-
-    // find the constructor with the most number of parameters
-    Constructor<?>[] constructors = cls.getConstructors();
-    for (Constructor<?> constructor : constructors) {
-      Class<?>[] parameterTypes = constructor.getParameterTypes();
-      if (parameterTypes.length > maxLength) {
-        maxLength = parameterTypes.length;
-        chosen = constructor;
-      }
-    }
-
-    logger.debug("checkImmutable " + cls + " constructor " + chosen);
-
-    return maxLength > 1;
-  }
-
-  private boolean isImmutable(Class<?> cls, CheckImmutableResponse res) {
-
-
-    if (knownImmutable.isKnownImmutable(cls)) {
-      return true;
-    }
-
-    if (cls.isArray()) {
-      return false;
-    }
-
-
-    if (hasDefaultConstructor(cls)) {
-      // must not have a default constructor to be considered immutable
-      res.setReasonNotImmutable(cls + " has a default constructor");
-      return false;
-    }
-
-    // check super class
-    Class<?> superClass = cls.getSuperclass();
-
-    if (!isImmutable(superClass, res)) {
-      res.setReasonNotImmutable("Super not Immutable " + superClass);
-      return false;
-    }
-
-    if (!hasAllFinalFields(cls, res)) {
-      return false;
-    }
-
-    // Lets hope we didn't forget something
-    return true;
-  }
-
-  private boolean hasAllFinalFields(Class<?> cls, CheckImmutableResponse res) {
-
-    // Check all fields defined in the class for type and if they are final
-    Field[] objFields = cls.getDeclaredFields();
-    for (Field objField : objFields) {
-      if (!Modifier.isStatic(objField.getModifiers())) {
-        if (!Modifier.isFinal(objField.getModifiers())) {
-          res.setReasonNotImmutable("Non final field " + cls + "." + objField.getName());
-          return false;
-        }
-        if (!isImmutable(objField.getType(), res)) {
-          res.setReasonNotImmutable("Non Immutable field type " + objField.getType());
-          return false;
-        }
-      }
-    }
-
-    return true;
-  }
-
-
-  private boolean hasDefaultConstructor(Class<?> cls) {
-
-    Class<?>[] noParams = new Class<?>[0];
-    try {
-      cls.getDeclaredConstructor(noParams);
-      return true;
-
-    } catch (SecurityException e) {
-      // this is ok
-      return false;
-
-    } catch (NoSuchMethodException e) {
-      // this is expected for our IVO's
-      return false;
-    }
-
-  }
-
-}
@@ -1,36 +0,0 @@
-package com.avaje.ebeaninternal.server.type.reflect;
-
-
-public class CheckImmutableResponse {
-
-  private boolean immutable = true;
-
-  private String reasonNotImmutable;
-
-  private boolean compoundType;
-
-  public String toString() {
-    if (immutable) {
-      return "immutable";
-    } else {
-      return "not immutable due to:" + reasonNotImmutable;
-    }
-  }
-
-  public boolean isCompoundType() {
-    return compoundType;
-  }
-
-  public void setCompoundType(boolean compoundType) {
-    this.compoundType = compoundType;
-  }
-
-  public void setReasonNotImmutable(String error) {
-    this.immutable = false;
-    this.reasonNotImmutable = error;
-  }
-
-  public boolean isImmutable() {
-    return immutable;
-  }
-}
@@ -1,30 +0,0 @@
-package com.avaje.ebeaninternal.server.type.reflect;
-
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-
-public class ImmutableMeta {
-
-  private final Constructor<?> constructor;
-
-  private final Method[] readers;
-
-  public ImmutableMeta(Constructor<?> constructor, Method[] readers) {
-    this.constructor = constructor;
-    this.readers = readers;
-  }
-
-
-  public Constructor<?> getConstructor() {
-    return constructor;
-  }
-
-  public Method[] getReaders() {
-    return readers;
-  }
-
-  public boolean isCompoundType() {
-    return readers.length > 1;
-  }
-}
@@ -1,221 +0,0 @@
-package com.avaje.ebeaninternal.server.type.reflect;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-
-public class ImmutableMetaFactory {
-
-  private static final Logger logger = LoggerFactory.getLogger(ImmutableMetaFactory.class);
-
-  public ImmutableMeta createImmutableMeta(Class<?> cls) {
-
-    ScoreConstructor[] scoreConstructors = scoreConstructors(cls);
-
-    ArrayList<RuntimeException> errors = new ArrayList<>();
-
-    // search the constructors in score order ...
-    // ... we need to find a set of readers for each
-    // ... type in the constructor
-    for (ScoreConstructor scoreConstructor : scoreConstructors) {
-      Constructor<?> constructor = scoreConstructor.constructor;
-
-      try {
-        Method[] getters = findGetters(cls, constructor);
-
-        return new ImmutableMeta(constructor, getters);
-
-      } catch (NoSuchMethodException e) {
-        String msg = "Error finding getter method on " + cls + " with constructor " + constructor;
-        errors.add(new RuntimeException(msg, e));
-      }
-    }
-
-    String msg = "Was unable to use reflection to find a constructor and appropriate getters for" +
-      "immutable type " + cls + ".  The errors while looking for the getter methods follow:";
-    logger.error(msg);
-
-    for (RuntimeException runtimeException : errors) {
-      logger.error("Error with " + cls, runtimeException);
-    }
-
-    msg = "Unable to use reflection to build ImmutableMeta for " + cls
-      + ".  Associated Errors trying to find a constructor and getter methods have been logged";
-
-    throw new RuntimeException(msg);
-  }
-
-  private ScoreConstructor getScore(Constructor<?> c) {
-
-    Class<?>[] parameterTypes = c.getParameterTypes();
-    int score = -1000 * parameterTypes.length;
-
-    for (Class<?> parameterType : parameterTypes) {
-      if (parameterType.equals(String.class)) {
-        // string is very generic and we would prefer
-        // a more specific type if that was available
-        score = score + 1;
-
-      } else if (parameterType.equals(BigDecimal.class)) {
-        score = score - 10;
-      } else if (parameterType.equals(Timestamp.class)) {
-        score = score - 10;
-      } else if (parameterType.equals(double.class)) {
-        score = score - 9;
-      } else if (parameterType.equals(Double.class)) {
-        score = score - 8;
-      } else if (parameterType.equals(float.class)) {
-        score = score - 7;
-      } else if (parameterType.equals(Float.class)) {
-        score = score - 6;
-      } else if (parameterType.equals(long.class)) {
-        score = score - 5;
-      } else if (parameterType.equals(Long.class)) {
-        score = score - 4;
-      } else if (parameterType.equals(int.class)) {
-        score = score - 3;
-      } else if (parameterType.equals(Integer.class)) {
-        score = score - 2;
-      }
-    }
-
-    return new ScoreConstructor(score, c);
-  }
-
-  private ScoreConstructor[] scoreConstructors(Class<?> cls) {
-
-    // find the constructor with the most number of parameters
-    int maxParamCount = 0;
-
-    Constructor<?>[] constructors = cls.getConstructors();
-
-    ScoreConstructor[] score = new ScoreConstructor[constructors.length];
-
-    for (int i = 0; i < constructors.length; i++) {
-      score[i] = getScore(constructors[i]);
-      if (score[i].hasDuplicateParamTypes()) {
-        String msg = "Duplicate parameter types in " + score[i].constructor;
-        throw new IllegalStateException(msg);
-      }
-      if (score[i].getParamCount() > maxParamCount) {
-        maxParamCount = score[i].getParamCount();
-      }
-    }
-
-    // filter out any constructors with less parameters than the max
-    ArrayList<ScoreConstructor> list = new ArrayList<>();
-    for (ScoreConstructor aScore : score) {
-      if (aScore.getParamCount() == maxParamCount) {
-        list.add(aScore);
-      }
-    }
-
-    score = list.toArray(new ScoreConstructor[list.size()]);
-
-    // sort into score ascending order
-    Arrays.sort(score);
-
-    return score;
-  }
-
-
-  private Method[] findGetters(Class<?> cls, Constructor<?> c) throws NoSuchMethodException {
-
-    Method[] methods = cls.getMethods();
-
-    Class<?>[] paramTypes = c.getParameterTypes();
-
-    Method[] readers = new Method[paramTypes.length];
-
-    for (int i = 0; i < paramTypes.length; i++) {
-      Method getter = findGetter(paramTypes[i], methods);
-      if (getter == null && paramTypes.length == 1 && paramTypes[i].equals(String.class)) {
-        getter = findToString(cls);
-      }
-      if (getter == null) {
-        throw new NoSuchMethodException("Get Method not found for " + paramTypes[i] + " in " + cls);
-      }
-      readers[i] = getter;
-    }
-
-    return readers;
-  }
-
-  private Method findToString(Class<?> cls) throws NoSuchMethodException {
-
-    try {
-      return cls.getDeclaredMethod("toString", new Class<?>[0]);
-    } catch (SecurityException e) {
-      throw new NoSuchMethodException("SecurityException " + e + " trying to find toString method on " + cls);
-    }
-  }
-
-  private Method findGetter(Class<?> paramType, Method[] methods) {
-
-    for (Method method : methods) {
-      if (!Modifier.isStatic(method.getModifiers())) {
-        if (method.getParameterTypes().length == 0) {
-          // could be a getter
-          String methName = method.getName();
-          if (!methName.equals("hashCode") && !methName.equals("toString")) {
-            Class<?> returnType = method.getReturnType();
-            if (paramType.equals(returnType)) {
-              return method;
-            }
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-  private static class ScoreConstructor implements Comparable<ScoreConstructor> {
-
-    final int score;
-    final Constructor<?> constructor;
-
-    private ScoreConstructor(int score, Constructor<?> constructor) {
-      this.score = score;
-      this.constructor = constructor;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      // remove FindBugs warning
-      return obj == this;
-    }
-
-    public int compareTo(ScoreConstructor o) {
-      return (score < o.score ? -1 : (score == o.score ? 0 : 1));
-    }
-
-    public int getParamCount() {
-      return constructor.getParameterTypes().length;
-    }
-
-    public boolean hasDuplicateParamTypes() {
-
-      Class<?>[] parameterTypes = constructor.getParameterTypes();
-      if (parameterTypes.length < 2) {
-        return false;
-      }
-      HashSet<Class<?>> set = new HashSet<>();
-      for (Class<?> parameterType : parameterTypes) {
-        if (!set.add(parameterType)) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-  }
-
-}
@@ -1,6 +0,0 @@
-package com.avaje.ebeaninternal.server.type.reflect;
-
-public interface KnownImmutable {
-
-  boolean isKnownImmutable(Class<?> cls);
-}
@@ -1,46 +0,0 @@
-package com.avaje.ebeaninternal.server.type.reflect;
-
-import com.avaje.ebean.config.CompoundType;
-import com.avaje.ebean.config.CompoundTypeProperty;
-
-import java.lang.reflect.Constructor;
-import java.util.Arrays;
-
-@SuppressWarnings({"rawtypes"})
-public class ReflectionBasedCompoundType implements CompoundType {
-
-  private final Constructor<?> constructor;
-
-  private final ReflectionBasedCompoundTypeProperty[] props;
-
-  public ReflectionBasedCompoundType(Constructor<?> constructor, ReflectionBasedCompoundTypeProperty[] props) {
-    this.constructor = constructor;
-    this.props = props;
-  }
-
-  public String toString() {
-    return "ReflectionBasedCompoundType " + constructor + " " + Arrays.toString(props);
-  }
-
-  public Object create(Object[] propertyValues) {
-
-    try {
-      return constructor.newInstance(propertyValues);
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public CompoundTypeProperty[] getProperties() {
-    return props;
-  }
-
-  public Class<?> getPropertyType(int i) {
-    return props[i].getPropertyType();
-  }
-
-  public Class<?> getCompoundType() {
-    return constructor.getDeclaringClass();
-  }
-
-}
@@ -1,50 +0,0 @@
-package com.avaje.ebeaninternal.server.type.reflect;
-
-import com.avaje.ebean.config.CompoundTypeProperty;
-
-import java.lang.reflect.Method;
-
-@SuppressWarnings({"rawtypes"})
-public class ReflectionBasedCompoundTypeProperty implements CompoundTypeProperty {
-
-  private static final Object[] NO_ARGS = new Object[0];
-
-  private final Method reader;
-
-  private final String name;
-
-  private final Class<?> propertyType;
-
-  public ReflectionBasedCompoundTypeProperty(String name, Method reader, Class<?> propertyType) {
-    this.name = name;
-    this.reader = reader;
-    this.propertyType = propertyType;
-  }
-
-  public String toString() {
-    return name;
-  }
-
-  public int getDbType() {
-    return 0;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public Object getValue(Object valueObject) {
-
-    try {
-      return reader.invoke(valueObject, NO_ARGS);
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public Class<?> getPropertyType() {
-    return propertyType;
-  }
-
-
-}
@@ -1,49 +0,0 @@
-package com.avaje.ebeaninternal.server.type.reflect;
-
-import com.avaje.ebean.config.ScalarTypeConverter;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-
-@SuppressWarnings({"rawtypes"})
-public class ReflectionBasedScalarTypeConverter implements ScalarTypeConverter {
-
-  private static final Object[] NO_ARGS = new Object[0];
-
-  private final Constructor<?> constructor;
-
-  private final Method reader;
-
-  public ReflectionBasedScalarTypeConverter(Constructor<?> constructor, Method reader) {
-    this.constructor = constructor;
-    this.reader = reader;
-  }
-
-  public Object getNullValue() {
-    return null;
-  }
-
-  public Object unwrapValue(Object beanType) {
-    if (beanType == null) {
-      return null;
-    }
-    try {
-      return reader.invoke(beanType, NO_ARGS);
-    } catch (Exception e) {
-      String msg = "Error invoking read method " + reader.getName()
-        + " on " + beanType.getClass().getName();
-      throw new RuntimeException(msg);
-    }
-  }
-
-  public Object wrapValue(Object scalarType) {
-    try {
-      return constructor.newInstance(scalarType);
-    } catch (Exception e) {
-      String msg = "Error invoking constructor " + constructor + " with " + scalarType;
-      throw new RuntimeException(msg);
-    }
-  }
-
-
-}
@@ -1,78 +0,0 @@
-package com.avaje.ebeaninternal.server.type.reflect;
-
-import com.avaje.ebeaninternal.server.type.ScalarType;
-import com.avaje.ebeaninternal.server.type.ScalarTypeWrapper;
-import com.avaje.ebeaninternal.server.type.TypeManager;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-
-public class ReflectionBasedTypeBuilder {
-
-  private final TypeManager typeManager;
-
-  public ReflectionBasedTypeBuilder(TypeManager typeManager) {
-    this.typeManager = typeManager;
-  }
-
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  public ScalarType<?> buildScalarType(ImmutableMeta meta) {
-
-    if (meta.isCompoundType()) {
-      throw new RuntimeException("Must be scalar");
-    }
-
-    Constructor<?> constructor = meta.getConstructor();
-
-    Class<?> logicalType = constructor.getDeclaringClass();
-
-    Method[] readers = meta.getReaders();
-    Class<?> returnType = readers[0].getReturnType();
-
-    ScalarType<?> scalarType = typeManager.recursiveCreateScalarTypes(returnType);
-
-    ReflectionBasedScalarTypeConverter r = new ReflectionBasedScalarTypeConverter(constructor, readers[0]);
-
-    return new ScalarTypeWrapper(logicalType, scalarType, r);
-  }
-
-  public ReflectionBasedCompoundType buildCompound(ImmutableMeta meta) {
-
-    Constructor<?> constructor = meta.getConstructor();
-
-    Method[] readers = meta.getReaders();
-
-    ReflectionBasedCompoundTypeProperty[] props = new ReflectionBasedCompoundTypeProperty[readers.length];
-
-
-    for (int i = 0; i < readers.length; i++) {
-      Class<?> returnType = readers[i].getReturnType();
-
-      // ensure that return type is also a ScalarDataReader
-      typeManager.recursiveCreateScalarDataReader(returnType);
-
-      String name = getPropertyName(readers[i]);
-
-      props[i] = new ReflectionBasedCompoundTypeProperty(name, readers[i], returnType);
-    }
-
-    return new ReflectionBasedCompoundType(constructor, props);
-  }
-
-  private String getPropertyName(Method method) {
-
-    String name = method.getName();
-    if (name.startsWith("is")) {
-      return lowerFirstChar(name.substring(2));
-    } else if (name.startsWith("get")) {
-      return lowerFirstChar(name.substring(3));
-    }
-    String msg = "Expecting method " + name + " to start with is or get "
-      + " so as to follow bean specification?";
-    throw new RuntimeException(msg);
-  }
-
-  private String lowerFirstChar(String name) {
-    return Character.toLowerCase(name.charAt(0)) + name.substring(1);
-  }
-}
@@ -1 +0,0 @@
-package com.avaje.ebeaninternal.server.type.reflect;
@@ -1,26 +0,0 @@
-package com.avaje.ebeanservice.docstore.api;
-
-import com.avaje.ebean.text.json.JsonReadOptions;
-import com.avaje.ebeaninternal.api.SpiQuery;
-
-/**
- * A Query request for the document store.
- */
-public interface DocQueryRequest<T> {
-
-  /**
-   * Return the query for this request.
-   */
-  SpiQuery<T> getQuery();
-
-  /**
-   * Create JsonReadOptions taking into account persistence context and lazy loading support.
-   */
-  JsonReadOptions createJsonReadOptions();
-
-  /**
-   * Execute secondary queries.
-   */
-  void executeSecondaryQueries(boolean forEach);
-
-}
@@ -1,4 +0,0 @@
-/**
- * Mapping for document store integration.
- */
-package com.avaje.ebeanservice.docstore.api.mapping;
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * Administrative control of AutoTune during runtime.
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.beans.PropertyChangeListener;
 import java.util.Map;
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.sql.CallableStatement;
 import java.sql.SQLException;
@@ -73,8 +73,8 @@ import java.sql.SQLException;
 * }
 * }</pre>
 *
- * @see com.avaje.ebean.SqlUpdate
- * @see com.avaje.ebean.Ebean#execute(CallableSql)
+ * @see SqlUpdate
+ * @see Ebean#execute(CallableSql)
 */
 public interface CallableSql {

@@ -1,6 +1,6 @@
-package com.avaje.ebean;
+package io.ebean;

-import com.avaje.ebean.RawSql.ColumnMapping;
+import io.ebean.RawSql.ColumnMapping;

 import javax.persistence.PersistenceException;
 import java.util.ArrayList;
@@ -1,7 +1,7 @@
-package com.avaje.ebean;
+package io.ebean;

-import com.avaje.ebean.RawSql.Sql;
-import com.avaje.ebeaninternal.server.querydefn.SimpleTextParser;
+import io.ebean.RawSql.Sql;
+import io.ebeaninternal.server.querydefn.SimpleTextParser;

 /**
 * Parses sql-select queries to try and determine the location where WHERE and
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * Bean holding the details to update the document store.
@@ -1,6 +1,6 @@
-package com.avaje.ebean;
+package io.ebean;

-import com.avaje.ebeanservice.docstore.api.DocQueryRequest;
+import io.ebeanservice.docstore.api.DocQueryRequest;
 import org.jetbrains.annotations.Nullable;

 import java.io.IOException;
@@ -1,9 +1,9 @@
-package com.avaje.ebean;
+package io.ebean;

-import com.avaje.ebean.cache.ServerCacheManager;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebean.text.csv.CsvReader;
-import com.avaje.ebean.text.json.JsonContext;
+import io.ebean.cache.ServerCacheManager;
+import io.ebean.config.ServerConfig;
+import io.ebean.text.csv.CsvReader;
+import io.ebean.text.json.JsonContext;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1012,6 +1012,30 @@ public final class Ebean {
    return serverMgr.getDefaultServer().find(beanType);
  }

+  /**
+   * Create a query using native SQL.
+   * <p>
+   * The native SQL can contain named parameters or positioned parameters.
+   * </p>
+   * <pre>{@code
+   *
+   *   String sql = "select c.id, c.name from customer c where c.name like ? order by c.name";
+   *
+   *   Query<Customer> query = ebeanServer.findNative(Customer.class, sql);
+   *   query.setParameter(1, "Rob%");
+   *
+   *   List<Customer> customers = query.findList();
+   *
+   * }</pre>
+   *
+   * @param beanType  The type of entity bean to fetch
+   * @param nativeSql The SQL that can contain named or positioned parameters
+   * @return The query to set parameters and execute
+   */
+  public static <T> Query<T> findNative(Class<T> beanType, String nativeSql) {
+    return serverMgr.getDefaultServer().findNative(beanType, nativeSql);
+  }
+
  /**
   * Create an Update query to perform a bulk update.
   * <p>
@@ -1,11 +1,11 @@
-package com.avaje.ebean;
+package io.ebean;

-import com.avaje.ebean.cache.ServerCacheManager;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebean.meta.MetaInfoManager;
-import com.avaje.ebean.plugin.SpiServer;
-import com.avaje.ebean.text.csv.CsvReader;
-import com.avaje.ebean.text.json.JsonContext;
+import io.ebean.cache.ServerCacheManager;
+import io.ebean.config.ServerConfig;
+import io.ebean.meta.MetaInfoManager;
+import io.ebean.plugin.SpiServer;
+import io.ebean.text.csv.CsvReader;
+import io.ebean.text.json.JsonContext;
 import org.jetbrains.annotations.Nullable;

 import javax.persistence.NonUniqueResultException;
@@ -298,6 +298,28 @@ public interface EbeanServer {
   */
  <T> Query<T> find(Class<T> beanType);

+  /**
+   * Create a query using native SQL.
+   * <p>
+   * The native SQL can contain named parameters or positioned parameters.
+   * </p>
+   * <pre>{@code
+   *
+   *   String sql = "select c.id, c.name from customer c where c.name like ? order by c.name";
+   *
+   *   Query<Customer> query = ebeanServer.findNative(Customer.class, sql);
+   *   query.setParameter(1, "Rob%");
+   *
+   *   List<Customer> customers = query.findList();
+   *
+   * }</pre>
+   *
+   * @param beanType  The type of entity bean to fetch
+   * @param nativeSql The SQL that can contain named or positioned parameters
+   * @return The query to set parameters and execute
+   */
+  <T> Query<T> findNative(Class<T> beanType, String nativeSql);
+
  /**
   * Return the next unique identity value for a given bean type.
   * <p>
@@ -885,7 +907,7 @@ public interface EbeanServer {
   * @param query       the query to execute the row count on
   * @param transaction the transaction (can be null).
   * @return a Future object for the row count query
-   * @see com.avaje.ebean.Query#findFutureCount()
+   * @see Query#findFutureCount()
   */
  <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction);

@@ -900,7 +922,7 @@ public interface EbeanServer {
   * @param query       the query to execute the fetch Id's on
   * @param transaction the transaction (can be null).
   * @return a Future object for the list of Id's
-   * @see com.avaje.ebean.Query#findFutureIds()
+   * @see Query#findFutureIds()
   */
  <T> FutureIds<T> findFutureIds(Query<T> query, Transaction transaction);

@@ -1,9 +1,9 @@
-package com.avaje.ebean;
+package io.ebean;

-import com.avaje.ebean.common.SpiContainer;
-import com.avaje.ebean.config.ContainerConfig;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebeaninternal.server.lib.ShutdownManager;
+import io.ebean.common.SpiContainer;
+import io.ebean.config.ContainerConfig;
+import io.ebean.config.ServerConfig;
+import io.ebeaninternal.server.lib.ShutdownManager;

 import javax.persistence.PersistenceException;
 import java.lang.reflect.Constructor;
@@ -30,7 +30,7 @@ import java.util.Properties;
 public class EbeanServerFactory {


-  private static final String DEFAULT_CONTAINER = "com.avaje.ebeaninternal.server.core.DefaultContainer";
+  private static final String DEFAULT_CONTAINER = "io.ebeaninternal.server.core.DefaultContainer";

  private static SpiContainer container;

@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * Query by Example expression.
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.util.Collection;
 import java.util.Map;
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * An expression that is part of a WHERE or HAVING clause.
@@ -1,10 +1,10 @@
-package com.avaje.ebean;
+package io.ebean;

-import com.avaje.ebean.search.Match;
-import com.avaje.ebean.search.MultiMatch;
-import com.avaje.ebean.search.TextCommonTerms;
-import com.avaje.ebean.search.TextQueryString;
-import com.avaje.ebean.search.TextSimple;
+import io.ebean.search.Match;
+import io.ebean.search.MultiMatch;
+import io.ebean.search.TextCommonTerms;
+import io.ebean.search.TextQueryString;
+import io.ebean.search.TextSimple;

 import java.util.Collection;
 import java.util.List;
@@ -1,10 +1,10 @@
-package com.avaje.ebean;
+package io.ebean;

-import com.avaje.ebean.search.Match;
-import com.avaje.ebean.search.MultiMatch;
-import com.avaje.ebean.search.TextCommonTerms;
-import com.avaje.ebean.search.TextQueryString;
-import com.avaje.ebean.search.TextSimple;
+import io.ebean.search.Match;
+import io.ebean.search.MultiMatch;
+import io.ebean.search.TextCommonTerms;
+import io.ebean.search.TextQueryString;
+import io.ebean.search.TextSimple;
 import org.jetbrains.annotations.Nullable;

 import javax.persistence.NonUniqueResultException;
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.io.Serializable;

@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.util.Set;

@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.util.List;
 import java.util.Set;
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import org.jetbrains.annotations.Nullable;

@@ -157,4 +157,10 @@ public class Finder<I, T> {
    return db().find(type);
  }

+  /**
+   * Creates a native sql query.
+   */
+  public Query<T> nativeSql(String nativeSql) {
+    return db().findNative(type, nativeSql);
+  }
 }
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.util.List;
 import java.util.concurrent.Future;
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import javax.persistence.PersistenceException;
 import java.util.List;
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.util.concurrent.Future;

@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * Represents a Conjunction or a Disjunction.
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * Used to specify the type of like matching used.
@@ -32,4 +32,4 @@ public enum LikeType {
   * </p>
   */
  EQUAL_TO
-}
+}
@@ -0,0 +1,275 @@
+package io.ebean;
+
+import io.ebean.bean.EntityBean;
+
+import javax.persistence.MappedSuperclass;
+
+/**
+ * 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 ebean-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 Finder} 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;
+ *
+ *       @WhenCreated Timestamp whenCreated;
+ *
+ *       @WhenUpdated Timestamp whenUpdated;
+ *
+ *       ...
+ *
+ * }</pre>
+ * <p>
+ * <h3>Extend the Model</h3>
+ * <pre>{@code
+ *
+ *     // Extend the mappedSuperclass
+ *
+ *     @Entity @Table(name="o_account")
+ *     public class Customer extends BaseModel {
+ *
+ *       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>
+ */
+@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);
+  }
+
+}
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.io.Serializable;
 import java.util.ArrayList;
@@ -255,9 +255,9 @@ public final class OrderBy<T> implements Serializable {
    @Override
    public int hashCode() {
      int hc = property.hashCode();
-      hc = hc * 31 + (ascending ? 0 : 1);
-      hc = hc * 31 + (nulls == null ? 0 : nulls.hashCode());
-      hc = hc * 31 + (highLow == null ? 0 : highLow.hashCode());
+      hc = hc * 92821 + (ascending ? 0 : 1);
+      hc = hc * 92821 + (nulls == null ? 0 : nulls.hashCode());
+      hc = hc * 92821 + (highLow == null ? 0 : highLow.hashCode());
      return hc;
    }

@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.util.List;
 import java.util.concurrent.Future;
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * Defines the scope for PersistenceContext.
@@ -6,8 +6,8 @@ package com.avaje.ebean;
 * Ebean has traditionally used Transaction scope for the PersistenceContext. This is used to change the scope to
 * use (by default) and explicitly set the scope to use for an individual query.
 *
- * @see com.avaje.ebean.config.ServerConfig#setPersistenceContextScope(PersistenceContextScope)
- * @see com.avaje.ebean.Query#setPersistenceContextScope(PersistenceContextScope)
+ * @see io.ebean.config.ServerConfig#setPersistenceContextScope(PersistenceContextScope)
+ * @see Query#setPersistenceContextScope(PersistenceContextScope)
 */
 public enum PersistenceContextScope {

@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import javax.persistence.PersistenceException;

@@ -1,6 +1,6 @@
-package com.avaje.ebean;
+package io.ebean;

-import com.avaje.ebean.config.PropertyMap;
+import io.ebean.config.PropertyMap;

 import java.util.Properties;

@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import org.jetbrains.annotations.Nullable;

@@ -243,7 +243,7 @@ public interface Query<T> {
  /**
   * Specify the PersistenceContextScope to use for this query.
   * <p/>
-   * When this is not set the 'default' configured on {@link com.avaje.ebean.config.ServerConfig#setPersistenceContextScope(PersistenceContextScope)}
+   * When this is not set the 'default' configured on {@link io.ebean.config.ServerConfig#setPersistenceContextScope(PersistenceContextScope)}
   * is used - this value defaults to {@link PersistenceContextScope#TRANSACTION}.
   * <p/>
   * Note that the same persistence Context is used for subsequent lazy loading and query join queries.
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.util.Iterator;

@@ -1,6 +1,6 @@
-package com.avaje.ebean;
+package io.ebean;

-import com.avaje.ebean.util.CamelCaseHelper;
+import io.ebean.util.CamelCaseHelper;

 import java.io.Serializable;
 import java.sql.ResultSet;
@@ -636,9 +636,9 @@ public final class RawSql implements Serializable {
      @Override
      public int hashCode() {
        int result = indexPos;
-        result = 31 * result + dbColumn.hashCode();
-        result = 31 * result + (dbAlias != null ? dbAlias.hashCode() : 0);
-        result = 31 * result + (propertyName != null ? propertyName.hashCode() : 0);
+        result = 92821 * result + dbColumn.hashCode();
+        result = 92821 * result + (dbAlias != null ? dbAlias.hashCode() : 0);
+        result = 92821 * result + (propertyName != null ? propertyName.hashCode() : 0);
        return result;
      }

@@ -724,8 +724,8 @@ public final class RawSql implements Serializable {
    @Override
    public int hashCode() {
      int result = (parsed ? 1 : 0);
-      result = 31 * result + columnMapping.hashCode();
-      result = 31 * result + unParsedSql.hashCode();
+      result = 92821 * result + columnMapping.hashCode();
+      result = 92821 * result + unParsedSql.hashCode();
      return result;
    }
  }
@@ -1,7 +1,7 @@
-package com.avaje.ebean;
+package io.ebean;

-import com.avaje.ebean.RawSql.ColumnMapping;
-import com.avaje.ebean.RawSql.Sql;
+import io.ebean.RawSql.ColumnMapping;
+import io.ebean.RawSql.Sql;

 import java.sql.ResultSet;

@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.io.Serializable;
 import java.util.List;
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -165,4 +165,4 @@ public interface SqlRow extends Serializable, Map<String, Object> {
   */
  Collection<Object> values();

-}
+}
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * A SqlUpdate for executing insert update or delete statements.
@@ -50,7 +50,7 @@ public interface SqlUpdate {
   * {@link Transaction#setBatchSize(int)}.
   * </p>
   *
-   * @see com.avaje.ebean.Ebean#execute(SqlUpdate)
+   * @see Ebean#execute(SqlUpdate)
   */
  int execute();

@@ -1,9 +1,8 @@
-package com.avaje.ebean;
+package io.ebean;

-import com.avaje.ebean.annotation.DocStoreMode;
-import com.avaje.ebean.config.DocStoreConfig;
-import com.avaje.ebean.config.PersistBatch;
-import com.avaje.ebean.config.ServerConfig;
+import io.ebean.annotation.DocStoreMode;
+import io.ebean.config.DocStoreConfig;
+import io.ebean.config.ServerConfig;

 import javax.persistence.PersistenceException;
 import javax.persistence.RollbackException;
@@ -324,7 +323,7 @@ public interface Transaction extends Closeable {
   * </p>
   *
   * @param persistBatchMode the batch mode to use for this transaction
-   * @see com.avaje.ebean.config.ServerConfig#setPersistBatch(com.avaje.ebean.config.PersistBatch)
+   * @see io.ebean.config.ServerConfig#setPersistBatch(PersistBatch)
   */
  void setBatch(PersistBatch persistBatchMode);

@@ -345,7 +344,7 @@ public interface Transaction extends Closeable {
   * </p>
   *
   * @param batchOnCascadeMode the batch mode to use per save(), insert(), update() or delete()
-   * @see com.avaje.ebean.config.ServerConfig#setPersistBatchOnCascade(com.avaje.ebean.config.PersistBatch)
+   * @see io.ebean.config.ServerConfig#setPersistBatchOnCascade(PersistBatch)
   */
  void setBatchOnCascade(PersistBatch batchOnCascadeMode);

@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * Provides a callback that can be registered with a Transaction.
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * Adapter that can be extended for easier implementation of TransactionCallback.
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * Execute a TxCallable in a Transaction scope.
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * Execute a TxRunnable in a Transaction scope.
@@ -1,6 +1,4 @@
-package com.avaje.ebean;
-
-import com.avaje.ebean.config.PersistBatch;
+package io.ebean;

 import java.util.ArrayList;

@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * An Insert Update or Delete statement.
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * An update query typically intended to perform a bulk update of many rows that match the query.
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 /**
 * Holds two values as the result of a difference comparison.
@@ -1,4 +1,4 @@
-package com.avaje.ebean;
+package io.ebean;

 import java.sql.Timestamp;
 import java.util.Map;
@@ -1,8 +1,8 @@
-package com.avaje.ebean.annotation;
+package io.ebean.annotation;

-import com.avaje.ebean.TxIsolation;
-import com.avaje.ebean.TxType;
-import com.avaje.ebean.config.PersistBatch;
+import io.ebean.TxIsolation;
+import io.ebean.TxType;
+import io.ebean.PersistBatch;

 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 * <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>
+ * <li>and this one, Ebean's own Transactional</li>
 * </ul>
 * Spring created their one because the EJB annotation does not support features
 * such as isolation level and specifying rollbackOn, noRollbackOn exceptions.
@@ -1,6 +1,6 @@
-package com.avaje.ebean.bean;
+package io.ebean.bean;

-import com.avaje.ebean.ExpressionList;
+import io.ebean.ExpressionList;

 import java.io.Serializable;
 import java.util.Collection;
@@ -1,4 +1,4 @@
-package com.avaje.ebean.bean;
+package io.ebean.bean;

 /**
 * Interface to define the addition of a bean to the underlying collection.
@@ -1,4 +1,4 @@
-package com.avaje.ebean.bean;
+package io.ebean.bean;

 /**
 * Loads a entity bean collection.
@@ -1,4 +1,4 @@
-package com.avaje.ebean.bean;
+package io.ebean.bean;

 /**
 * Loads a entity bean.
@@ -1,4 +1,4 @@
-package com.avaje.ebean.bean;
+package io.ebean.bean;

 import java.io.Serializable;
 import java.util.Arrays;
@@ -35,7 +35,7 @@ public final class CallStack implements Serializable {
  public int hashCode() {
    int hc = 0;
    for (StackTraceElement aCallStack : callStack) {
-      hc = 31 * hc + aCallStack.hashCode();
+      hc = 92821 * hc + aCallStack.hashCode();
    }
    return hc;
  }
@@ -1,4 +1,4 @@
-package com.avaje.ebean.bean;
+package io.ebean.bean;

 /**
 * Marker interface for classes enhanced to support Transactional methods.
@@ -1,4 +1,4 @@
-package com.avaje.ebean.bean;
+package io.ebean.bean;

 import java.beans.PropertyChangeListener;
 import java.io.Serializable;
@@ -1,7 +1,7 @@
-package com.avaje.ebean.bean;
+package io.ebean.bean;

-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.ValuePair;
+import io.ebean.Ebean;
+import io.ebean.ValuePair;

 import javax.persistence.EntityNotFoundException;
 import javax.persistence.PersistenceException;
@@ -696,40 +696,42 @@ public final class EntityBeanIntercept implements Serializable {
  /**
   * Return a dirty property hash taking into account embedded beans.
   */
-  public int getDirtyPropertyHash() {
-    return addDirtyPropertyHash(37);
+  public StringBuilder getDirtyPropertyKey() {
+    StringBuilder sb = new StringBuilder();
+    addDirtyPropertyKey(sb);
+    return sb;
  }

  /**
   * Add and return a dirty property hash recursing into embedded beans.
   */
-  public int addDirtyPropertyHash(int hash) {
+  private void addDirtyPropertyKey(StringBuilder sb) {
    int len = getPropertyLength();
    for (int i = 0; i < len; i++) {
      if (changedProps != null && changedProps[i]) {
-        // the property has been changed on this bean
-        hash = hash * 31 + (i + 1);
+        sb.append(i).append(',');
      } else if (embeddedDirty != null && embeddedDirty[i]) {
        // an embedded property has been changed - recurse
        EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
-        hash = hash * 31 + embeddedBean._ebean_getIntercept().addDirtyPropertyHash(hash);
+        sb.append(i).append('[');
+        embeddedBean._ebean_getIntercept().addDirtyPropertyKey(sb);
+        sb.append(']');
      }
    }
-    return hash;
  }

  /**
   * Return a loaded property hash.
   */
-  public int getLoadedPropertyHash() {
-    int hash = 37;
+  public StringBuilder getLoadedPropertyKey() {
+    StringBuilder sb = new StringBuilder();
    int len = getPropertyLength();
    for (int i = 0; i < len; i++) {
      if (isLoadedProperty(i)) {
-        hash = hash * 31 + (i + 1);
+        sb.append(i).append(',');
      }
    }
-    return hash;
+    return sb;
  }

  /**
@@ -1,4 +1,4 @@
-package com.avaje.ebean.bean;
+package io.ebean.bean;

 import java.lang.ref.WeakReference;
 import java.util.LinkedHashSet;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	d96abece75	[maven-release-plugin] prepare release ebean-10.1.4	2017-01-09 22:39:36 +13:00
Rob Bygrave	c953da637e	Bump ebean-annotation to 2.2 for meta-annotation support on @Formula	2017-01-09 22:37:10 +13:00
Rob Bygrave	8d39b0a996	#940 - Allow findNative to use @Formula properties (add test for MySql := use with RawSql and findNative)	2017-01-09 22:29:15 +13:00
Rob Bygrave	0efcf1eeb3	Merge branch 'master' of github.com:ebean-orm/ebean	2017-01-09 19:40:23 +13:00
Rob Bygrave	335cef870f	#939 - Make ModifyAwareSet serializable ... (for serializable entity beans with @DbJson etc)	2017-01-09 19:39:54 +13:00
Michael BenzandRob Bygrave	4c40962f04	MigrationXmlWriter adds DOCTYPE xml to avoid warning of missing external DTD in eclipse IDE. (#937 )	2017-01-05 09:16:39 +13:00
Thibault MeyerandRob Bygrave	9be0d22cfb	Upgrade provided dependencies (#936 ) - javax.validation from 1.0.0.GA to 1.1.0.Final - servlet-api from 2.4 to javax.servlet-api 3.1.0 - joda-time from 1.6 to 2.9.7 - postgresql from 9.4.1202-jdbc41 to 9.4.1212.jre7 - h2 from 1.4.192 to 1.4.193 Signed-off-by: Thibault Meyer <meyer.thibault@gmail.com>	2017-01-01 19:57:02 +13:00
Thibault MeyerandRob Bygrave	2893d73fad	Upgrade test dependencies (#935 ) - avaje-agentloader from 2.1.1 to 2.1.2 - avaje-moduuid from 1.2 to 2.1 - commons-io from 2.4 to 2.5 - hsqldb from 2.0.0 to 2.3.4 - mysql-connector-java from 5.1.36 to 6.0.5 - sqlite-jdbc from 3.8.11.2 to 3.15.1 Signed-off-by: Thibault Meyer <meyer.thibault@gmail.com>	2017-01-01 19:55:56 +13:00
Thibault MeyerandRob Bygrave	33d66ea9d1	Upgrade antlr4-runtime to prior version 4.6 (#934 ) Signed-off-by: Thibault Meyer <meyer.thibault@gmail.com>	2017-01-01 19:54:25 +13:00
Nagy VilmosandRob Bygrave	073ea9c550	SQL Server boolean mapping fix (#932 )	2017-01-01 19:52:57 +13:00
Rob Bygrave	8467934021	[maven-release-plugin] prepare for next development iteration	2016-12-23 16:14:19 +13:00
Rob Bygrave	96ba63407f	[maven-release-plugin] prepare release ebean-10.1.3	2016-12-23 16:14:10 +13:00
Rob Bygrave	88df6ffc6e	#931 - Refactor internals - DefaultTypeManager ...	2016-12-23 13:33:11 +13:00
Rob Bygrave	3efcfec300	#930 - Refactor (renames etc) for SQL Server History support	2016-12-23 13:18:15 +13:00
Rob BygraveandGitHub	e51eb00889	Merge pull request #929 from vilmosnagy/feature/sqlServer2016History SqlServer 2016 history support.	2016-12-23 13:00:23 +13:00
vilmos.nagy	9ae27ddcdd	SqlServer 2016 history support.	2016-12-22 19:22:44 +01:00
Rob Bygrave	b9516e64a3	#928 - Pom - change over to io.ebean persistence-api from org.avaje.ebean one.	2016-12-22 23:45:35 +13:00
Rob Bygrave	f7f5552bf0	#927 - Pom - bump ebean-dbmigration to 10.1.2	2016-12-22 23:38:18 +13:00
Rob Bygrave	adec2ab1b8	#926 - Pom - bump avaje-datasource to 1.1.4	2016-12-22 22:42:24 +13:00
Rob Bygrave	da6d7284f8	No effective change - update Readme to maven groupId io.ebean	2016-12-22 00:00:35 +13:00
Rob Bygrave	1c160fea5a	No functional change - update enhancement agent to 10.1.2	2016-12-21 23:38:32 +13:00
Rob Bygrave	cc87de76d7	[maven-release-plugin] prepare for next development iteration	2016-12-21 00:09:30 +13:00
Rob Bygrave	70b380e6e7	[maven-release-plugin] prepare release ebean-10.1.2	2016-12-21 00:09:19 +13:00
Rob Bygrave	3e419d3e3a	No effective change - test ebean.properties back to H2 for default	2016-12-20 21:31:02 +13:00
Rob Bygrave	7e2be20b6e	#925 - Change generated SQL for H2, Postgres and MySql to not use column alias'	2016-12-20 21:30:00 +13:00
Rob Bygrave	ab2d5fb4c8	No effective change - update test to use trimmed sql (trim out sql column alias to allow it to be optional)	2016-12-20 21:14:12 +13:00
Rob Bygrave	809901ff13	No effective change - update H2 specific test	2016-12-20 21:02:36 +13:00
Rob Bygrave	fcc58d77e8	No effective change - update tests using Platform enum rather than name	2016-12-20 20:41:55 +13:00
Rob Bygrave	bc93a82b1a	#900 - Error - Can't fetch JsonDB field - org.postgresql.util.PSQLException: ERROR: could not identify an equality operator for type json	2016-12-20 03:00:08 +13:00
Rob Bygrave	84e1e12b66	#900 - Error - Can't fetch JsonDB field - org.postgresql.util.PSQLException: ERROR: could not identify an equality operator for type json	2016-12-20 02:59:47 +13:00
Rob Bygrave	2eb0c12213	#924 - Bump ebean-dbmigration dependency to 10.1.1 (sql server fix)	2016-12-19 22:19:53 +13:00
Rob Bygrave	4941134ce1	#922 - NPE Issue with ebean-elastic and multi-tenant Ebean ... NPE at DLoadContext line 96	2016-12-14 00:53:30 +13:00
Rob Bygrave	cf37fda3f4	#921 - Refactor internals - Change internal use of "findRowCount" to "findCount"	2016-12-13 19:51:11 +13:00
Rob Bygrave	f429811f79	[maven-release-plugin] prepare for next development iteration	2016-12-12 02:10:10 +13:00
Rob Bygrave	70fd988d8c	[maven-release-plugin] prepare release ebean-10.1.1	2016-12-12 02:09:55 +13:00
Rob Bygrave	fe4167ed60	#920 - Update DBMigration to io.ebean	2016-12-12 02:07:52 +13:00
Rob Bygrave	0eef69a277	#920 - Change logger package to io.ebean (e.g. for logging SQL instead of org.avaje.ebean.SQL use io.ebean.SQL)	2016-12-11 23:42:38 +13:00
Rob Bygrave	76bfd805c0	#919 - io.ebean package, use ebean-annotation	2016-12-11 23:34:29 +13:00
Rob Bygrave	971e2dc91b	#919 - io.ebean package initial	2016-12-11 23:23:22 +13:00
Rob Bygrave	5821dc96b9	[maven-release-plugin] prepare for next development iteration	2016-12-10 00:08:52 +13:00
Rob Bygrave	e027110006	[maven-release-plugin] prepare release ebean-9.5.1	2016-12-10 00:08:42 +13:00
Rob Bygrave	b5e6e9a66c	Bump pom to 9.5.1-SNAPSHOT	2016-12-10 00:06:09 +13:00
Rob Bygrave	514047e680	#918 - Remove DbMigrationConfig.generateOnStart() ... migrate to offline generation	2016-12-10 00:04:41 +13:00
Rob Bygrave	a727a98a21	#917 - ENH: Add findNative() ... ala automatic mapping of native SQL into object graphs / paths.	2016-12-09 23:45:57 +13:00
Rob Bygrave	e75b5e8b30	#916 - Refactor internals - bump use of 31 in hashes to 92821	2016-12-08 23:28:58 +13:00
Rob Bygrave	ad0e085ff5	#915 - Refactor internals - Change update plan to string key	2016-12-08 23:23:19 +13:00
Rob Bygrave	322a2f500d	No effective change - move method - BeanDescriptor.merge()	2016-12-08 23:01:05 +13:00
Rob Bygrave	1c7454d249	[maven-release-plugin] prepare for next development iteration	2016-12-08 22:26:13 +13:00
Rob Bygrave	e1efca6736	[maven-release-plugin] prepare release ebean-9.4.2	2016-12-08 22:26:04 +13:00
Rob Bygrave	8ae61074ad	#914 - Fix multi-tenancy support such that it automatically propagates the tenantId for lazy loading	2016-12-08 22:04:18 +13:00
Rob Bygrave	c3bc0c4975	#913 - IllegalArgumentException: No enum constant com.avaje.ebean.config.Platform.HSQLDB	2016-12-07 21:58:07 +13:00
Rob Bygrave	611bba272a	Modify testAggregationCount to make MySql happy - avoid count(u1.*)	2016-12-07 21:39:26 +13:00
Rob Bygrave	4c9ec38c88	[maven-release-plugin] prepare for next development iteration	2016-12-06 23:44:35 +13:00
Rob Bygrave	e2731a99be	[maven-release-plugin] prepare release ebean-9.4.1	2016-12-06 23:44:26 +13:00
Rob Bygrave	7d56df3b23	Bump pom to 9.4.1-SNAPSHOT	2016-12-06 23:43:37 +13:00
Rob Bygrave	bebef48332	Update test ebean.properties	2016-12-03 22:03:55 +13:00
Rob Bygrave	f66ea12fbf	#912 - Refactor - move platform specfic code into subpackages	2016-12-03 15:39:24 +13:00
Rob Bygrave	b08f1580f9	#910 - SQL Server update - Add ANSI based row limiter (2012+) and make as default platform	2016-12-03 15:10:11 +13:00
Rob Bygrave	707912f7ad	No effective change - add some wait into history test (TestHistoryInsert)	2016-12-03 13:55:45 +13:00
Rob Bygrave	5ce31b16d4	#910 - SQL Server update - refactor rename platform to SqlServerPlatform	2016-12-03 13:30:17 +13:00
Rob Bygrave	a5945b1d5d	#911 - SQL Server - remove old MsSqlServer2000Platform (expecting users migrated to SQL Server 2005+)	2016-12-03 13:24:52 +13:00
Rob Bygrave	b8577ae6d0	#910 - SQL Server update - tidy whitespace for MsSqlServer2005SqlLimiter	2016-12-03 13:19:15 +13:00
Rob Bygrave	14dedb7b9a	#910 - SQL Server update	2016-12-03 13:18:33 +13:00
Rob Bygrave	2dbd543127	#909 - @Lob with @Size ... produces incorrect DDL for Postgres	2016-12-03 08:42:46 +13:00
Rob Bygrave	cc989af1c6	#908 - Remove support for Immutable Compound Values	2016-12-02 22:49:00 +13:00
Rob Bygrave	0aad285f35	#907 - Remove Model.Finder ... migrate to Finder	2016-12-02 21:47:30 +13:00
Rob Bygrave	a3754e31f2	#906 - Add NamingConvention Support for JoinColumn (OneToMany, ManyToOne) - was PR #887	2016-12-02 21:21:19 +13:00
Rob Bygrave	1dd0f3f609	[maven-release-plugin] prepare for next development iteration	2016-12-01 21:04:18 +13:00
				`@@ -1 +0,0 @@`
				`package com.avaje.ebeaninternal.server.cache;`