[maven-release-plugin] prepare release ebean-parent-12.13.1

test config only, stop dumping metrics on jvm shutdown
Tidy TestElementCollectionBasicSet only
2024-04-21 10:51:47 +00:00 · 2021-11-26 21:57:04 +13:00 · 2021-11-26 21:52:40 +13:00 · 2021-11-26 21:33:26 +13:00 · 2021-11-26 21:25:54 +13:00 · 2021-11-26 21:10:31 +13:00
142 changed files with 1422 additions and 3016 deletions
@@ -0,0 +1,36 @@
+
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      fail-fast: false
+      matrix:
+        java_version: [8]
+        os: [ubuntu-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Java
+      uses: actions/setup-java@v2
+      with:
+        java-version: ${{ matrix.java_version }}
+        distribution: 'adopt'
+    - name: Maven cache
+      uses: actions/cache@v2
+      env:
+        cache-name: maven-cache
+      with:
+        path:
+          ~/.m2
+        key: build-${{ env.cache-name }}
+    - name: Build with Maven
+      run: mvn package
+
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/ebean-orm/ebean.svg?branch=master)](https://travis-ci.org/ebean-orm/ebean)
+[![Build](https://github.com/ebean-orm/ebean/actions/workflows/build.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/build.yml)
 [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean)

 # Sponsors
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.12.2</version>
+    <version>12.13.1</version>
  </parent>

  <name>ebean api</name>
@@ -36,9 +36,8 @@
    -->
    <dependency>
      <groupId>io.avaje</groupId>
-      <artifactId>avaje-jsr305</artifactId>
-      <version>1.1</version>
-      <scope>provided</scope>
+      <artifactId>avaje-lang</artifactId>
+      <version>1.0</version>
    </dependency>

    <dependency>
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>12.12.2-SNAPSHOT</version>
-  </parent>
-
-  <name>ebean api</name>
-  <description>ebean api</description>
-  <artifactId>ebean-api</artifactId>
-
-  <dependencies>
-
-    <!--
-    Projects are expected to explicit depend on version
-    of slf4j that they want to use
-    -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.30</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-config</artifactId>
-      <version>1.5</version>
-    </dependency>
-
-    <!--
-    Class retention Nonnull and Nullable annotations
-    to assist with IDE auto-completion with Ebean API
-    -->
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-jsr305</artifactId>
-      <version>1.1</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>persistence-api</artifactId>
-      <version>2.2.5</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-annotation</artifactId>
-      <version>7.3</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-types</artifactId>
-      <version>2.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource-api</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <!-- Jackson core used internally by Ebean -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- provided scope for JsonNode support -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
-     and not require a separate module for it -->
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>1.4.199</version>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.transaction</groupId>
-      <artifactId>jta</artifactId>
-      <version>1.1</version>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>junit</artifactId>
-      <version>1.0</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.avaje.tile:moditech-module:1.0</tile>
-          </tiles>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
@@ -1,5 +1,7 @@
 package io.ebean;

+import io.avaje.lang.NonNullApi;
+
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
@@ -18,6 +20,7 @@ import java.util.concurrent.TimeUnit;
 * This also propagates MDC context from the current thread to the
 * background task if defined.
 */
+@NonNullApi
 public interface BackgroundExecutor {

  /**
@@ -1,7 +1,7 @@
 package io.ebean;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import java.util.List;
 import java.util.Optional;

@@ -27,10 +27,10 @@ import java.util.Optional;
 * @param <I> The ID type
 * @param <T> The Bean type
 */
+@NonNullApi
 public abstract class BeanFinder<I,T> {

  protected final Database server;
-
  protected final Class<T> type;

  /**
@@ -81,7 +81,6 @@ public abstract class BeanFinder<I,T> {
   * <p>
   * Equivalent to {@link Database#reference(Class, Object)}
   */
-  @Nonnull
  public T ref(I id) {
    return db().reference(type, id);
  }
@@ -97,7 +96,6 @@ public abstract class BeanFinder<I,T> {
  /**
   * Find an entity by ID returning an Optional.
   */
-  @Nullable
  public Optional<T> findByIdOrEmpty(I id) {
    return db().find(type).setId(id).findOneOrEmpty();
  }
@@ -112,7 +110,6 @@ public abstract class BeanFinder<I,T> {
  /**
   * Retrieves all entities of the given type.
   */
-  @Nonnull
  public List<T> findAll() {
    return query().findList();
  }
@@ -1,5 +1,6 @@
 package io.ebean;

+import io.avaje.lang.NonNullApi;
 import io.ebean.bean.EntityBean;

 import java.util.Collection;
@@ -31,6 +32,7 @@ import java.util.Collection;
 * @param <I> The ID type
 * @param <T> The Bean type
 */
+@NonNullApi
 public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {

  /**
@@ -1,6 +1,5 @@
 package io.ebean;

-import javax.annotation.Nullable;
 import java.util.Map;
 import java.util.Set;

@@ -138,7 +137,6 @@ public interface BeanState {
  /**
   * Returns a map with load errors.
   */
-  @Nullable
  Map<String, Exception> loadErrors();

  /**
@@ -1,13 +1,13 @@
 package io.ebean;

+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.plugin.Property;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import java.util.Collection;
@@ -60,6 +60,7 @@ import java.util.concurrent.Callable;
 *
 * }</pre>
 */
+@NonNullApi
 public final class DB {

  private static final DbContext context = DbContext.getInstance();
@@ -523,15 +524,13 @@ public final class DB {
   * @param bean The entity bean to check uniqueness on
   * @return a set of Properties if constraint validation was detected or empty list.
   */
-  @Nonnull
  public static Set<Property> checkUniqueness(Object bean) {
    return getDefault().checkUniqueness(bean);
  }

  /**
-   * Same as {@link #checkUniqueness(Object)}. but with given transaction.
+   * Same as {@link #checkUniqueness(Object)} but with given transaction.
   */
-  @Nonnull
  public static Set<Property> checkUniqueness(Object bean, Transaction transaction) {
    return getDefault().checkUniqueness(bean, transaction);
  }
@@ -851,7 +850,6 @@ public final class DB {
   * }</pre>
   */
  public static <T> Update<T> createUpdate(Class<T> beanType, String ormUpdate) {
-
    return getDefault().createUpdate(beanType, ormUpdate);
  }

@@ -859,7 +857,6 @@ public final class DB {
   * Create a CsvReader for a given beanType.
   */
  public static <T> CsvReader<T> createCsvReader(Class<T> beanType) {
-
    return getDefault().createCsvReader(beanType);
  }

@@ -897,7 +894,6 @@ public final class DB {
   * @return A ORM Query for this beanType
   */
  public static <T> Query<T> createQuery(Class<T> beanType) {
-
    return getDefault().createQuery(beanType);
  }

@@ -935,7 +931,6 @@ public final class DB {
   * @return The query with expressions defined as per the parsed query statement
   */
  public static <T> Query<T> createQuery(Class<T> beanType, String eql) {
-
    return getDefault().createQuery(beanType, eql);
  }

@@ -951,7 +946,6 @@ public final class DB {
   * @return A ORM Query object for this beanType
   */
  public static <T> Query<T> find(Class<T> beanType) {
-
    return getDefault().find(beanType);
  }

@@ -1030,77 +1024,6 @@ public final class DB {
    return getDefault().filter(beanType);
  }

-//  /**
-//   * Execute a Sql Update Delete or Insert statement. This returns the number of
-//   * rows that where updated, deleted or inserted. If is executed in batch then
-//   * this returns -1. You can get the actual rowCount after commit() from
-//   * updateSql.getRowCount().
-//   * <p>
-//   * If you wish to execute a Sql Select natively then you should use the
-//   * FindByNativeSql object.
-//   * </p>
-//   * <p>
-//   * Note that the table modification information is automatically deduced and
-//   * you do not need to call the DB.externalModification() method when you
-//   * use this method.
-//   * </p>
-//   * <p>
-//   * Example:
-//   * </p>
-//   * <pre>{@code
-//   *
-//   *   // example that uses 'named' parameters
-//   *   String s = "UPDATE f_topic set post_count = :count where id = :id"
-//   *
-//   *   SqlUpdate update = DB.createSqlUpdate(s);
-//   *
-//   *   update.setParameter("id", 1);
-//   *   update.setParameter("count", 50);
-//   *
-//   *   int modifiedCount = DB.execute(update);
-//   *
-//   *   String msg = "There where " + modifiedCount + "rows updated";
-//   *
-//   * }</pre>
-//   *
-//   * @param sqlUpdate the update sql potentially with bind values
-//   * @return the number of rows updated or deleted. -1 if executed in batch.
-//   * @see SqlUpdate
-//   * @see CallableSql
-//   * @see DB#execute(CallableSql)
-//   */
-//  public static int execute(SqlUpdate sqlUpdate) {
-//    return defaultDatabase().execute(sqlUpdate);
-//  }
-//
-//  /**
-//   * For making calls to stored procedures.
-//   * <p>
-//   * Example:
-//   * </p>
-//   * <pre>{@code
-//   *
-//   *   String sql = "{call sp_order_modify(?,?,?)}";
-//   *
-//   *   CallableSql cs = DB.createCallableSql(sql);
-//   *   cs.setParameter(1, 27);
-//   *   cs.setParameter(2, "SHIPPED");
-//   *   cs.registerOut(3, Types.INTEGER);
-//   *
-//   *   DB.execute(cs);
-//   *
-//   *   // read the out parameter
-//   *   Integer returnValue = (Integer) cs.getObject(3);
-//   *
-//   * }</pre>
-//   *
-//   * @see CallableSql
-//   * @see Ebean#execute(SqlUpdate)
-//   */
-//  public static int execute(CallableSql callableSql) {
-//    return defaultDatabase().execute(callableSql);
-//  }
-
  /**
   * Execute a TxRunnable in a Transaction with an explicit scope.
   * <p>
@@ -1,5 +1,7 @@
 package io.ebean;

+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
@@ -10,8 +12,6 @@ import io.ebean.plugin.SpiServer;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
@@ -92,6 +92,7 @@ import java.util.concurrent.Callable;
 * @see DatabaseFactory
 * @see DatabaseConfig
 */
+@NonNullApi
 public interface Database {

  /**
@@ -575,8 +576,8 @@ public interface Database {
  <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery);

  /**
-   * Look to execute a native sql query that does not returns beans but instead
-   * returns SqlRow or direct access to ResultSet (see {@link SqlQuery#findList(RowMapper)}.
+   * Look to execute a native sql query that does not return beans but instead
+   * returns SqlRow or direct access to ResultSet.
   *
   * <p>
   * Refer to {@link DtoQuery} for native sql queries returning DTO beans.
@@ -949,7 +950,6 @@ public interface Database {
   * @param beanType the type of entity bean
   * @param id       the id value
   */
-  @Nonnull
  <T> T reference(Class<T> beanType, Object id);

  /**
@@ -1236,6 +1236,7 @@ public interface Database {
   * @param id          the bean id value
   * @param transaction the transaction to use (can be null)
   */
+  @Nullable
  <T> T find(Class<T> beanType, Object id, Transaction transaction);

  /**
@@ -1294,13 +1295,11 @@ public interface Database {
   * @param bean The entity bean to check uniqueness on
   * @return a set of Properties if constraint validation was detected or empty list.
   */
-  @Nonnull
  Set<Property> checkUniqueness(Object bean);

  /**
   * Same as {@link #checkUniqueness(Object)}. but with given transaction.
   */
-  @Nonnull
  Set<Property> checkUniqueness(Object bean, Transaction transaction);

  /**
@@ -1614,6 +1613,7 @@ public interface Database {
   * @param id          the id of the entity bean
   * @param transaction the transaction the publish process should use (can be null)
   */
+  @Nullable
  <T> T publish(Class<T> beanType, Object id, Transaction transaction);

  /**
@@ -1627,6 +1627,7 @@ public interface Database {
   * @param beanType the type of the entity bean
   * @param id       the id of the entity bean
   */
+  @Nullable
  <T> T publish(Class<T> beanType, Object id);

  /**
@@ -1665,6 +1666,7 @@ public interface Database {
   * @param id          the id of the entity bean to restore
   * @param transaction the transaction the restore process should use (can be null)
   */
+  @Nullable
  <T> T draftRestore(Class<T> beanType, Object id, Transaction transaction);

  /**
@@ -1678,6 +1680,7 @@ public interface Database {
   * @param beanType the type of the entity bean
   * @param id       the id of the entity bean to restore
   */
+  @Nullable
  <T> T draftRestore(Class<T> beanType, Object id);

  /**
@@ -1,9 +1,10 @@
 package io.ebean;

+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import io.ebean.docstore.DocQueryContext;
 import io.ebean.docstore.RawDoc;

-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -13,6 +14,7 @@ import java.util.function.Predicate;
 /**
 * Document storage operations.
 */
+@NonNullApi
 public interface DocumentStore {

  /**
@@ -1,7 +1,9 @@
 package io.ebean;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
+
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -38,12 +40,12 @@ import java.util.stream.Stream;
 *
 * }</pre>
 */
+@NonNullApi
 public interface DtoQuery<T> extends CancelableQuery {

  /**
   * Execute the query returning a list.
   */
-  @Nonnull
  List<T> findList();

  /**
@@ -53,7 +55,6 @@ public interface DtoQuery<T> extends CancelableQuery {
   * resultSet and potentially connection and MUST be closed. We should use
   * QueryIterator in a <em>try with resource block</em>.
   */
-  @Nonnull
  QueryIterator<T> findIterate();

  /**
@@ -63,7 +64,6 @@ public interface DtoQuery<T> extends CancelableQuery {
   * resultSet and potentially connection and MUST be closed. We should use
   * the Stream in a <em>try with resource block</em>.
   */
-  @Nonnull
  Stream<T> findStream();

  /**
@@ -105,7 +105,6 @@ public interface DtoQuery<T> extends CancelableQuery {
  /**
   * Execute the query returning an optional bean.
   */
-  @Nonnull
  Optional<T> findOneOrEmpty();

  /**
@@ -130,6 +129,13 @@ public interface DtoQuery<T> extends CancelableQuery {
   */
  DtoQuery<T> setParameter(String name, Object value);

+  /**
+   * Bind the named multi-value array parameter which we would use with Postgres ANY.
+   * <p>
+   * For Postgres this binds an ARRAY rather than expands into multiple bind values.
+   */
+  DtoQuery<T> setArrayParameter(String name, Collection<?> values);
+
  /**
   * Bind the parameter by its index position (1 based like JDBC).
   */
@@ -1,13 +1,12 @@
 package io.ebean;

+import io.avaje.lang.Nullable;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.plugin.Property;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import java.util.Collection;
@@ -506,7 +505,6 @@ public final class Ebean {
   * @param bean The entity bean to check uniqueness on
   * @return a set of Properties if constraint validation was detected or empty list.
   */
-  @Nonnull
  public static Set<Property> checkUniqueness(Object bean) {
    return getDefault().checkUniqueness(bean);
  }
@@ -514,7 +512,6 @@ public final class Ebean {
  /**
   * Same as {@link #checkUniqueness(Object)}. but with given transaction.
   */
-  @Nonnull
  public static Set<Property> checkUniqueness(Object bean, Transaction transaction) {
    return getDefault().checkUniqueness(bean, transaction);
  }
@@ -1,6 +1,5 @@
 package io.ebean;

-import javax.annotation.Nonnull;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Future;
@@ -25,13 +24,11 @@ public class EmptyPagedList<T> implements PagedList<T> {
    // do nothing
  }

-  @Nonnull
  @Override
  public Future<Integer> getFutureCount() {
    return null;
  }

-  @Nonnull
  @Override
  public List<T> getList() {
    return Collections.emptyList();
@@ -1,21 +1,13 @@
 package io.ebean;

-import io.ebean.search.Match;
-import io.ebean.search.MultiMatch;
-import io.ebean.search.TextCommonTerms;
-import io.ebean.search.TextQueryString;
-import io.ebean.search.TextSimple;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
+import io.ebean.search.*;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.persistence.NonUniqueResultException;
 import java.sql.Connection;
 import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Predicate;

@@ -39,6 +31,7 @@ import java.util.function.Predicate;
 *
 * @see Query#where()
 */
+@NonNullApi
 public interface ExpressionList<T> {

  /**
@@ -327,7 +320,6 @@ public interface ExpressionList<T> {
   *
   * @see Query#findList()
   */
-  @Nonnull
  List<T> findList();

  /**
@@ -335,7 +327,6 @@ public interface ExpressionList<T> {
   *
   * @see Query#findIds()
   */
-  @Nonnull
  <A> List<A> findIds();

  /**
@@ -351,7 +342,6 @@ public interface ExpressionList<T> {
   *
   * @see Query#findSet()
   */
-  @Nonnull
  Set<T> findSet();

  /**
@@ -359,7 +349,6 @@ public interface ExpressionList<T> {
   *
   * @see Query#findMap()
   */
-  @Nonnull
  <K> Map<K, T> findMap();

  /**
@@ -392,7 +381,6 @@ public interface ExpressionList<T> {
   *
   * @return the list of values for the selected property
   */
-  @Nonnull
  <A> List<A> findSingleAttributeList();

  /**
@@ -429,7 +417,6 @@ public interface ExpressionList<T> {
  /**
   * Execute the query returning an optional bean.
   */
-  @Nonnull
  Optional<T> findOneOrEmpty();

  /**
@@ -442,7 +429,6 @@ public interface ExpressionList<T> {
   *
   * @return a Future object for the row count query
   */
-  @Nonnull
  FutureRowCount<T> findFutureCount();

  /**
@@ -455,7 +441,6 @@ public interface ExpressionList<T> {
   *
   * @return a Future object for the list of Id's
   */
-  @Nonnull
  FutureIds<T> findFutureIds();

  /**
@@ -468,7 +453,6 @@ public interface ExpressionList<T> {
   *
   * @return a Future object for the list result of the query
   */
-  @Nonnull
  FutureList<T> findFutureList();

  /**
@@ -499,7 +483,6 @@ public interface ExpressionList<T> {
   * @return The PagedList
   * @see Query#findPagedList()
   */
-  @Nonnull
  PagedList<T> findPagedList();

  /**
@@ -509,7 +492,6 @@ public interface ExpressionList<T> {
   * It will execute the query against the history returning the versions of the bean.
   * </p>
   */
-  @Nonnull
  List<Version<T>> findVersions();

  /**
@@ -519,13 +501,11 @@ public interface ExpressionList<T> {
   * It will execute the query against the history returning the versions of the bean.
   * </p>
   */
-  @Nonnull
  List<Version<T>> findVersionsBetween(Timestamp start, Timestamp end);

  /**
   * Add some filter predicate expressions to the many property.
   */
-  @Nonnull
  ExpressionList<T> filterMany(String manyProperty);

  /**
@@ -1,7 +1,7 @@
 package io.ebean;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import io.avaje.lang.Nullable;
+
 import javax.persistence.NonUniqueResultException;
 import java.time.Clock;
 import java.util.List;
@@ -82,7 +82,6 @@ public interface ExtendedServer {
   *
   * @see Query#findIds()
   */
-  @Nonnull
  <A, T> List<A> findIds(Query<T> query, Transaction transaction);

  /**
@@ -100,7 +99,6 @@ public interface ExtendedServer {
   * @see Query#findEach(Consumer)
   * @see Query#findEachWhile(Predicate)
   */
-  @Nonnull
  <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction);

  /**
@@ -112,7 +110,6 @@ public interface ExtendedServer {
   * Note that the stream needs to be closed so use with try with resources.
   * </p>
   */
-  @Nonnull
  <T> Stream<T> findStream(Query<T> query, Transaction transaction);

  /**
@@ -125,7 +122,6 @@ public interface ExtendedServer {
   * <p>
   * Note that the stream needs to be closed so use with try with resources.
   */
-  @Nonnull
  @Deprecated
  <T> Stream<T> findLargeStream(Query<T> query, Transaction transaction);

@@ -210,7 +206,6 @@ public interface ExtendedServer {
   * It will execute the query against the history returning the versions of the bean.
   * </p>
   */
-  @Nonnull
  <T> List<Version<T>> findVersions(Query<T> query, Transaction transaction);

  /**
@@ -235,7 +230,6 @@ public interface ExtendedServer {
   * @return the list of fetched beans.
   * @see Query#findList()
   */
-  @Nonnull
  <T> List<T> findList(Query<T> query, Transaction transaction);

  /**
@@ -251,7 +245,6 @@ public interface ExtendedServer {
   * @return a Future object for the row count query
   * @see Query#findFutureCount()
   */
-  @Nonnull
  <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction);

  /**
@@ -267,7 +260,6 @@ public interface ExtendedServer {
   * @return a Future object for the list of Id's
   * @see Query#findFutureIds()
   */
-  @Nonnull
  <T> FutureIds<T> findFutureIds(Query<T> query, Transaction transaction);

  /**
@@ -284,7 +276,6 @@ public interface ExtendedServer {
   * @return a Future object for the list result of the query
   * @see Query#findFutureList()
   */
-  @Nonnull
  <T> FutureList<T> findFutureList(Query<T> query, Transaction transaction);

  /**
@@ -316,7 +307,6 @@ public interface ExtendedServer {
   * @return The PagedList
   * @see Query#findPagedList()
   */
-  @Nonnull
  <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction);

  /**
@@ -341,7 +331,6 @@ public interface ExtendedServer {
   * @return the set of fetched beans.
   * @see Query#findSet()
   */
-  @Nonnull
  <T> Set<T> findSet(Query<T> query, Transaction transaction);

  /**
@@ -358,7 +347,6 @@ public interface ExtendedServer {
   * @return the map of fetched beans.
   * @see Query#findMap()
   */
-  @Nonnull
  <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction);

  /**
@@ -391,7 +379,6 @@ public interface ExtendedServer {
   * @return the list of values for the selected property
   * @see Query#findSingleAttributeList()
   */
-  @Nonnull
  <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction);

  /**
@@ -419,7 +406,6 @@ public interface ExtendedServer {
  /**
   * Similar to findOne() but returns an Optional (rather than nullable).
   */
-  @Nonnull
  <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction);

  /**
@@ -463,7 +449,6 @@ public interface ExtendedServer {
   * @return the list of fetched MapBean.
   * @see SqlQuery#findList()
   */
-  @Nonnull
  List<SqlRow> findList(SqlQuery query, Transaction transaction);

  /**
@@ -1,9 +1,8 @@
 package io.ebean;

+import io.avaje.lang.NonNullApi;
 import io.ebean.service.SpiFetchGroupQuery;

-import javax.annotation.Nonnull;
-
 /**
 * Defines what part of the object graph to load (select and fetch clauses).
 * <p>
@@ -62,6 +61,7 @@ import javax.annotation.Nonnull;
 *
 * @param <T> The bean type the Fetch group can be applied to
 */
+@NonNullApi
 public interface FetchGroup<T> {

  /**
@@ -83,7 +83,6 @@ public interface FetchGroup<T> {
   *
   * @return The FetchGroup with the given select clause
   */
-  @Nonnull
  static <T> FetchGroup<T> of(Class<T> cls, String select) {
    return XServiceProvider.fetchGroupOf(cls, select);
  }
@@ -108,7 +107,6 @@ public interface FetchGroup<T> {
   *
   * @return The FetchGroupBuilder with the given select clause which we will add fetch clauses to
   */
-  @Nonnull
  static <T> FetchGroupBuilder<T> of(Class<T> cls) {
    return XServiceProvider.fetchGroupOf(cls);
  }
@@ -1,6 +1,6 @@
 package io.ebean;

-import javax.annotation.Nonnull;
+import io.avaje.lang.NonNullApi;

 /**
 * Builds a FetchGroup by adding fetch clauses.
@@ -23,85 +23,73 @@ import javax.annotation.Nonnull;
 *
 * }</pre>
 */
+@NonNullApi
 public interface FetchGroupBuilder<T> {

  /**
   * Specify specific properties to select (top level properties).
   */
-  @Nonnull
  FetchGroupBuilder<T> select(String select);

  /**
   * Fetch all the properties at the given path.
   */
-  @Nonnull
  FetchGroupBuilder<T> fetch(String path);

  /**
   * Fetch the path with the nested fetch group.
   */
-  @Nonnull
  FetchGroupBuilder<T> fetch(String path, FetchGroup<?> nestedGroup);

  /**
   * Fetch the path using a query join with the nested fetch group.
   */
-  @Nonnull
  FetchGroupBuilder<T> fetchQuery(String path, FetchGroup<?> nestedGroup);

  /**
   * Fetch the path lazily with the nested fetch group.
   */
-  @Nonnull
  FetchGroupBuilder<T> fetchLazy(String path, FetchGroup<?> nestedGroup);

  /**
   * Fetch the path including specified properties.
   */
-  @Nonnull
  FetchGroupBuilder<T> fetch(String path, String properties);

  /**
   * Fetch the path including all its properties using a query join.
   */
-  @Nonnull
  FetchGroupBuilder<T> fetchQuery(String path);

  /**
   * Fetch the path including all its properties using L2 cache.
   * Cache misses fallback to fetchQuery().
   */
-  @Nonnull
  FetchGroupBuilder<T> fetchCache(String path);

  /**
   * Fetch the path including specified properties using a query join.
   */
-  @Nonnull
  FetchGroupBuilder<T> fetchQuery(String path, String properties);

  /**
   * Fetch the path including specified properties using L2 cache.
   * Cache misses fallback to fetchQuery().
   */
-  @Nonnull
  FetchGroupBuilder<T> fetchCache(String path, String properties);

  /**
   * Fetch the path including all its properties lazily.
   */
-  @Nonnull
  FetchGroupBuilder<T> fetchLazy(String path);

  /**
   * Fetch the path including specified properties lazily.
   */
-  @Nonnull
  FetchGroupBuilder<T> fetchLazy(String path, String properties);

  /**
   * Build and return the FetchGroup.
   */
-  @Nonnull
  FetchGroup<T> build();
 }
@@ -1,5 +1,7 @@
 package io.ebean;

+import io.avaje.lang.NonNullApi;
+
 import java.util.List;
 import java.util.Set;

@@ -77,6 +79,7 @@ import java.util.Set;
 *
 * @param <T> the entity bean type
 */
+@NonNullApi
 public interface Filter<T> {

  /**
@@ -1,7 +1,7 @@
 package io.ebean;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import java.util.List;

 /**
@@ -55,6 +55,7 @@ import java.util.List;
 * }</pre>
 *
 */
+@NonNullApi
 public class Finder<I, T> {

  /**
@@ -139,7 +140,6 @@ public class Finder<I, T> {
   * <p>
   * Equivalent to {@link Database#reference(Class, Object)}
   */
-  @Nonnull
  public T ref(I id) {
    return db().reference(type, id);
  }
@@ -166,7 +166,6 @@ public class Finder<I, T> {
  /**
   * Retrieves all entities of the given type.
   */
-  @Nonnull
  public List<T> all() {
    return query().findList();
  }
@@ -113,9 +113,9 @@ public interface Junction<T> extends Expression, ExpressionList<T> {
     */
    SHOULD("should", "", true);

-    private String prefix;
-    private String literal;
-    private boolean text;
+    private final String prefix;
+    private final String literal;
+    private final boolean text;

    Type(String literal, String prefix, boolean text) {
      this.literal = literal;
@@ -1,6 +1,5 @@
 package io.ebean;

-import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.concurrent.Future;

@@ -116,13 +115,11 @@ public interface PagedList<T> {
   *
   * }</pre>
   */
-  @Nonnull
  Future<Integer> getFutureCount();

  /**
   * Return the list of entities for this page.
   */
-  @Nonnull
  List<T> getList();

  /**
@@ -1,7 +1,7 @@
 package io.ebean;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import javax.persistence.NonUniqueResultException;
 import java.sql.Connection;
 import java.sql.Timestamp;
@@ -177,6 +177,7 @@ import java.util.stream.Stream;
 *
 * @param <T> the type of Entity bean this query will fetch.
 */
+@NonNullApi
 public interface Query<T> extends CancelableQuery {

  /**
@@ -689,7 +690,6 @@ public interface Query<T> extends CancelableQuery {
   * This query will execute against the Database that was used to create it.
   * </p>
   */
-  @Nonnull
  <A> List<A> findIds();

  /**
@@ -727,7 +727,6 @@ public interface Query<T> extends CancelableQuery {
   *
   * }</pre>
   */
-  @Nonnull
  QueryIterator<T> findIterate();

  /**
@@ -749,7 +748,6 @@ public interface Query<T> extends CancelableQuery {
   *
   * }</pre>
   */
-  @Nonnull
  Stream<T> findStream();

  /**
@@ -772,7 +770,6 @@ public interface Query<T> extends CancelableQuery {
   *
   * }</pre>
   */
-  @Nonnull
  @Deprecated
  Stream<T> findLargeStream();

@@ -882,7 +879,6 @@ public interface Query<T> extends CancelableQuery {
   *
   * }</pre>
   */
-  @Nonnull
  List<T> findList();

  /**
@@ -898,7 +894,6 @@ public interface Query<T> extends CancelableQuery {
   *
   * }</pre>
   */
-  @Nonnull
  Set<T> findSet();

  /**
@@ -918,7 +913,6 @@ public interface Query<T> extends CancelableQuery {
   *
   * }</pre>
   */
-  @Nonnull
  <K> Map<K, T> findMap();

  /**
@@ -951,7 +945,6 @@ public interface Query<T> extends CancelableQuery {
   *
   * @return the list of values for the selected property
   */
-  @Nonnull
  <A> List<A> findSingleAttributeList();

  /**
@@ -1049,7 +1042,6 @@ public interface Query<T> extends CancelableQuery {
  /**
   * Execute the query returning an optional bean.
   */
-  @Nonnull
  Optional<T> findOneOrEmpty();

  /**
@@ -1064,7 +1056,6 @@ public interface Query<T> extends CancelableQuery {
   * It will execute the query against the history returning the versions of the bean.
   * </p>
   */
-  @Nonnull
  List<Version<T>> findVersions();

  /**
@@ -1074,7 +1065,6 @@ public interface Query<T> extends CancelableQuery {
   * It will execute the query against the history returning the versions of the bean.
   * </p>
   */
-  @Nonnull
  List<Version<T>> findVersionsBetween(Timestamp start, Timestamp end);

  /**
@@ -1132,7 +1122,6 @@ public interface Query<T> extends CancelableQuery {
   *
   * @return a Future object for the row count query
   */
-  @Nonnull
  FutureRowCount<T> findFutureCount();

  /**
@@ -1145,7 +1134,6 @@ public interface Query<T> extends CancelableQuery {
   *
   * @return a Future object for the list of Id's
   */
-  @Nonnull
  FutureIds<T> findFutureIds();

  /**
@@ -1157,7 +1145,6 @@ public interface Query<T> extends CancelableQuery {
   *
   * @return a Future object for the list result of the query
   */
-  @Nonnull
  FutureList<T> findFutureList();

  /**
@@ -1187,7 +1174,6 @@ public interface Query<T> extends CancelableQuery {
   *
   * @return The PagedList
   */
-  @Nonnull
  PagedList<T> findPagedList();

  /**
@@ -1,7 +1,7 @@
 package io.ebean;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
@@ -37,12 +37,12 @@ import java.util.function.Predicate;
 *
 * }</pre>
 */
+@NonNullApi
 public interface SqlQuery extends Serializable, CancelableQuery {

  /**
   * Execute the query returning a list.
   */
-  @Nonnull
  List<SqlRow> findList();

  /**
@@ -119,7 +119,6 @@ public interface SqlQuery extends Serializable, CancelableQuery {
  /**
   * Execute the query returning an optional row.
   */
-  @Nonnull
  Optional<SqlRow> findOneOrEmpty();

  /**
@@ -354,6 +353,7 @@ public interface SqlQuery extends Serializable, CancelableQuery {
    /**
     * Return the single value.
     */
+    @Nullable
    T findOne();

    /**
@@ -1,5 +1,7 @@
 package io.ebean;

+import java.util.Collection;
+
 /**
 * A SqlUpdate for executing insert update or delete statements.
 * <p>
@@ -324,6 +326,13 @@ public interface SqlUpdate {
   */
  SqlUpdate setParameter(String name, Object param);

+  /**
+   * Bind the named multi-value array parameter which we would use with Postgres ANY.
+   * <p>
+   * For Postgres this binds an ARRAY rather than expands into multiple bind values.
+   */
+  SqlUpdate setArrayParameter(String name, Collection<?> values);
+
  /**
   * Set a named parameter that has a null value. Exactly the same as
   * {@link #setNullParameter(String, int)}.
@@ -9,11 +9,7 @@ import javax.persistence.PersistenceException;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;

@@ -1164,7 +1160,7 @@ public final class EntityBeanIntercept implements Serializable {
   */
  public Map<String, Exception> getLoadErrors() {
    if (loadErrors == null) {
-      return null;
+      return Collections.emptyMap();
    }
    Map<String, Exception> ret = null;
    int len = getPropertyLength();
@@ -60,21 +60,15 @@ public interface PersistenceContext {
  int size(Class<?> rootType);

  /**
-   * Return a copy of the Persistence context to use for large query iteration.
+   * Signalizes the PersistenceContext, the begin for large query iteration.
   */
-  PersistenceContext forIterate();
+  void beginIterate();

  /**
-   * Return a new Persistence context during iteration of large query result.
+   * Signalizes the PersistenceContext, the end for large query iteration.
   */
-  PersistenceContext forIterateReset();
-
-  /**
-   * Return true if the persistence context has grown and hit the 'reset limit'
-   * during large query iteration.
-   */
-  boolean resetLimit();
-
+  void endIterate();
+  
  /**
   * Wrapper on a bean to also indicate if a bean has been deleted.
   * <p>
@@ -1547,6 +1547,9 @@ public class DatabaseConfig {

  /**
   * Set to true if all DB column and table names should use quoted identifiers.
+   * <p>
+   * For Postgres pgjdbc version 42.3.0 should be used with datasource property
+   * <em>quoteReturningIdentifiers</em> set to <em>false</em> (refer #2303).
   */
  public void setAllQuotedIdentifiers(boolean allQuotedIdentifiers) {
    platformConfig.setAllQuotedIdentifiers(allQuotedIdentifiers);
@@ -117,6 +117,9 @@ public class PlatformConfig {

  /**
   * Set to true if all DB column and table names should use quoted identifiers.
+   * <p>
+   * For Postgres pgjdbc version 42.3.0 should be used with datasource property
+   * <em>quoteReturningIdentifiers</em> set to <em>false</em> (refer #2303).
   */
  public void setAllQuotedIdentifiers(boolean allQuotedIdentifiers) {
    this.allQuotedIdentifiers = allQuotedIdentifiers;
@@ -8,7 +8,6 @@ import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
 import io.ebean.event.BeanQueryAdapter;

-import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.List;
 import java.util.function.Consumer;
@@ -21,7 +20,6 @@ public interface BeanType<T> {
  /**
   * Return the short name of the bean type.
   */
-  @Nonnull
  String name();

  /**
@@ -35,7 +33,6 @@ public interface BeanType<T> {
  /**
   * Return the full name of the bean type.
   */
-  @Nonnull
  String fullName();

  /**
@@ -49,7 +46,6 @@ public interface BeanType<T> {
  /**
   * Return the class type this BeanDescriptor describes.
   */
-  @Nonnull
  Class<T> type();

  /**
@@ -76,7 +72,6 @@ public interface BeanType<T> {
  /**
   * Return all the properties for this bean type.
   */
-  @Nonnull
  Collection<? extends Property> allProperties();

  /**
@@ -1,7 +1,5 @@
 package io.ebean.plugin;

-import javax.annotation.Nonnull;
-
 /**
 * Property of a entity bean that can be read.
 */
@@ -10,7 +8,6 @@ public interface Property {
  /**
   * Return the name of the property.
   */
-  @Nonnull
  String name();

  /**
@@ -24,7 +21,6 @@ public interface Property {
  /**
   * Return the type of the property.
   */
-  @Nonnull
  Class<?> type();

  /**
@@ -20,7 +20,7 @@ public interface JsonBeanReader<T> {
  /**
   * Create a new reader taking the context from the existing one but using a new JsonParser.
   */
-  JsonBeanReader<T> forJson(JsonParser moreJson, boolean resetContext);
+  JsonBeanReader<T> forJson(JsonParser moreJson);

  /**
   * Add a bean explicitly to the persistence context.
@@ -2,6 +2,7 @@ package io.ebean.util;

 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -57,10 +58,8 @@ public class AnnotationUtil {

  private static <A extends Annotation> void typeGetAllCollect(Class<?> clazz, Class<A> annotationType, Set<A> result) {
    while (clazz != null && clazz != Object.class) {
-      final A val = clazz.getAnnotation(annotationType);
-      if (val != null) {
-        result.add(val);
-      }
+      final A[] annotations = clazz.getAnnotationsByType(annotationType);
+      Collections.addAll(result, annotations);
      clazz = clazz.getSuperclass();
    }
  }
@@ -0,0 +1,28 @@
+package io.ebean.util;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+
+import io.ebean.annotation.Formula;
+
+public class TestAnnotationUtil {
+
+  @Formula(select = "x")
+  @Formula(select = "y")
+  private static class TestObject {
+
+  }
+
+  @Test
+  public void testRepeatableAnnotation() {
+
+    Set<Formula> list = AnnotationUtil.typeGetAll(TestObject.class, Formula.class);
+    assertThat(list).hasSize(2);
+
+  }
+
+}
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.12.2</version>
+    <version>12.13.1</version>
  </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@

  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.12.2</tag>
+    <tag>ebean-parent-12.13.1</tag>
  </scm>

  <name>ebean autotune</name>
@@ -26,7 +26,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
      <scope>provided</scope>
    </dependency>

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>12.12.2-SNAPSHOT</version>
-  </parent>
-<!--  <parent>-->
-<!--    <groupId>org.avaje</groupId>-->
-<!--    <artifactId>java8-oss</artifactId>-->
-<!--    <version>2.2</version>-->
-<!--  </parent>-->
-
-  <scm>
-    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
-  </scm>
-
-  <name>ebean autotune</name>
-  <description>ebean automatic query tuning module</description>
-  <artifactId>ebean-autotune</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>12.12.2-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- needed for java 11+ -->
-    <dependency>
-      <groupId>org.glassfish.jaxb</groupId>
-      <artifactId>jaxb-runtime</artifactId>
-      <version>2.3.2</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>junit</artifactId>
-      <version>1.0</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.ebean.tile:enhancement:12.11.3</tile>
-            <tile>io.avaje.tile:moditech-module:1.0</tile>
-          </tiles>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-</project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.12.2</version>
+    <version>12.13.1</version>
  </parent>

  <name>ebean bom</name>
@@ -71,88 +71,88 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>12.12.2</version>
+        <version>12.13.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>12.12.2</version>
+        <version>12.13.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>12.12.2</version>
+        <version>12.13.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>12.12.2</version>
+        <version>12.13.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.12.2</version>
+        <version>12.13.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.12.2</version>
+        <version>12.13.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.12.2</version>
+        <version>12.13.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-autotune</artifactId>
-        <version>12.12.2</version>
+        <version>12.13.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>12.12.2</version>
+        <version>12.13.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>12.12.2</version>
+        <version>12.13.1</version>
        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.12.2</version>
+        <version>12.13.1</version>
        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>12.12.2</version>
+        <version>12.13.1</version>
        <scope>test</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>12.12.2</version>
+        <version>12.13.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>12.12.2</version>
+        <version>12.13.1</version>
      </dependency>

    </dependencies>
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>12.12.2-SNAPSHOT</version>
-  </parent>
-
-  <name>ebean bom</name>
-  <description>ebean bill of materials pom</description>
-  <artifactId>ebean-bom</artifactId>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-
-    <dependencies>
-
-      <!-- dependencies external to this ebean.git build -->
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-ddl-runner</artifactId>
-        <version>${ebean-ddl-runner.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-migration-auto</artifactId>
-        <version>${ebean-migration-auto.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-migration</artifactId>
-        <version>${ebean-migration.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-datasource-api</artifactId>
-        <version>${ebean-datasource.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-datasource</artifactId>
-        <version>${ebean-datasource.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-agent</artifactId>
-        <version>${ebean-agent.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-maven-plugin</artifactId>
-        <version>${ebean-maven-plugin.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-test-docker</artifactId>
-        <version>${ebean-test-docker.version}</version>
-      </dependency>
-
-      <!-- modules -->
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean</artifactId>
-        <version>12.12.2-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-api</artifactId>
-        <version>12.12.2-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-core</artifactId>
-        <version>12.12.2-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-core-type</artifactId>
-        <version>12.12.2-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.12.2-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.12.2-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.12.2-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-autotune</artifactId>
-        <version>12.12.2-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-querybean</artifactId>
-        <version>12.12.2-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>querybean-generator</artifactId>
-        <version>12.12.2-SNAPSHOT</version>
-        <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.12.2-SNAPSHOT</version>
-        <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-test</artifactId>
-        <version>12.12.2-SNAPSHOT</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-postgis</artifactId>
-        <version>12.12.2-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-redis</artifactId>
-        <version>12.12.2-SNAPSHOT</version>
-      </dependency>
-
-    </dependencies>
-
-  </dependencyManagement>
-
-</project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.12.2</version>
+    <version>12.13.1</version>
  </parent>

  <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
    </dependency>

    <dependency>
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>12.12.2-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>ebean-core-type</artifactId>
-  <name>ebean core type</name>
-  <description>ebean scalar types api</description>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>12.12.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
-      <optional>true</optional>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.avaje.tile:moditech-module:1.0</tile>
-          </tiles>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.12.2</version>
+    <version>12.13.1</version>
  </parent>

  <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@

  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.12.2</tag>
+    <tag>ebean-parent-12.13.1</tag>
  </scm>

  <dependencies>
@@ -41,19 +41,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
    </dependency>

    <dependency>
@@ -136,7 +136,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.2.20</version>
+      <version>42.2.24</version>
      <optional>true</optional>
    </dependency>

@@ -1,247 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>12.12.2-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>ebean-core</artifactId>
-  <packaging>jar</packaging>
-
-  <name>ebean core</name>
-  <description>ebean core module</description>
-  <url>https://ebean.io/</url>
-
-  <scm>
-    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
-  </scm>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-ddl-runner</artifactId>
-      <version>1.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>classpath-scanner</artifactId>
-      <version>6.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration-auto</artifactId>
-      <version>1.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>12.12.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core-type</artifactId>
-      <version>12.12.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.12.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4-runtime</artifactId>
-      <version>4.8-1</version>
-    </dependency>
-
-    <!--
-    Class retention Nonnull and Nullable annotations
-    to assist with IDE auto-completion with Ebean API
-    -->
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-jsr305-x</artifactId>
-      <version>1.1</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
-         and not require a separate module for it -->
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>1.4.199</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.transaction</groupId>
-      <artifactId>javax.transaction-api</artifactId>
-      <version>1.3</version>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- validation annotations Size etc -->
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-      <version>2.0.1.Final</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.validation</groupId>
-      <artifactId>jakarta.validation-api</artifactId>
-      <version>3.0.0</version>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>2.9.7</version>
-      <optional>true</optional>
-    </dependency>
-
-<!--    <dependency>-->
-<!--      <groupId>javax.annotation</groupId>-->
-<!--      <artifactId>javax.annotation-api</artifactId>-->
-<!--      <version>1.3.2</version>-->
-<!--      <optional>true</optional>-->
-<!--    </dependency>-->
-
-    <!-- Jackson core used internally by Ebean -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- Provided scope for Postgres JSON/JSONB support -->
-    <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <version>42.2.20</version>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- Test scope -->
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>junit</artifactId>
-      <version>1.0</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-
-      <plugin>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-maven-plugin</artifactId>
-        <version>${ebean-maven-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>process-test-classes</phase>
-            <configuration>
-              <transformArgs>debug=0</transformArgs>
-            </configuration>
-            <goals>
-              <goal>testEnhance</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M4</version>
-        <configuration>
-          <useSystemClassLoader>false</useSystemClassLoader>
-          <trimStackTrace>false</trimStackTrace>
-          <failIfNoTests>false</failIfNoTests>
-          <includes>
-            <include>**/Test*.java</include>
-            <include>**/*Test.java</include>
-            <include>**/*Tests.java</include>
-          </includes>
-          <systemProperties>
-            <property>
-              <!-- transfer datasource.default parameter -->
-              <name>datasource.default</name>
-              <value>${datasource.default}</value>
-            </property>
-            <property>
-              <!-- transfer dbClockDelta parameter -->
-              <name>dbClockDelta</name>
-              <value>${dbClockDelta}</value>
-            </property>
-          </systemProperties>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.1.1</version>
-        <configuration>
-          <doctitle>Ebean 12</doctitle>
-          <overview>src/main/java/io/ebean/overview.html</overview>
-          <excludePackageNames>io.ebeaninternal.*:io.ebeanservice:io.ebean.common:io.ebean.bean:io.ebean.service:io.ebean.metric:io.ebean.util:io.ebean.config.properties:io.ebean.config.dbplatform</excludePackageNames>
-          <linksource>true</linksource>
-          <overview>src/main/java/com/avaje/ebean/overview.html</overview>
-        </configuration>
-        <executions>
-          <execution>
-            <id>attach-javadocs</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.avaje.tile:moditech-module:1.0</tile>
-          </tiles>
-        </configuration>
-      </plugin>
-
-    </plugins>
-
-  </build>
-
-</project>
@@ -223,6 +223,15 @@ public final class BindParams implements Serializable {
    return p;
  }

+  /**
+   * Set a named In parameter that is multi-valued.
+   */
+  public Param setArrayParameter(String name, Collection<?> value) {
+    Param p = getParam(name);
+    p.setInValue(new MultiValueWrapper(value));
+    return p;
+  }
+
  /**
   * Set an encryption key as a bind value.
   * <p>
@@ -36,14 +36,6 @@ public interface LoadContext {
   */
  PersistenceContext getPersistenceContext();

-  /**
-   * Set the persistence context used by this query and future lazy loading.
-   * <p>
-   * Used by query iterator when processing large result sets.
-   * </p>
-   */
-  void resetPersistenceContext(PersistenceContext persistenceContext);
-
  /**
   * Register a Bean for lazy loading.
   */
@@ -16,6 +16,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.query.CQuery;
 import io.ebeaninternal.server.transaction.RemoteTransactionEvent;

+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -141,7 +142,7 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer,
  /**
   * Compile a query.
   */
-  <T> CQuery<T> compileQuery(Type type, Query<T> query, Transaction t);
+  <T> CQuery<T> compileQuery(Type type, Query<T> query, Transaction transaction);

  /**
   * Execute the findId's query but without copying the query.
@@ -150,12 +151,12 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer,
   * the query has finished (if executing in a background thread).
   * </p>
   */
-  <A, T> List<A> findIdsWithCopy(Query<T> query, Transaction t);
+  <A, T> List<A> findIdsWithCopy(Query<T> query, Transaction transaction);

  /**
   * Execute the findCount query but without copying the query.
   */
-  <T> int findCountWithCopy(Query<T> query, Transaction t);
+  <T> int findCountWithCopy(Query<T> query, Transaction transaction);

  /**
   * Load a batch of Associated One Beans.
@@ -257,6 +258,7 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer,
  /**
   * DTO findOne query.
   */
+  @Nullable
  <T> T findDtoOne(SpiDtoQuery<T> query);

  /**
@@ -24,6 +24,7 @@ import io.ebeaninternal.server.querydefn.OrmUpdateProperties;
 import io.ebeaninternal.server.rawsql.SpiRawSql;

 import java.sql.Timestamp;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;

@@ -399,6 +400,11 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod

  List<String> getSoftDeletePredicates();

+  /**
+   * Bind the named multi-value array parameter which we would use with Postgres ANY.
+   */
+  void setArrayParameter(String name, Collection<?> values);
+
  /**
   * Return a copy of the query.
   */
@@ -14,7 +14,7 @@ public interface SpiJsonReader {

  PersistenceContext getPersistenceContext();

-  SpiJsonReader forJson(JsonParser moreJson, boolean resetContext);
+  SpiJsonReader forJson(JsonParser moreJson);

  <T> void persistenceContextPut(Object beanId, T currentBean);

@@ -331,6 +331,12 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
    return this;
  }

+  @Override
+  public SqlUpdate setArrayParameter(String name, Collection<?> values) {
+    bindParams.setArrayParameter(name, values);
+    return this;
+  }
+
  @Override
  public SqlUpdate setNull(String name, int jdbcType) {
    bindParams.setNullParameter(name, jdbcType);
@@ -2,7 +2,6 @@ package io.ebeaninternal.server.core;

 import io.ebean.*;
 import io.ebean.bean.BeanCollection;
-import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.cache.QueryCacheEntry;
 import io.ebean.common.BeanList;
@@ -37,7 +36,6 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
  private final Boolean readOnly;
  private LoadContext loadContext;
  private PersistenceContext persistenceContext;
-  private JsonReadOptions jsonRead;
  private HashQuery cacheKey;
  private CQueryPlanKey queryPlanKey;
  private SpiQuerySecondary secondaryQueries;
@@ -225,6 +223,9 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
      createdTransaction = true;
    }
    persistenceContext = persistenceContext(query, transaction);
+    if (Type.ITERATE == query.getType()) {
+      persistenceContext.beginIterate();
+    }
    loadContext = new DLoadContext(this, secondaryQueries);
  }

@@ -233,6 +234,9 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   */
  @Override
  public void rollbackTransIfRequired() {
+    if (Type.ITERATE == query.getType()) {
+      persistenceContext.endIterate();
+    }
    if (createdTransaction) {
      try {
        transaction.end();
@@ -254,7 +258,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    if (query.getPersistenceContext() == null) {
      query.setPersistenceContext(persistenceContext);
    }
-    jsonRead = new JsonReadOptions();
+    JsonReadOptions jsonRead = new JsonReadOptions();
    jsonRead.setPersistenceContext(persistenceContext);
    if (!query.isDisableLazyLoading()) {
      loadContext = new DLoadContext(this, secondaryQueries);
@@ -263,20 +267,6 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    return jsonRead;
  }

-  /**
-   * For iterate queries reset the persistenceContext and loadContext.
-   */
-  public void flushPersistenceContextOnIterate() {
-    if (persistenceContext.resetLimit()) {
-      persistenceContext = persistenceContext.forIterateReset();
-      loadContext.resetPersistenceContext(persistenceContext);
-      if (jsonRead != null) {
-        jsonRead.setPersistenceContext(persistenceContext);
-        jsonRead.setLoadContext(loadContext);
-      }
-    }
-  }
-
  /**
   * Get the TransactionContext either explicitly set on the query or
   * transaction scoped.
@@ -292,11 +282,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    if (scope == PersistenceContextScope.QUERY || t == null) {
      return new DefaultPersistenceContext();
    }
-    if (Type.ITERATE == query.getType()) {
-      return t.getPersistenceContext().forIterate();
-    } else {
-      return t.getPersistenceContext();
-    }
+    return t.getPersistenceContext();
  }

  /**
@@ -306,6 +292,9 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   */
  @Override
  public void endTransIfRequired() {
+    if (Type.ITERATE == query.getType()) {
+      persistenceContext.endIterate();
+    }
    if (createdTransaction && transaction.isActive()) {
      transaction.commit();
      if (query.getType().isUpdate()) {
@@ -544,7 +533,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery

  @SuppressWarnings({"rawtypes"})
  private void mergeCacheHitsToMap(BeanCollection<T> result) {
-    BeanMap map = (BeanMap)result;
+    BeanMap map = (BeanMap) result;
    ElPropertyValue property = mapProperty();
    for (T bean : cacheBeans) {
      map.internalPut(property.pathGet(bean), bean);
@@ -572,17 +561,18 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
  @SuppressWarnings("unchecked")
  private <K> Map<K, T> cacheBeansToMap() {
    ElPropertyValue property = mapProperty();
-    Map<K,T> map = new LinkedHashMap<>();
+    Map<K, T> map = new LinkedHashMap<>();
    for (T bean : cacheBeans) {
-      map.put((K)property.pathGet(bean), bean);
+      map.put((K) property.pathGet(bean), bean);
    }
    return map;
  }

  private ElPropertyValue mapProperty() {
-    ElPropertyValue property = beanDescriptor.elGetValue(query.getMapKey());
+    final String key = query.getMapKey();
+    final ElPropertyValue property = key == null ? beanDescriptor.idProperty() : beanDescriptor.elGetValue(key);
    if (property == null) {
-      throw new IllegalStateException("Unknown map key property "+query.getMapKey());
+      throw new IllegalStateException("Unknown map key property " + key);
    }
    return property;
  }
@@ -644,7 +634,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    if (cached != null && isAuditReads() && readAuditQueryType()) {
      if (cached instanceof BeanCollection) {
        // raw sql can't use L2 cache so normal queries only in here
-        Collection<T> actualDetails = ((BeanCollection<T>)cached).getActualDetails();
+        Collection<T> actualDetails = ((BeanCollection<T>) cached).getActualDetails();
        List<Object> ids = new ArrayList<>(actualDetails.size());
        for (T bean : actualDetails) {
          ids.add(beanDescriptor.idForJson(bean));
@@ -655,13 +645,13 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    if (Boolean.FALSE.equals(query.isReadOnly())) {
      // return shallow copies if readonly is explicitly set to false
      if (cached instanceof BeanCollection) {
-        cached = ((BeanCollection<?>)cached).getShallowCopy();
+        cached = ((BeanCollection<?>) cached).getShallowCopy();
      } else if (cached instanceof List) {
-        cached = new CopyOnFirstWriteList<>((List<?>)cached);
+        cached = new CopyOnFirstWriteList<>((List<?>) cached);
      } else if (cached instanceof Set) {
-        cached = new LinkedHashSet<>((Set<?>)cached);
+        cached = new LinkedHashSet<>((Set<?>) cached);
      } else if (cached instanceof Map) {
-        cached = new LinkedHashMap<>((Map<?,?>)cached);
+        cached = new LinkedHashMap<>((Map<?, ?>) cached);
      }
    }
    return cached;
@@ -31,7 +31,12 @@ final class AssocOneHelpRefInherit extends AssocOneHelp {
  Object read(DbReadContext ctx) throws SQLException {
    // read discriminator to determine the type
    InheritInfo rowInheritInfo = inherit.readType(ctx);
-    if (rowInheritInfo == null) {
+    BeanDescriptor<?> desc;
+    if (rowInheritInfo != null) {
+      desc = rowInheritInfo.desc();
+    } else if (!inherit.hasChildren()) {
+      desc = inherit.desc();
+    } else {
      // ignore the id property
      property.targetIdBinder.loadIgnore(ctx);
      return null;
@@ -42,7 +47,6 @@ final class AssocOneHelpRefInherit extends AssocOneHelp {
    }
    // check transaction context to see if it already exists
    PersistenceContext pc = ctx.getPersistenceContext();
-    BeanDescriptor<?> desc = rowInheritInfo.desc();
    Object existing = desc.contextGet(pc, id);
    if (existing != null) {
      return existing;
@@ -56,7 +56,6 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
 import io.ebeanservice.docstore.api.mapping.DocumentMapping;
 import org.slf4j.Logger;

-import javax.annotation.Nonnull;
 import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.io.StringWriter;
@@ -209,6 +208,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
  private final EntityBean prototypeEntityBean;

  private final IdBinder idBinder;
+  private final String idSelect;
  private String idBinderInLHSSql;
  private String idBinderIdSql;
  private String deleteByIdSql;
@@ -350,6 +350,23 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
        propertiesIndex[i] = propMap.get(ebi.getProperty(i));
      }
    }
+    idSelect = initIdSelect();
+  }
+
+  String initIdSelect() {
+    if (idProperty != null && !idProperty.name().equals("_idClass")) {
+      return idProperty.name();
+    } else if (entityType == EntityType.EMBEDDED) {
+      return null;
+    } else {
+      StringJoiner sj = new StringJoiner(",");
+      for (BeanProperty prop : propertiesNonMany) {
+        if (prop.isImportedPrimaryKey()) {
+          sj.add(prop.name());
+        }
+      }
+      return sj.toString().intern();
+    }
  }

  public boolean isJacksonCorePresent() {
@@ -1961,7 +1978,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   * Return the class type this BeanDescriptor describes.
   */
  @Override
-  @Nonnull
  public Class<T> type() {
    return beanType;
  }
@@ -1973,7 +1989,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   * instead.
   */
  @Override
-  @Nonnull
  public String fullName() {
    return fullName;
  }
@@ -1982,7 +1997,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   * Return the short name of the entity bean.
   */
  @Override
-  @Nonnull
  public String name() {
    return name;
  }
@@ -2936,7 +2950,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
  }

  @Override
-  @Nonnull
  public Collection<? extends Property> allProperties() {
    return propertiesAll();
  }
@@ -3016,6 +3029,10 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
    return idProperty;
  }

+  public String idSelect() {
+    return idSelect;
+  }
+
  /**
   * Return true if this bean should be inserted rather than updated.
   *
@@ -3060,6 +3077,12 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
    return versionPropertyIndex > -1 && ebi.isLoadedProperty(versionPropertyIndex);
  }

+  void setReferenceIfIdOnly(EntityBeanIntercept ebi) {
+    if (referenceIdPropertyOnly(ebi)) {
+      ebi.setReference(idPropertyIndex);
+    }
+  }
+
  /**
   * Set the version value returning it in primitive long form.
   */
@@ -23,6 +23,11 @@ abstract class BeanDescriptorElement<T> extends BeanDescriptor<T> {
    this.elementHelp = elementHelp;
  }

+  @Override
+  String initIdSelect() {
+    return null;
+  }
+
  private String shortName(String name) {
    int pos = name.lastIndexOf('.');
    if (pos > 1) {
@@ -90,7 +90,7 @@ final class BeanDescriptorJsonHelp<T> {
      return null;
    }
    JsonParser newParser = node.traverse();
-    SpiJsonReader newReader = jsonRead.forJson(newParser, false);
+    SpiJsonReader newReader = jsonRead.forJson(newParser);

    // check for the discriminator value to determine the correct sub type
    String discColumn = inheritInfo.getRoot().getDiscriminatorColumn();
@@ -152,6 +152,9 @@ final class BeanDescriptorJsonHelp<T> {
    }
    if (contextBean == null) {
      readJson.beanVisitor(bean, unmappedProperties);
+      if (!isNullOrZero(id)) {
+        desc.setReferenceIfIdOnly(bean._ebean_getIntercept());
+      }
    }
    if (path != null) {
      readJson.popPath();
@@ -349,10 +349,10 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
          builder = RawSqlBuilder.unparsed(sql.getQuery());
        }

-        for (Map.Entry<String,String> columnMapping : sql.getColumnMapping().entrySet()) {
+        for (Map.Entry<String, String> columnMapping : sql.getColumnMapping().entrySet()) {
          builder.columnMapping(columnMapping.getKey(), columnMapping.getValue());
        }
-        for (Map.Entry<String,String> aliasMapping : sql.getAliasMapping().entrySet()) {
+        for (Map.Entry<String, String> aliasMapping : sql.getAliasMapping().entrySet()) {
          builder.tableAliasMapping(aliasMapping.getKey(), aliasMapping.getValue());
        }
        info.addRawSql(sql.getName(), builder.create());
@@ -410,7 +410,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
  @Override
  public boolean isTableManaged(String tableName) {
    return tableToDescMap.get(tableName.toLowerCase()) != null
-        || tableToViewDescMap.get(tableName.toLowerCase()) != null;
+      || tableToViewDescMap.get(tableName.toLowerCase()) != null;
  }

  /**
@@ -618,7 +618,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
      DeployBeanInfo<?> info = createDeployBeanInfo(entityClass);
      deployInfoMap.put(entityClass, info);
      Class<?> embeddedIdType = info.getEmbeddedIdType();
-      if (embeddedIdType != null){
+      if (embeddedIdType != null) {
        embeddedIdTypes.add(embeddedIdType);
      }
    }
@@ -788,8 +788,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    Class<?> targetType = prop.getTargetType();
    DeployBeanInfo<?> info = deployInfoMap.get(targetType);
    if (info == null) {
-      String msg = "Can not find descriptor [" + targetType + "] for " + prop.getFullBeanName();
-      throw new PersistenceException(msg);
+      throw new PersistenceException("Can not find descriptor [" + targetType + "] for " + prop.getFullBeanName());
    }
    return info.getDescriptor();
  }
@@ -901,21 +900,17 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    Class<?> owningType = oneToMany.getOwningType();
    if (!oneToMany.getCascadeInfo().isSave()) {
      // The property MUST have persist cascading so that inserts work.
-
      Class<?> targetType = oneToMany.getTargetType();
      String msg = "Error on " + oneToMany.getFullBeanName() + ". @OneToMany MUST have ";
      msg += "Cascade.PERSIST or Cascade.ALL because this is a unidirectional ";
      msg += "relationship. That is, there is no property of type " + owningType + " on " + targetType;
-
      throw new PersistenceException(msg);
    }

    // mark this property as unidirectional
    oneToMany.setUnidirectional();
-
    // specify table and table alias...
    BeanTable beanTable = beanTable(owningType);
-
    // define the TableJoin
    DeployTableJoin oneToManyJoin = oneToMany.getTableJoin();
    if (!oneToManyJoin.hasJoinColumns()) {
@@ -951,27 +946,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    String mappedBy = prop.getMappedBy();
    // get the mappedBy property
    DeployBeanDescriptor<?> targetDesc = targetDescriptor(prop);
-    DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
-    if (mappedProp == null) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += "  Can not find mappedBy property [" + targetDesc + "." + mappedBy + "] ";
-      throw new PersistenceException(m);
-    }
-
-    if (!(mappedProp instanceof DeployBeanPropertyAssocOne<?>)) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += ". mappedBy property [" + targetDesc + "." + mappedBy + "]is not a OneToOne?";
-      throw new PersistenceException(m);
-    }
-
-    DeployBeanPropertyAssocOne<?> mappedAssocOne = (DeployBeanPropertyAssocOne<?>) mappedProp;
-
-    if (!mappedAssocOne.isOneToOne()) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += ". mappedBy property [" + targetDesc + "." + mappedBy + "]is not a OneToOne?";
-      throw new PersistenceException(m);
-    }
-
+    DeployBeanPropertyAssocOne<?> mappedAssocOne = mappedOneToOne(prop, mappedBy, targetDesc);
    DeployTableJoin tableJoin = prop.getTableJoin();
    if (!tableJoin.hasJoinColumns()) {
      // define Join as the inverse of the mappedBy property
@@ -987,6 +962,21 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    }
  }

+  private DeployBeanPropertyAssocOne<?> mappedOneToOne(DeployBeanPropertyAssocOne<?> prop, String mappedBy, DeployBeanDescriptor<?> targetDesc) {
+    DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
+    if (mappedProp == null) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + " Can not find mappedBy property [" + targetDesc + "." + mappedBy + "]");
+    }
+    if (!(mappedProp instanceof DeployBeanPropertyAssocOne<?>)) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "]is not a OneToOne?");
+    }
+    DeployBeanPropertyAssocOne<?> mappedAssocOne = (DeployBeanPropertyAssocOne<?>) mappedProp;
+    if (!mappedAssocOne.isOneToOne()) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "]is not a OneToOne?");
+    }
+    return mappedAssocOne;
+  }
+
  private void checkUniDirectionalPrimaryKeyJoin(DeployBeanPropertyAssocOne<?> prop) {
    if (prop.isPrimaryKeyJoin()) {
      // uni-directional PrimaryKeyJoin ...
@@ -1008,7 +998,6 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
      return;
    }
    DeployBeanDescriptor<?> targetDesc = targetDescriptor(prop);
-
    if (targetDesc.isDraftableElement()) {
      // automatically turning on orphan removal and CascadeType.ALL
      prop.setModifyListenMode(BeanCollection.ModifyListenMode.REMOVALS);
@@ -1040,23 +1029,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    String mappedBy = prop.getMappedBy();

    // get the mappedBy property
-    DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
-    if (mappedProp == null) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += "  Can not find mappedBy property [" + mappedBy + "] ";
-      m += "in [" + targetDesc + "]";
-      throw new PersistenceException(m);
-    }
-
-    if (!(mappedProp instanceof DeployBeanPropertyAssocOne<?>)) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += ". mappedBy property [" + mappedBy + "]is not a ManyToOne?";
-      m += "in [" + targetDesc + "]";
-      throw new PersistenceException(m);
-    }
-
-    DeployBeanPropertyAssocOne<?> mappedAssocOne = (DeployBeanPropertyAssocOne<?>) mappedProp;
-
+    DeployBeanPropertyAssocOne<?> mappedAssocOne = mappedManyToOne(prop, targetDesc, mappedBy);
    DeployTableJoin tableJoin = prop.getTableJoin();
    if (!tableJoin.hasJoinColumns()) {
      // define Join as the inverse of the mappedBy property
@@ -1079,6 +1052,17 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    }
  }

+  private DeployBeanPropertyAssocOne<?> mappedManyToOne(DeployBeanPropertyAssocMany<?> prop, DeployBeanDescriptor<?> targetDesc, String mappedBy) {
+    DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
+    if (mappedProp == null) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + "  Can not find mappedBy property [" + mappedBy + "] " + "in [" + targetDesc + "]");
+    }
+    if (!(mappedProp instanceof DeployBeanPropertyAssocOne<?>)) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + mappedBy + "]is not a ManyToOne?" + "in [" + targetDesc + "]");
+    }
+    return (DeployBeanPropertyAssocOne<?>) mappedProp;
+  }
+
  /**
   * For mappedBy copy the joins from the other side.
   */
@@ -1094,33 +1078,10 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy

    // get the mappedBy property
    DeployBeanDescriptor<?> targetDesc = targetDescriptor(prop);
-    DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
-
-    if (mappedProp == null) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += "  Can not find mappedBy property [" + mappedBy + "] ";
-      m += "in [" + targetDesc + "]";
-      throw new PersistenceException(m);
-    }
-
-    if (!(mappedProp instanceof DeployBeanPropertyAssocMany<?>)) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += ". mappedBy property [" + targetDesc + "." + mappedBy + "] is not a ManyToMany?";
-      throw new PersistenceException(m);
-    }
-
-    DeployBeanPropertyAssocMany<?> mappedAssocMany = (DeployBeanPropertyAssocMany<?>) mappedProp;
-
-    if (!mappedAssocMany.isManyToMany()) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += ". mappedBy property [" + targetDesc + "." + mappedBy + "] is not a ManyToMany?";
-      throw new PersistenceException(m);
-    }
+    DeployBeanPropertyAssocMany<?> mappedAssocMany = mappedManyToMany(prop, mappedBy, targetDesc);

    // define the relationships/joins on this side as the
    // reverse of the other mappedBy side ...
-
-    // DeployTableJoin mappedJoin = mappedAssocMany.getTableJoin();
    DeployTableJoin mappedIntJoin = mappedAssocMany.getIntersectionJoin();
    DeployTableJoin mappendInverseJoin = mappedAssocMany.getInverseJoin();

@@ -1142,6 +1103,22 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    }
  }

+  private DeployBeanPropertyAssocMany<?> mappedManyToMany(DeployBeanPropertyAssocMany<?> prop, String mappedBy, DeployBeanDescriptor<?> targetDesc) {
+    DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
+    if (mappedProp == null) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + "  Can not find mappedBy property [" + mappedBy + "] " + "in [" + targetDesc + "]");
+    }
+    if (!(mappedProp instanceof DeployBeanPropertyAssocMany<?>)) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "] is not a ManyToMany?");
+    }
+
+    DeployBeanPropertyAssocMany<?> mappedAssocMany = (DeployBeanPropertyAssocMany<?>) mappedProp;
+    if (!mappedAssocMany.isManyToMany()) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "] is not a ManyToMany?");
+    }
+    return mappedAssocMany;
+  }
+
  private <T> void setBeanControllerFinderListener(DeployBeanDescriptor<T> descriptor) {
    persistControllerManager.addPersistControllers(descriptor);
    postLoadManager.addPostLoad(descriptor);
@@ -40,7 +40,6 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
 import io.ebeanservice.docstore.api.mapping.DocPropertyOptions;
 import io.ebeanservice.docstore.api.support.DocStructure;

-import javax.annotation.Nonnull;
 import javax.persistence.PersistenceException;
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -813,7 +812,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   * Return the name of the property.
   */
  @Override
-  @Nonnull
  public String name() {
    return name;
  }
@@ -1299,7 +1297,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   * Return the property type.
   */
  @Override
-  @Nonnull
  public Class<?> type() {
    return propertyType;
  }
@@ -35,8 +35,7 @@ public final class ImportedIdEmbedded implements ImportedId {
    BeanProperty[] embeddedProps = foreignAssocOne.properties();
    for (int i = 0; i < imported.length; i++) {
      String n = name + "." + foreignAssocOne.name() + "." + embeddedProps[i].name();
-      BeanFkeyProperty fkey = new BeanFkeyProperty(n, imported[i].localDbColumn, foreignAssocOne.deployOrder());
-      owner.descriptor().add(fkey);
+      owner.descriptor().add(new BeanFkeyProperty(n, imported[i].localDbColumn, foreignAssocOne.deployOrder()));
    }
  }

@@ -88,8 +88,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId

  @Override
  public void addFkeys(String name) {
-    BeanFkeyProperty fkey = new BeanFkeyProperty(name + "." + foreignProperty.name(), localDbColumn, owner.deployOrder());
-    owner.descriptor().add(fkey);
+    owner.descriptor().add(new BeanFkeyProperty(name + "." + foreignProperty.name(), localDbColumn, owner.deployOrder()));
  }

  @Override
@@ -5,7 +5,6 @@ import io.ebean.annotation.*;
 import io.ebean.core.type.ScalarType;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.api.CoreLog;
-import io.ebeaninternal.server.deploy.DetermineManyType;
 import io.ebeaninternal.server.deploy.ManyType;
 import io.ebeaninternal.server.deploy.meta.*;
 import io.ebeaninternal.server.type.TypeManager;
@@ -172,7 +172,7 @@ public final class DeployUtil {
   */
  void setDbArray(DeployBeanProperty prop, DbArray dbArray) {
    Class<?> type = prop.getPropertyType();
-    ScalarType<?> scalarType = typeManager.getArrayScalarType(type, dbArray, prop.getGenericType(), prop.isNullable());
+    ScalarType<?> scalarType = typeManager.getArrayScalarType(type, prop.getGenericType(), prop.isNullable());
    if (scalarType == null) {
      throw new RuntimeException("No ScalarType for @DbArray type for [" + prop.getFullBeanName() + "]");
    }
@@ -1,4 +1,6 @@
-package io.ebeaninternal.server.deploy;
+package io.ebeaninternal.server.deploy.parse;
+
+import io.ebeaninternal.server.deploy.ManyType;

 import java.util.List;
 import java.util.Map;
@@ -7,9 +9,9 @@ import java.util.Set;
 /**
 * Determine the Many Type for a property.
 */
-public final class DetermineManyType {
+final class DetermineManyType {

-  public ManyType getManyType(Class<?> type) {
+  ManyType getManyType(Class<?> type) {
    if (type.equals(List.class)) {
      return ManyType.LIST;
    }
@@ -37,8 +37,7 @@ final class DtoMetaBuilder {
      if (includeMethod(method)) {
        try {
          final String name = propertyName(method.getName());
-          final Class<?> propertyType = propertyType(method);
-          properties.add(new DtoMetaProperty(typeManager, dtoType, method, name, propertyType));
+          properties.add(new DtoMetaProperty(typeManager, dtoType, method, name));
        } catch (Exception e) {
          CoreLog.log.debug("exclude on " + dtoType + " method " + method, e);
        }
@@ -46,10 +45,6 @@ final class DtoMetaBuilder {
    }
  }

-  static Class<?> propertyType(Method method) {
-    return method.getParameterTypes()[0];
-  }
-
  static String propertyName(String methodName) {
    final String name = methodName.substring(3);
    return Character.toLowerCase(name.charAt(0)) + name.substring(1);
@@ -8,6 +8,7 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 import java.sql.SQLException;

 final class DtoMetaProperty implements DtoReadSet {
@@ -19,18 +20,30 @@ final class DtoMetaProperty implements DtoReadSet {
  private final MethodHandle setter;
  private final ScalarType<?> scalarType;

-  DtoMetaProperty(TypeManager typeManager, Class<?> dtoType, Method writeMethod, String name, Class<?> propertyType) throws IllegalAccessException, NoSuchMethodException {
+  DtoMetaProperty(TypeManager typeManager, Class<?> dtoType, Method writeMethod, String name) throws IllegalAccessException, NoSuchMethodException {
    this.dtoType = dtoType;
    this.name = name;
    if (writeMethod != null) {
-      this.setter = LOOKUP.findVirtual(dtoType, writeMethod.getName(), MethodType.methodType(void.class, propertyType));
-      this.scalarType = typeManager.getScalarType(propertyType);
+      this.setter = lookupMethodHandle(dtoType, writeMethod);
+      this.scalarType = typeManager.getScalarType(propertyType(writeMethod), propertyClass(writeMethod));
    } else {
      this.scalarType = null;
      this.setter = null;
    }
  }

+  private static MethodHandle lookupMethodHandle(Class<?> dtoType, Method method) throws NoSuchMethodException, IllegalAccessException {
+    return LOOKUP.findVirtual(dtoType, method.getName(), MethodType.methodType(method.getReturnType(), method.getParameterTypes()));
+  }
+
+  static Type propertyType(Method method) {
+    return method.getParameters()[0].getParameterizedType();
+  }
+
+  static Class<?> propertyClass(Method method) {
+    return method.getParameterTypes()[0];
+  }
+
  String getName() {
    return name;
  }
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.el;

+import io.avaje.lang.NonNullApi;
 import io.ebean.Filter;
 import io.ebeaninternal.server.deploy.BeanDescriptor;

@@ -11,6 +12,7 @@ import java.util.regex.Pattern;
 /**
 * Default implementation of the Filter interface.
 */
+@NonNullApi
 public final class ElFilter<T> implements Filter<T> {

  private final BeanDescriptor<T> beanDescriptor;
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.executor;

+import io.avaje.lang.NonNullApi;
 import io.ebeaninternal.api.SpiBackgroundExecutor;
 import org.slf4j.MDC;

@@ -13,6 +14,7 @@ import java.util.concurrent.TimeUnit;
 /**
 * The default implementation of the BackgroundExecutor.
 */
+@NonNullApi
 public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor {

  private final ScheduledExecutorService executor;
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.expression;

+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import io.ebean.CacheMode;
 import io.ebean.CountDistinctOrder;
 import io.ebean.DtoQuery;
@@ -51,6 +53,7 @@ import java.util.function.Predicate;
 /**
 * Default implementation of ExpressionList.
 */
+@NonNullApi
 public class DefaultExpressionList<T> implements SpiExpressionList<T> {

  private static final String AND = " and ";
@@ -469,6 +472,7 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
    return query.exists();
  }

+  @Nullable
  @Override
  public T findOne() {
    return query.findOne();
@@ -1,23 +1,15 @@
 package io.ebeaninternal.server.expression;

-import io.ebean.ExpressionFactory;
-import io.ebean.ExpressionList;
-import io.ebean.FutureIds;
-import io.ebean.FutureList;
-import io.ebean.FutureRowCount;
-import io.ebean.Junction;
-import io.ebean.OrderBy;
-import io.ebean.Query;
+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
+import io.ebean.*;
 import io.ebeaninternal.api.SpiExpressionList;
 import io.ebeaninternal.api.SpiQuery;

 import javax.persistence.PersistenceException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;

+@NonNullApi
 public final class FilterExpressionList<T> extends DefaultExpressionList<T> {

  private static final String notAllowedMessage = "This method is not allowed on a filter";
@@ -92,6 +84,7 @@ public final class FilterExpressionList<T> extends DefaultExpressionList<T> {
    return rootQuery.findSet();
  }

+  @Nullable
  @Override
  public T findOne() {
    return rootQuery.findOne();
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.expression;

+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import io.ebean.CacheMode;
 import io.ebean.CountDistinctOrder;
 import io.ebean.DtoQuery;
@@ -48,6 +50,7 @@ import java.util.function.Predicate;
 /**
 * Junction implementation.
 */
+@NonNullApi
 final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, ExpressionList<T> {

  DefaultExpressionList<T> exprList;
@@ -476,6 +479,7 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
    return exprList.findSet();
  }

+  @Nullable
  @Override
  public T findOne() {
    return exprList.findOne();
@@ -136,7 +136,7 @@ abstract class EqlWhereListener<T> extends EQLBaseListener {
    }
  }

-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "rawtypes"})
  private List<Object> toList(Object value) {
    if (value == null) return null;
    if (value instanceof List) {
@@ -46,7 +46,7 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext
  /**
   * Reset the buffers after a query iterator reset.
   */
-  public void clear() {
+  private void clear() {
    if (bufferList != null) {
      bufferList.clear();
    }
@@ -57,7 +57,7 @@ public final class DLoadContext implements LoadContext {
  private final ProfileLocation profileLocation;
  private final ProfilingListener profilingListener;
  private final Map<String, ObjectGraphNode> nodePathMap = new HashMap<>();
-  private PersistenceContext persistenceContext;
+  private final PersistenceContext persistenceContext;
  private List<OrmQueryProperties> secQuery;
  private Object tenantId;

@@ -251,19 +251,6 @@ public final class DLoadContext implements LoadContext {
    return persistenceContext;
  }

-  @Override
-  public void resetPersistenceContext(PersistenceContext persistenceContext) {
-    this.persistenceContext = persistenceContext;
-    // clear the load contexts for beans and beanCollections
-    for (DLoadBeanContext beanContext : beanMap.values()) {
-      beanContext.clear();
-    }
-    for (DLoadManyContext manyContext : manyMap.values()) {
-      manyContext.clear();
-    }
-    this.rootBeanContext.clear();
-  }
-
  @Override
  public void register(String path, EntityBeanIntercept ebi) {
    getBeanContext(path).register(ebi);
@@ -48,7 +48,7 @@ final class DLoadManyContext extends DLoadBaseContext implements LoadManyContext
  /**
   * Reset the buffers for a query iterator reset.
   */
-  public void clear() {
+  private void clear() {
    if (bufferList != null) {
      bufferList.clear();
    }
@@ -1,11 +1,6 @@
 package io.ebeaninternal.server.persist;

-import io.ebean.CallableSql;
-import io.ebean.MergeOptions;
-import io.ebean.Query;
-import io.ebean.SqlUpdate;
-import io.ebean.Transaction;
-import io.ebean.Update;
+import io.ebean.*;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollection.ModifyListenMode;
 import io.ebean.bean.EntityBean;
@@ -13,30 +8,15 @@ import io.ebean.bean.PersistenceContext;
 import io.ebean.event.BeanPersistController;
 import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.api.*;
-import io.ebeaninternal.server.core.PersistRequest;
+import io.ebeaninternal.server.core.*;
 import io.ebeaninternal.server.core.PersistRequest.Type;
-import io.ebeaninternal.server.core.PersistRequestBean;
-import io.ebeaninternal.server.core.PersistRequestCallableSql;
-import io.ebeaninternal.server.core.PersistRequestOrmUpdate;
-import io.ebeaninternal.server.core.PersistRequestUpdateSql;
-import io.ebeaninternal.server.core.Persister;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanDescriptorManager;
-import io.ebeaninternal.server.deploy.BeanManager;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
-import io.ebeaninternal.server.deploy.IntersectionRow;
+import io.ebeaninternal.server.deploy.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.persistence.PersistenceException;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;

 /**
 * Persister implementation using DML.
@@ -82,7 +62,6 @@ public final class DefaultPersister implements Persister {
   */
  @Override
  public int executeCallable(CallableSql callSql, Transaction t) {
-
    return executeOrQueue(new PersistRequestCallableSql(server, callSql, (SpiTransaction) t, persistExecute));
  }

@@ -91,16 +70,8 @@ public final class DefaultPersister implements Persister {
   */
  @Override
  public int executeOrmUpdate(Update<?> update, Transaction t) {
-
    SpiUpdate<?> ormUpdate = (SpiUpdate<?>) update;
-
-    BeanManager<?> mgr = beanDescriptorManager.beanManager(ormUpdate.getBeanType());
-
-    if (mgr == null) {
-      String msg = "No BeanManager found for type [" + ormUpdate.getBeanType() + "]. Is it an entity?";
-      throw new PersistenceException(msg);
-    }
-
+    BeanManager<?> mgr = beanManager(ormUpdate.getBeanType());
    return executeOrQueue(new PersistRequestOrmUpdate(server, mgr, ormUpdate, (SpiTransaction) t, persistExecute));
  }

@@ -169,10 +140,8 @@ public final class DefaultPersister implements Persister {
   */
  @Override
  public <T> List<T> draftRestore(Query<T> query, Transaction transaction) {
-
    Class<T> beanType = query.getBeanType();
    BeanDescriptor<T> desc = server.descriptor(beanType);
-
    DraftHandler<T> draftHandler = new DraftHandler<>(desc, transaction);

    List<T> liveBeans = draftHandler.fetchSourceBeans(query, false);
@@ -182,7 +151,6 @@ public final class DefaultPersister implements Persister {
    }

    draftHandler.fetchDestinationBeans(liveBeans, true);
-
    BeanManager<T> mgr = beanDescriptorManager.beanManager(beanType);

    for (T liveBean : liveBeans) {
@@ -214,10 +182,8 @@ public final class DefaultPersister implements Persister {
   */
  @Override
  public <T> List<T> publish(Query<T> query, Transaction transaction) {
-
    Class<T> beanType = query.getBeanType();
    BeanDescriptor<T> desc = server.descriptor(beanType);
-
    DraftHandler<T> draftHandler = new DraftHandler<>(desc, transaction);

    List<T> draftBeans = draftHandler.fetchSourceBeans(query, true);
@@ -227,7 +193,6 @@ public final class DefaultPersister implements Persister {
    }

    draftHandler.fetchDestinationBeans(draftBeans, false);
-
    BeanManager<T> mgr = beanDescriptorManager.beanManager(beanType);

    List<T> livePublish = new ArrayList<>(draftBeans.size());
@@ -251,7 +216,6 @@ public final class DefaultPersister implements Persister {
    }

    draftHandler.updateDrafts(transaction, mgr);
-
    PUB.debug("publish - complete for [{}]", desc.name());
    return livePublish;
  }
@@ -330,9 +294,7 @@ public final class DefaultPersister implements Persister {
     * Fetch the destination beans that will be published to.
     */
    void fetchDestinationBeans(List<T> sourceBeans, boolean asDraft) {
-
      List<Object> ids = getBeanIds(desc, sourceBeans);
-
      Query<T> destQuery = server.find(desc.type()).where().idIn(ids).query();
      if (asDraft) {
        destQuery.asDraft();
@@ -376,7 +338,6 @@ public final class DefaultPersister implements Persister {

  @Override
  public int merge(BeanDescriptor<?> desc, EntityBean bean, MergeOptions options, SpiTransaction transaction) {
-
    MergeHandler merge = new MergeHandler(server, desc, bean, options, transaction);
    List<EntityBean> deleteBeans = merge.merge();
    if (!deleteBeans.isEmpty()) {
@@ -385,13 +346,11 @@ public final class DefaultPersister implements Persister {
        delete(deleteBean, transaction, options.isDeletePermanent());
      }
    }
-
    // cascade save as normal with forceUpdate flags set
    PersistRequestBean<?> request = createRequestRecurse(bean, transaction, null, Flags.MERGE);
    request.checkBatchEscalationOnCascade();
    saveRecurse(request);
    request.flushBatchOnCascade();
-
    // lambda expects a return
    return 0;
  }
@@ -443,7 +402,6 @@ public final class DefaultPersister implements Persister {
   */
  @Override
  public void insert(EntityBean bean, Transaction t) {
-
    PersistRequestBean<?> req = createRequest(bean, t, PersistRequest.Type.INSERT);
    if (req.isSkipReference()) {
      // skip insert on reference bean
@@ -465,7 +423,6 @@ public final class DefaultPersister implements Persister {
  }

  void saveRecurse(EntityBean bean, Transaction t, Object parentBean, int flags) {
-
    // determine insert or update taking into account stateless updates
    saveRecurse(createRequestRecurse(bean, t, parentBean, flags));
  }
@@ -493,7 +450,6 @@ public final class DefaultPersister implements Persister {
   * Insert the bean.
   */
  private void insert(PersistRequestBean<?> request) {
-
    if (request.isRegisteredBean()) {
      // skip as already inserted/updated in this request (recursive cascading)
      return;
@@ -520,7 +476,6 @@ public final class DefaultPersister implements Persister {
   * Update the bean.
   */
  private void update(PersistRequestBean<?> request) {
-
    if (request.isRegisteredBean()) {
      // skip as already inserted/updated in this request (recursive cascading)
      return;
@@ -531,21 +486,16 @@ public final class DefaultPersister implements Persister {
        // save associated One beans recursively first
        saveAssocOne(request);
      }
-
      if (request.isDirty()) {
        request.executeOrQueue();
-
      } else if (log.isDebugEnabled()) {
        log.debug("Update skipped as bean is unchanged: {}", request.bean());
      }
-
      if (request.isPersistCascade()) {
        // save all the beans in assocMany's after
        saveAssocMany(request);
      }
-
      request.completeUpdate();
-
    } finally {
      request.unRegisterBean();
    }
@@ -557,7 +507,6 @@ public final class DefaultPersister implements Persister {
   */
  @Override
  public int delete(EntityBean bean, Transaction t, boolean permanent) {
-
    Type deleteType = permanent ? Type.DELETE_PERMANENT : Type.DELETE;
    PersistRequestBean<EntityBean> originalRequest = createDeleteRequest(bean, t, deleteType);
    if (originalRequest.isHardDeleteDraft()) {
@@ -601,7 +550,6 @@ public final class DefaultPersister implements Persister {
      }
      req.commitTransIfRequired();
      req.flushBatchOnCascade();
-
      return rows;

    } catch (RuntimeException ex) {
@@ -631,23 +579,19 @@ public final class DefaultPersister implements Persister {
   */
  @Override
  public int deleteMany(Class<?> beanType, Collection<?> ids, Transaction transaction, boolean permanent) {
-
    if (ids == null || ids.isEmpty()) {
      return 0;
    }
-
    BeanDescriptor<?> descriptor = beanDescriptorManager.descriptor(beanType);
    DeleteMode deleteMode = (permanent || !descriptor.isSoftDelete()) ? DeleteMode.HARD : DeleteMode.SOFT;
    if (descriptor.isMultiTenant()) {
      return deleteAsBeans(ids, transaction, deleteMode, descriptor);
    }
-
    ArrayList<Object> idList = new ArrayList<>(ids.size());
    for (Object id : ids) {
      // convert to appropriate type if required
      idList.add(descriptor.convertId(id));
    }
-
    return delete(descriptor, null, idList, transaction, deleteMode);
  }

@@ -698,7 +642,6 @@ public final class DefaultPersister implements Persister {
   * Delete by Id or a List of Id's.
   */
  private int delete(BeanDescriptor<?> descriptor, Object id, List<Object> idList, Transaction transaction, DeleteMode deleteMode) {
-
    SpiTransaction t = (SpiTransaction) transaction;
    if (t.isPersistCascade()) {
      BeanPropertyAssocOne<?>[] propImportDelete = descriptor.propertiesOneImportedDelete();
@@ -818,7 +761,6 @@ public final class DefaultPersister implements Persister {
  }

  private void notifyDeleteById(BeanDescriptor<?> descriptor, Object id, List<Object> idList, Transaction transaction) {
-
    BeanPersistController controller = descriptor.persistController();
    if (controller != null) {
      DeleteIdRequest request = new DeleteIdRequest(server, transaction, descriptor.type(), id);
@@ -838,7 +780,6 @@ public final class DefaultPersister implements Persister {
   * the delete cascades to them (foreign keys).
   */
  private Query<?> deleteRequiresQuery(BeanDescriptor<?> desc, BeanPropertyAssocOne<?>[] propImportDelete, DeleteMode deleteMode) {
-
    Query<?> q = server.createQuery(desc.type());
    StringBuilder sb = new StringBuilder(30);
    for (BeanPropertyAssocOne<?> aPropImportDelete : propImportDelete) {
@@ -860,9 +801,7 @@ public final class DefaultPersister implements Persister {
   * </p>
   */
  private int delete(PersistRequestBean<?> request) {
-
    DeleteUnloadedForeignKeys unloadedForeignKeys = null;
-
    if (request.isPersistCascade()) {
      // delete children first ... register the
      // bean to handle bi-directional cascading
@@ -879,16 +818,13 @@ public final class DefaultPersister implements Persister {

    int count = request.executeOrQueue();
    request.removeFromPersistenceContext();
-
    if (request.isPersistCascade()) {
      deleteAssocOne(request);
-
      if (unloadedForeignKeys != null) {
        unloadedForeignKeys.deleteCascade();
      }
    }
    request.complete();
-
    // return true if using JDBC batch (as we can't tell until the batch is flushed)
    return count;
  }
@@ -901,11 +837,9 @@ public final class DefaultPersister implements Persister {
   * </p>
   */
  private void saveAssocMany(PersistRequestBean<?> request) {
-
    EntityBean parentBean = request.entityBean();
    BeanDescriptor<?> desc = request.descriptor();
    SpiTransaction t = request.transaction();
-
    EntityBean orphanForRemoval = request.importedOrphanForRemoval();
    if (orphanForRemoval != null) {
      delete(orphanForRemoval, request.transaction(), true);
@@ -972,7 +906,6 @@ public final class DefaultPersister implements Persister {
   * </p>
   */
  private void deleteAssocMany(PersistRequestBean<?> request) {
-
    SpiTransaction t = request.transaction();
    t.depth(-1);

@@ -1014,7 +947,6 @@ public final class DefaultPersister implements Persister {
          deleteManyIntersection(parentBean, many, t, request.isPublish(), false);
        }
      } else {
-
        if (ModifyListenMode.REMOVALS == many.modifyListenMode()) {
          // PrivateOwned ...
          // if soft delete then check target also supports soft delete
@@ -1023,7 +955,6 @@ public final class DefaultPersister implements Persister {
            if (details instanceof BeanCollection<?>) {
              Set<?> modifyRemovals = ((BeanCollection<?>) details).getModifyRemovals();
              if (modifyRemovals != null && !modifyRemovals.isEmpty()) {
-
                // delete the orphans that have been removed from the collection
                for (Object detail : modifyRemovals) {
                  EntityBean detailBean = (EntityBean) detail;
@@ -1035,11 +966,9 @@ public final class DefaultPersister implements Persister {
            }
          }
        }
-
        deleteManyDetails(t, desc, parentBean, many, null, deleteMode);
      }
    }
-
    // restore the depth
    t.depth(+1);
  }
@@ -1054,7 +983,6 @@ public final class DefaultPersister implements Persister {
   */
  void deleteManyDetails(SpiTransaction t, BeanDescriptor<?> desc, EntityBean parentBean,
                         BeanPropertyAssocMany<?> many, List<Object> excludeDetailIds, DeleteMode deleteMode) {
-
    if (many.cascadeInfo().isDelete()) {
      // cascade delete the beans in the collection
      BeanDescriptor<?> targetDesc = many.targetDescriptor();
@@ -1083,7 +1011,6 @@ public final class DefaultPersister implements Persister {
   * Will use delete by object if the child entity has manyToMany relationships.
   */
  private void deleteChildrenById(SpiTransaction t, BeanDescriptor<?> targetDesc, List<Object> childIds, DeleteMode deleteMode) {
-
    if (!targetDesc.isDeleteByBulk()) {
      // convert into a list of reference objects and perform delete by object
      List<Object> refList = new ArrayList<>(childIds.size());
@@ -1091,7 +1018,6 @@ public final class DefaultPersister implements Persister {
        refList.add(targetDesc.createReference(id, null));
      }
      deleteList(refList, t, deleteMode, true);
-
    } else {
      // perform delete by statement if possible
      delete(targetDesc, null, childIds, t, deleteMode);
@@ -1102,16 +1028,13 @@ public final class DefaultPersister implements Persister {
   * Save any associated one beans.
   */
  private void saveAssocOne(PersistRequestBean<?> request) {
-
    BeanDescriptor<?> desc = request.descriptor();
-
    // imported ones with save cascade
    for (BeanPropertyAssocOne<?> prop : desc.propertiesOneImportedSave()) {
      // check for partial objects
      if (prop.isOrphanRemoval() && request.isDirtyProperty(prop)) {
        request.setImportedOrphanForRemoval(prop);
      }
-
      if (request.isLoadedProperty(prop)) {
        EntityBean detailBean = prop.getValueAsEntityBean(request.entityBean());
        if (detailBean != null
@@ -1125,7 +1048,6 @@ public final class DefaultPersister implements Persister {
        }
      }
    }
-
    for (BeanPropertyAssocOne<?> prop : desc.propertiesOneExportedSave()) {
      if (prop.isOrphanRemoval() && request.isDirtyProperty(prop)) {
        deleteOrphan(request, prop);
@@ -1145,9 +1067,7 @@ public final class DefaultPersister implements Persister {
   * loaded but required for Delete cascade.
   */
  private DeleteUnloadedForeignKeys getDeleteUnloadedForeignKeys(PersistRequestBean<?> request) {
-
    DeleteUnloadedForeignKeys fkeys = null;
-
    for (BeanPropertyAssocOne<?> one : request.descriptor().propertiesOneImportedDelete()) {
      if (!request.isLoadedProperty(one)) {
        // we have cascade Delete on a partially populated bean and
@@ -1158,7 +1078,6 @@ public final class DefaultPersister implements Persister {
        fkeys.add(one);
      }
    }
-
    return fkeys;
  }

@@ -1166,9 +1085,7 @@ public final class DefaultPersister implements Persister {
   * Delete any associated one beans.
   */
  private void deleteAssocOne(PersistRequestBean<?> request) {
-
    DeleteMode deleteMode = request.deleteMode();
-
    for (BeanPropertyAssocOne<?> prop : request.descriptor().propertiesOneImportedDelete()) {
      if (deleteMode.isHard() || prop.isTargetSoftDelete()) {
        if (request.isLoadedProperty(prop)) {
@@ -1196,7 +1113,7 @@ public final class DefaultPersister implements Persister {
   * Create the Persist Request Object additionally specifying the publish status.
   */
  private <T> PersistRequestBean<T> createRequestInternal(T bean, Transaction t, PersistRequest.Type type) {
-    BeanManager<T> mgr = getBeanManager(bean);
+    BeanManager<T> mgr = beanManager(bean.getClass());
    return createRequest(bean, t, null, mgr, type, Flags.ZERO);
  }

@@ -1206,7 +1123,7 @@ public final class DefaultPersister implements Persister {
   * This call determines the PersistRequest.Type based on bean state and the insert flag (root persist type).
   */
  private <T> PersistRequestBean<T> createRequestRecurse(T bean, Transaction t, Object parentBean, int flags) {
-    BeanManager<T> mgr = getBeanManager(bean);
+    BeanManager<T> mgr = beanManager(bean.getClass());
    BeanDescriptor<T> desc = mgr.getBeanDescriptor();
    EntityBean entityBean = (EntityBean) bean;
    PersistRequest.Type type;
@@ -1225,7 +1142,7 @@ public final class DefaultPersister implements Persister {
   * Create the Persist Request Object that wraps all the objects used to
   * perform an insert, update or delete.
   */
-  @SuppressWarnings({"unchecked"})
+  @SuppressWarnings({"unchecked", "rawtypes"})
  private <T> PersistRequestBean<T> createRequest(T bean, Transaction t, Object parentBean, BeanManager<?> mgr,
                                                  PersistRequest.Type type, int flags) {
    // no delete requests come here
@@ -1242,7 +1159,7 @@ public final class DefaultPersister implements Persister {

  @SuppressWarnings({"unchecked"})
  private <T> PersistRequestBean<T> createDeleteRequest(Object bean, Transaction t, PersistRequest.Type type, int flags) {
-    BeanManager<T> mgr = getBeanManager(bean);
+    BeanManager<T> mgr = beanManager(bean.getClass());
    if (type == Type.DELETE_PERMANENT) {
      type = Type.DELETE;
    } else if (type == Type.DELETE && mgr.getBeanDescriptor().isSoftDelete()) {
@@ -1256,9 +1173,8 @@ public final class DefaultPersister implements Persister {
  }

  private String errNotRegistered(Class<?> beanClass) {
-    String msg = "The type [" + beanClass + "] is not a registered entity?";
-    msg += " If you don't explicitly list the entity classes to use Ebean will search for them in the classpath.";
-    return msg;
+    return "The type [" + beanClass + "] is not a registered entity?"
+      + " If you don't explicitly list the entity classes to use Ebean will search for them in the classpath.";
  }

  /**
@@ -1269,10 +1185,10 @@ public final class DefaultPersister implements Persister {
   * </p>
   */
  @SuppressWarnings("unchecked")
-  private <T> BeanManager<T> getBeanManager(Object bean) {
-    BeanManager<T> mgr = (BeanManager<T>) beanDescriptorManager.beanManager(bean.getClass());
+  private <T> BeanManager<T> beanManager(Class<?> cls) {
+    BeanManager<T> mgr = (BeanManager<T>)beanDescriptorManager.beanManager(cls);
    if (mgr == null) {
-      throw new PersistenceException(errNotRegistered(bean.getClass()));
+      throw new PersistenceException(errNotRegistered(cls));
    }
    return mgr;
  }
@@ -26,7 +26,6 @@ final class CQueryIteratorSimple<T> implements QueryIterator<T> {
  public boolean hasNext() {
    boolean ret = false;
    try {
-      request.flushPersistenceContextOnIterate();
      ret = cquery.hasNext();
      return ret;
    } catch (SQLException e) {
@@ -35,8 +35,6 @@ final class CQueryIteratorWithBuffer<T> implements QueryIterator<T> {
    try {
      if (buffer.isEmpty() && moreToLoad) {
        // load buffer
-        request.flushPersistenceContextOnIterate();
-
        int i = -1;
        while (moreToLoad && ++i < bufferSize) {
          if (cquery.hasNext()) {
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.query;

+import io.avaje.lang.NonNullApi;
 import io.ebean.FetchConfig;
 import io.ebean.FetchGroup;
 import io.ebean.FetchGroupBuilder;
@@ -9,14 +10,12 @@ import io.ebeaninternal.server.querydefn.SpiFetchGroup;
 /**
 * Default implementation of the FetchGroupBuilder.
 */
+@NonNullApi
 final class DFetchGroupBuilder<T> implements FetchGroupBuilder<T> {

  private static final FetchConfig DEFAULT_FETCH = FetchConfig.ofDefault();
-
  private static final FetchConfig FETCH_CACHE = FetchConfig.ofCache();
-
  private static final FetchConfig FETCH_QUERY = FetchConfig.ofQuery();
-
  private static final FetchConfig FETCH_LAZY = FetchConfig.ofLazy();

  private final OrmQueryDetail detail;
@@ -38,22 +37,22 @@ final class DFetchGroupBuilder<T> implements FetchGroupBuilder<T> {
  }

  @Override
-  public FetchGroupBuilder<T> fetch(String path, FetchGroup nestedGroup) {
+  public FetchGroupBuilder<T> fetch(String path, FetchGroup<?> nestedGroup) {
    return fetchNested(path, nestedGroup, DEFAULT_FETCH);
  }

  @Override
-  public FetchGroupBuilder<T> fetchQuery(String path, FetchGroup nestedGroup) {
+  public FetchGroupBuilder<T> fetchQuery(String path, FetchGroup<?> nestedGroup) {
    return fetchNested(path, nestedGroup, FETCH_QUERY);
  }

  @Override
-  public FetchGroupBuilder<T> fetchLazy(String path, FetchGroup nestedGroup) {
+  public FetchGroupBuilder<T> fetchLazy(String path, FetchGroup<?> nestedGroup) {
    return fetchNested(path, nestedGroup, FETCH_LAZY);
  }

-  private FetchGroupBuilder<T> fetchNested(String path, FetchGroup nestedGroup, FetchConfig fetchConfig) {
-    OrmQueryDetail nestedDetail = ((SpiFetchGroup) nestedGroup).underlying();
+  private FetchGroupBuilder<T> fetchNested(String path, FetchGroup<?> nestedGroup, FetchConfig fetchConfig) {
+    OrmQueryDetail nestedDetail = ((SpiFetchGroup<?>) nestedGroup).underlying();
    detail.addNested(path, nestedDetail, fetchConfig);
    return this;
  }
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.query;

+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import io.ebean.CacheMode;
 import io.ebean.CountDistinctOrder;
 import io.ebean.Database;
@@ -29,8 +31,6 @@ import io.ebeaninternal.api.SpiQueryFetch;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.querydefn.SpiFetchGroup;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.List;
@@ -44,6 +44,7 @@ import java.util.stream.Stream;
 /**
 * Implementation of FetchGroup query for use to create FetchGroup via query beans.
 */
+@NonNullApi
 final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQueryFetch {

  private static final FetchConfig FETCH_CACHE = FetchConfig.ofCache();
@@ -65,6 +66,7 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
    return this;
  }

+  @SuppressWarnings("rawtypes")
  @Override
  public Query<T> select(FetchGroup fetchGroup) {
    this.detail = ((SpiFetchGroup) fetchGroup).detail();
@@ -117,7 +119,7 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
  }

  @Override
-  public Query<T> fetch(String property, String columns, FetchConfig config) {
+  public Query<T> fetch(String property, @Nullable String columns, @Nullable FetchConfig config) {
    detail.fetch(property, columns, config);
    return this;
  }
@@ -234,25 +236,21 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public <A> List<A> findIds() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public QueryIterator<T> findIterate() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public Stream<T> findStream() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public Stream<T> findLargeStream() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
@@ -273,25 +271,21 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public List<T> findList() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public Set<T> findSet() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public <K> Map<K, T> findMap() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public <A> List<A> findSingleAttributeList() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
@@ -318,19 +312,16 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public Optional<T> findOneOrEmpty() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public List<Version<T>> findVersions() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public List<Version<T>> findVersionsBetween(Timestamp start, Timestamp end) {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
@@ -361,25 +352,21 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public FutureRowCount<T> findFutureCount() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public FutureIds<T> findFutureIds() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public FutureList<T> findFutureList() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

-  @Nonnull
  @Override
  public PagedList<T> findPagedList() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
@@ -268,9 +268,16 @@ class SqlTreeNodeBean implements SqlTreeNode {
        contextBean = localBean;
      } else {
        // bean already exists in persistenceContext
-        if (isLoadContextBeanNeeded(queryMode, contextBean)) {
-          // refresh it anyway (lazy loading for example)
+        
+        if (queryMode.isLoadContextBean()) {
+          // if explicitly set loadContextBean to true, then reload
          localBean = contextBean;
+        } else if (!contextBean._ebean_getIntercept().isFullyLoadedBean()) {
+          // reload if contextBean is partial object
+          localBean = contextBean;
+          // and switch to lazyLoad query mode in order not to overwrite
+          // existing properties in SqlBeanLoad::load
+          queryMode = Mode.LAZYLOAD_BEAN;
        } else {
          // ignore the DB data...
          localBean = null;
@@ -683,14 +690,6 @@ class SqlTreeNodeBean implements SqlTreeNode {
    return "SqlTreeNodeBean: " + desc;
  }

-  private boolean isLoadContextBeanNeeded(Mode queryMode, EntityBean contextBean) {
-    // if explicitly set loadContextBean to true, then reload
-    if (queryMode.isLoadContextBean()) {
-      return true;
-    }
-    // reload if contextBean is partial object
-    return !contextBean._ebean_getIntercept().isFullyLoadedBean();
-  }

  @Override
  public boolean hasMany() {
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.querydefn;

+import io.avaje.lang.NonNullApi;
 import io.ebean.DtoQuery;
 import io.ebean.ProfileLocation;
 import io.ebean.QueryIterator;
@@ -12,6 +13,8 @@ import io.ebeaninternal.server.dto.DtoBeanDescriptor;
 import io.ebeaninternal.server.dto.DtoMappingRequest;
 import io.ebeaninternal.server.dto.DtoQueryPlan;

+import javax.annotation.Nullable;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -21,6 +24,7 @@ import java.util.stream.Stream;
 /**
 * Default implementation of DtoQuery.
 */
+@NonNullApi
 public final class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQuery<T> {

  private final SpiEbeanServer server;
@@ -114,6 +118,7 @@ public final class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQue
    return server.findDtoList(this);
  }

+  @Nullable
  @Override
  public T findOne() {
    return server.findDtoOne(this);
@@ -144,6 +149,16 @@ public final class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQue
    return this;
  }

+  @Override
+  public DtoQuery<T> setArrayParameter(String paramName, Collection<?> values) {
+    if (ormQuery != null) {
+      ormQuery.setArrayParameter(paramName, values);
+    } else {
+      bindParams.setArrayParameter(paramName, values);
+    }
+    return this;
+  }
+
  @Override
  public DtoQuery<T> setParameters(Object... values) {
    if (ormQuery != null) {
@@ -206,6 +221,7 @@ public final class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQue
    return label;
  }

+  @Nullable
  @Override
  public String getPlanLabel() {
    if (label != null) {
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.querydefn;

+import io.avaje.lang.NonNullApi;
 import io.ebean.*;
 import io.ebean.OrderBy.Property;
 import io.ebean.bean.CallOrigin;
@@ -30,6 +31,7 @@ import java.util.stream.Stream;
 /**
 * Default implementation of an Object Relational query.
 */
+@NonNullApi
 public final class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {

  private static final String DEFAULT_QUERY_NAME = "default";
@@ -584,9 +586,9 @@ public final class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<
   */
  @Override
  public void setSelectId() {
-    // clear select and fetch joins..
+    // clear select and fetch joins
    detail.clear();
-    select(beanDescriptor.idBinder().getIdProperty());
+    select(beanDescriptor.idSelect());
  }

  @Override
@@ -1584,6 +1586,17 @@ public final class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<
    return this;
  }

+  @Override
+  public void setArrayParameter(String name, Collection<?> values) {
+    if (namedParams != null) {
+      throw new IllegalStateException("setArrayParameter() not supported when EQL parsed query");
+    }
+    if (bindParams == null) {
+      bindParams = new BindParams();
+    }
+    bindParams.setArrayParameter(name, values);
+  }
+
  @Override
  public boolean checkPagingOrderBy() {
    return orderById && !useDocStore;
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.querydefn;

+import io.avaje.lang.NonNullApi;
+import io.avaje.lang.Nullable;
 import io.ebean.RowConsumer;
 import io.ebean.RowMapper;
 import io.ebean.SqlQuery;
@@ -17,6 +19,7 @@ import java.util.function.Predicate;
 /**
 * Default implementation of SQuery - SQL Query.
 */
+@NonNullApi
 public final class DefaultRelationalQuery extends AbstractQuery implements SpiSqlQuery {

  private static final long serialVersionUID = -1098305779779591068L;
@@ -263,6 +266,7 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
      this.mapper = mapper;
    }

+    @Nullable
    @Override
    public T findOne() {
      return mapperFindOne(mapper);
@@ -37,7 +37,11 @@ final class OrmQueryPropertiesParser {
    if (rawProperties.equals("*")) {
      return ALL;
    }
-    return new Response(false, splitRawSelect(rawProperties));
+    final Set<String> included = splitRawSelect(rawProperties);
+    if (included.contains("*")) {
+      return ALL;
+    }
+    return new Response(false, included);
  }

  /**
@@ -45,7 +45,7 @@ public final class DJsonBeanReader<T> implements JsonBeanReader<T> {
  }

  @Override
-  public JsonBeanReader<T> forJson(JsonParser moreJson, boolean resetContext) {
-    return new DJsonBeanReader<>(desc, readJson.forJson(moreJson, resetContext));
+  public JsonBeanReader<T> forJson(JsonParser moreJson) {
+    return new DJsonBeanReader<>(desc, readJson.forJson(moreJson));
  }
 }
@@ -50,22 +50,14 @@ public final class ReadJson implements SpiJsonReader {
  /**
   * Construct when transferring load context, persistence context, object mapper etc to a new ReadJson instance.
   */
-  private ReadJson(JsonParser moreJson, ReadJson source, boolean resetContext) {
+  private ReadJson(JsonParser moreJson, ReadJson source) {
    this.parser = moreJson;
    this.rootDesc = source.rootDesc;
    this.pathStack = source.pathStack;
    this.visitorMap = source.visitorMap;
    this.objectMapper = source.objectMapper;
-    if (resetContext) {
-      this.persistenceContext = new DefaultPersistenceContext();
-      this.loadContext = source.loadContext;
-      if (loadContext != null) {
-        loadContext.resetPersistenceContext(persistenceContext);
-      }
-    } else {
-      this.persistenceContext = source.persistenceContext;
-      this.loadContext = source.loadContext;
-    }
+    this.persistenceContext = source.persistenceContext;
+    this.loadContext = source.loadContext;
  }

  private LoadContext initLoadContext(BeanDescriptor<?> desc, JsonReadOptions readOptions) {
@@ -96,8 +88,8 @@ public final class ReadJson implements SpiJsonReader {
   * Return a new instance of ReadJson using the existing context but with a new JsonParser.
   */
  @Override
-  public SpiJsonReader forJson(JsonParser moreJson, boolean resetContext) {
-    return new ReadJson(moreJson, this, resetContext);
+  public SpiJsonReader forJson(JsonParser moreJson) {
+    return new ReadJson(moreJson, this);
  }

  /**
@@ -1,11 +1,13 @@
 package io.ebeaninternal.server.transaction;

 import io.ebean.bean.EntityBean;
-import io.ebean.bean.PersistenceContext;
 import io.ebeaninternal.api.SpiBeanType;
 import io.ebeaninternal.api.SpiBeanTypeManager;
 import io.ebeaninternal.api.SpiPersistenceContext;

+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
 import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;

@@ -25,14 +27,16 @@ import java.util.concurrent.locks.ReentrantLock;
 */
 public final class DefaultPersistenceContext implements SpiPersistenceContext {

-  /**
-   * Map used hold caches. One cache per bean type.
-   */
  private final HashMap<Class<?>, ClassContext> typeCache = new HashMap<>();
-
  private final ReentrantLock lock = new ReentrantLock();
+  private final ReferenceQueue<Object> queue = new ReferenceQueue<>();

-  private int putCount;
+  /**
+   * When we are inside an iterate loop, we will add only WeakReferences. This
+   * allows the JVM GC to collect beans, which are not referenced elsewhere. In
+   * normal operation, we will use hard references, to avoid performance impact
+   */
+  private int iterateDepth;

  /**
   * Create a new PersistenceContext.
@@ -40,60 +44,33 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
  public DefaultPersistenceContext() {
  }

-  /**
-   * Create as a shallow copy with initial or types that have not been added to.
-   */
-  private DefaultPersistenceContext(DefaultPersistenceContext parent, boolean initial) {
-    for (Map.Entry<Class<?>, ClassContext> entry : parent.typeCache.entrySet()) {
-      typeCache.put(entry.getKey(), entry.getValue().copy(initial));
-    }
-  }
-
-  /**
-   * Return the initial shallow copy with each ClassContext noting it's initialSize (to detect additions).
-   */
  @Override
-  public PersistenceContext forIterate() {
-    return new DefaultPersistenceContext(this, true);
-  }
-
-  /**
-   * Return a shallow copy including each ClassContext that has had no additions (still at initialSize).
-   */
-  @Override
-  public PersistenceContext forIterateReset() {
-    return new DefaultPersistenceContext(this, false);
-  }
-
-  @Override
-  public boolean resetLimit() {
+  public void beginIterate() {
    lock.lock();
    try {
-      if (putCount < 100) {
-        return false;
-      }
-      putCount = 0;
-      for (ClassContext value : typeCache.values()) {
-        if (value.resetLimit()) {
-          return true;
-        }
-      }
-      // checking after another 100 puts
-      return false;
+      iterateDepth++;
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  @Override
+  public void endIterate() {
+    lock.lock();
+    try {
+      iterateDepth--;
+      expungeStaleEntries(); // when leaving the iterator, cleanup.
    } finally {
      lock.unlock();
    }
  }

-  /**
-   * Set an object into the PersistenceContext.
-   */
  @Override
  public void put(Class<?> rootType, Object id, Object bean) {
    lock.lock();
    try {
-      putCount++;
-      classContext(rootType).put(id, bean);
+      expungeStaleEntries();
+      classContext(rootType).useReferences(iterateDepth > 0).put(id, bean);
    } finally {
      lock.unlock();
    }
@@ -103,8 +80,8 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
  public Object putIfAbsent(Class<?> rootType, Object id, Object bean) {
    lock.lock();
    try {
-      putCount++;
-      return classContext(rootType).putIfAbsent(id, bean);
+      expungeStaleEntries();
+      return classContext(rootType).useReferences(iterateDepth > 0).putIfAbsent(id, bean);
    } finally {
      lock.unlock();
    }
@@ -117,6 +94,7 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
  public Object get(Class<?> rootType, Object id) {
    lock.lock();
    try {
+      expungeStaleEntries();
      return classContext(rootType).get(id);
    } finally {
      lock.unlock();
@@ -127,19 +105,18 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
  public WithOption getWithOption(Class<?> rootType, Object id) {
    lock.lock();
    try {
+      expungeStaleEntries();
      return classContext(rootType).getWithOption(id);
    } finally {
      lock.unlock();
    }
  }

-  /**
-   * Return the number of beans of the given type in the persistence context.
-   */
  @Override
  public int size(Class<?> rootType) {
    lock.lock();
    try {
+      expungeStaleEntries();
      ClassContext classMap = typeCache.get(rootType);
      return classMap == null ? 0 : classMap.size();
    } finally {
@@ -147,14 +124,12 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
    }
  }

-  /**
-   * Clear the PersistenceContext.
-   */
  @Override
  public void clear() {
    lock.lock();
    try {
      typeCache.clear();
+      expungeStaleEntries();
    } finally {
      lock.unlock();
    }
@@ -168,6 +143,7 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
      if (classMap != null) {
        classMap.clear();
      }
+      expungeStaleEntries();
    } finally {
      lock.unlock();
    }
@@ -181,6 +157,7 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
      if (classMap != null && id != null) {
        classMap.deleted(id);
      }
+      expungeStaleEntries();
    } finally {
      lock.unlock();
    }
@@ -194,6 +171,7 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
      if (classMap != null && id != null) {
        classMap.remove(id);
      }
+      expungeStaleEntries();
    } finally {
      lock.unlock();
    }
@@ -203,6 +181,7 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
  public List<Object> dirtyBeans(SpiBeanTypeManager manager) {
    lock.lock();
    try {
+      expungeStaleEntries();
      List<Object> list = new ArrayList<>();
      for (ClassContext classContext : typeCache.values()) {
        classContext.dirtyBeans(manager, list);
@@ -213,10 +192,23 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
    }
  }

+  /**
+   * When there is a queue, poll it to remove stale entries from the map. Note:
+   * This is always done AFTER <code>useReferences</code> was called with
+   * <code>true</code>. Polling an empty queue has no performance impact.
+   */
+  private void expungeStaleEntries() {
+    Reference<?> ref;
+    while ((ref = queue.poll()) != null) {
+      ((BeanRef) ref).expunge();
+    }
+  }
+
  @Override
  public String toString() {
    lock.lock();
    try {
+      expungeStaleEntries();
      return typeCache.toString();
    } finally {
      lock.unlock();
@@ -224,69 +216,44 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
  }

  private ClassContext classContext(Class<?> rootType) {
-    return typeCache.computeIfAbsent(rootType, k -> new ClassContext(rootType));
+    return typeCache.computeIfAbsent(rootType, k -> new ClassContext(k, queue));
  }

  private static class ClassContext {

    private final Map<Object, Object> map = new HashMap<>();
    private final Class<?> rootType;
+    private final ReferenceQueue<Object> queue;
    private Set<Object> deleteSet;
-    private int initialSize;
-    private ClassContext parent;
+    private boolean useReferences;
+    private int weakCount;

-    private ClassContext(Class<?> rootType) {
+    private ClassContext(Class<?> rootType, ReferenceQueue<Object> queue) {
      this.rootType = rootType;
+      this.queue = queue;
    }

    /**
-     * Create as a shallow copy.
+     * When called with "true", initialize referenceQueue and store BeanRefs instead
+     * of real object references.
     */
-    private ClassContext(ClassContext source, boolean initial) {
-      this.rootType = source.rootType;
-      if (initial || source.isTransfer()) {
-        parent = source.transferParent();
-        initialSize = parent.size();
-        if (source.deleteSet != null) {
-          deleteSet = new HashSet<>(source.deleteSet);
-        }
-      }
-    }
-
-    /**
-     * True if this should be transferred to a new iterator persistence context.
-     */
-    private boolean isTransfer() {
-      // map not added to and has some original/parent beans
-      return map.isEmpty() && initialSize > 0;
-    }
-
-    private ClassContext transferParent() {
-      return (parent != null) ? parent : this;
-    }
-
-    /**
-     * Return a shallow copy if initial copy or it has not grown (still at initialSize).
-     */
-    private ClassContext copy(boolean initial) {
-      return new ClassContext(this, initial);
-    }
-
-    /**
-     * Return true if grown above the reset limit size of 1000.
-     */
-    private boolean resetLimit() {
-      return map.size() > 1000;
+    private ClassContext useReferences(boolean useReferences) {
+      this.useReferences = useReferences;
+      return this;
    }

    @Override
    public String toString() {
-      return "size:" + map.size();
+      return "size:" + map.size() + " (" + weakCount + " weak)";
    }

    private Object get(Object id) {
-      Object bean = (parent == null) ? null : parent.get(id);
-      return bean != null ? bean : map.get(id);
+      Object ret = map.get(id);
+      if (ret instanceof BeanRef) {
+        return ((BeanRef) ret).get();
+      } else {
+        return ret;
+      }
    }

    private WithOption getWithOption(Object id) {
@@ -304,24 +271,39 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
        return existingValue;
      }
      // put the new value and return null indicating the put was successful
-      map.put(id, bean);
+      put(id, bean);
      return null;
    }

-    private void put(Object id, Object b) {
-      map.put(id, b);
+    private void put(Object id, Object bean) {
+      Object existing;
+      if (useReferences) {
+        weakCount++;
+        existing = map.put(id, new BeanRef(this, id, bean, queue));
+      } else {
+        existing = map.put(id, bean);
+      }
+      if (existing instanceof BeanRef) {
+        // when a BeanRef is replaced, its expunge() must NOT remove an entry
+        ((BeanRef) existing).setReplaced();
+        weakCount--;
+      }
    }

    private int size() {
-      return map.size() + initialSize;
+      return map.size();
    }

    private void clear() {
      map.clear();
+      weakCount = 0;
    }

    private void remove(Object id) {
-      map.remove(id);
+      Object ret = map.remove(id);
+      if (ret instanceof BeanRef) {
+        weakCount--;
+      }
    }

    private void deleted(Object id) {
@@ -329,7 +311,7 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
        deleteSet = new HashSet<>();
      }
      deleteSet.add(id);
-      map.remove(id);
+      remove(id);
    }

    /**
@@ -338,6 +320,10 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
    void dirtyBeans(SpiBeanTypeManager manager, List<Object> list) {
      final SpiBeanType beanType = manager.beanType(rootType);
      for (Object value : map.values()) {
+        if (value instanceof BeanRef) {
+          value = ((BeanRef) value).get();
+          if (value == null) continue;
+        }
        EntityBean bean = (EntityBean) value;
        if (bean._ebean_getIntercept().isDirty() || beanType.isToManyDirty(bean)) {
          list.add(value);
@@ -346,4 +332,27 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext {
    }
  }

+  private static class BeanRef extends WeakReference<Object> {
+
+    private final ClassContext classContext;
+    private final Object key;
+    private boolean replaced;
+
+    private BeanRef(ClassContext classContext, Object key, Object referent, ReferenceQueue<? super Object> q) {
+      super(referent, q);
+      this.classContext = classContext;
+      this.key = key;
+    }
+
+    private void setReplaced() {
+      replaced = true;
+    }
+
+    private void expunge() {
+      if (!replaced) {
+        classContext.remove(key);
+      }
+    }
+
+  }
 }
@@ -251,6 +251,18 @@ public final class DefaultTypeManager implements TypeManager {
    return nativeMap.get(jdbcType);
  }

+  @Override
+  public ScalarType<?> getScalarType(Type propertyType, Class<?> propertyClass) {
+    if (propertyType instanceof ParameterizedType) {
+      ParameterizedType pt = (ParameterizedType)propertyType;
+      Type rawType = pt.getRawType();
+      if (List.class == rawType || Set.class == rawType) {
+        return getArrayScalarType((Class<?>)rawType, propertyType, true);
+      }
+    }
+    return getScalarType(propertyClass);
+  }
+
  /**
   * This can return null if no matching ScalarType is found.
   */
@@ -286,7 +298,7 @@ public final class DefaultTypeManager implements TypeManager {
  }

  @Override
-  public ScalarType<?> getArrayScalarType(Class<?> type, DbArray dbArray, Type genericType, boolean nullable) {
+  public ScalarType<?> getArrayScalarType(Class<?> type, Type genericType, boolean nullable) {
    Type valueType = getValueType(genericType);
    if (type.equals(List.class)) {
      return getArrayScalarTypeList(valueType, nullable);
@@ -591,8 +603,7 @@ public final class DefaultTypeManager implements TypeManager {
   */
  private ScalarTypeEnum<?> createEnumScalarTypeDbValue(Class<? extends Enum<?>> enumType, Method method, boolean integerType, int length, boolean withConstraint) {
    Map<String, String> nameValueMap = new LinkedHashMap<>();
-    Enum<?>[] enumConstants = enumType.getEnumConstants();
-    for (Enum<?> enumConstant : enumConstants) {
+    for (Enum<?> enumConstant : enumType.getEnumConstants()) {
      try {
        Object value = method.invoke(enumConstant);
        nameValueMap.put(enumConstant.name(), value.toString());
@@ -19,8 +19,13 @@ final class JsonTrim {
    for (int i = 0; i < len; i++) {
      char c = json.charAt(i);
      if (c == '\"') {
-        if (!escaped) quoted = !quoted;
-        else escaped = false;
+        if (!escaped) {
+          quoted = !quoted;
+        } else {
+          escaped = false;
+        }
+      } else if (escaped) {
+        escaped = false;
      } else if (quoted && c == '\\') {
        escaped = true;
      }
@@ -47,6 +47,13 @@ public interface TypeManager {
   */
  ScalarType<?> getScalarType(Class<?> type, int jdbcType);

+  /**
+   * Find and return the ScalarType taking into account the property type with generics.
+   * <p>
+   * For example Array based ScalarType for types like {@code List<String>}.
+   */
+  ScalarType<?> getScalarType(Type propertyType, Class<?> type);
+
  /**
   * Create a ScalarType for an Enum using a mapping (rather than JPA Ordinal
   * or String which has limitations).
@@ -64,7 +71,7 @@ public interface TypeManager {
  /**
   * Return the ScalarType used to handle DB ARRAY.
   */
-  ScalarType<?> getArrayScalarType(Class<?> type, DbArray dbArray, Type genericType, boolean nullable);
+  ScalarType<?> getArrayScalarType(Class<?> type, Type genericType, boolean nullable);

  /**
   * Return the ScalarType used to handle HSTORE (Map<String,String>).
@@ -1,5 +1,6 @@
 package io.ebeanservice.docstore.none;

+import io.avaje.lang.NonNullApi;
 import io.ebean.DocStoreQueueEntry;
 import io.ebean.DocumentStore;
 import io.ebean.PagedList;
@@ -16,6 +17,7 @@ import java.util.function.Predicate;
 /**
 * DocumentStore that barfs it is used.
 */
+@NonNullApi
 public final class NoneDocStore implements DocumentStore {

  public static IllegalStateException implementationNotInClassPath() {
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.12.2</version>
+    <version>12.13.1</version>
  </parent>

  <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
      <scope>provided</scope>
    </dependency>

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>12.12.2-SNAPSHOT</version>
-  </parent>
-
-  <name>ebean ddl generation</name>
-  <description>DDL and DB Migration generation</description>
-  <artifactId>ebean-ddl-generator</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-ddl-runner</artifactId>
-      <version>1.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>12.12.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core-type</artifactId>
-      <version>12.12.2-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>12.12.2-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- needed for java 11+ -->
-    <dependency>
-      <groupId>org.glassfish.jaxb</groupId>
-      <artifactId>jaxb-runtime</artifactId>
-      <version>2.3.2</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>junit</artifactId>
-      <version>1.0</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-      <version>2.0.1.Final</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-maven-plugin</artifactId>
-        <version>${ebean-maven-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>process-test-classes</phase>
-            <configuration>
-              <transformArgs>debug=0</transformArgs>
-            </configuration>
-            <goals>
-              <goal>testEnhance</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.avaje.tile:moditech-module:1.0</tile>
-          </tiles>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
@@ -243,11 +243,11 @@ public class ModelBuildContext {
     */
    public FkeyBuilder addForeignKey(BeanDescriptor<?> desc, TableJoin tableJoin, boolean direction) {

-      String baseTable = ctx.normaliseTable(desc.getBaseTable());
+      String baseTable = ctx.normaliseTable(desc.baseTable());
      String fkName = ctx.foreignKeyConstraintName(tableName, baseTable, count.incrementAndGet());
      String fkIndex = ctx.foreignKeyIndexName(tableName, baseTable, count.get());

-      MCompoundForeignKey foreignKey = new MCompoundForeignKey(fkName, desc.getBaseTable(), fkIndex);
+      MCompoundForeignKey foreignKey = new MCompoundForeignKey(fkName, desc.baseTable(), fkIndex);

      for (TableJoinColumn column : tableJoin.columns()) {
        String localCol = direction ? column.getForeignDbColumn() : column.getLocalDbColumn();
@@ -203,10 +203,10 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
      if (columns.length == 1) {
        if (p.hasForeignKeyConstraint() && !importedProperty.descriptor().suppressForeignKey()) {
          // single references column (put it on the column)
-          String refTable = importedProperty.descriptor().getBaseTable();
+          String refTable = importedProperty.descriptor().baseTable();
          if (refTable == null) {
            // odd case where an EmbeddedId only has 1 property
-            refTable = p.targetDescriptor().getBaseTable();
+            refTable = p.targetDescriptor().baseTable();
          }
          col.setReferences(refTable + "." + refColumn);
          col.setForeignKeyName(foreignKeyConstraintName(col.getName()));
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.12.2</version>
+    <version>12.13.1</version>
  </parent>

  <name>ebean external mapping api</name>
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>12.12.2-SNAPSHOT</version>
-  </parent>
-
-  <name>ebean external mapping api</name>
-  <description>API for mapping external named queries</description>
-  <artifactId>ebean-externalmapping-api</artifactId>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.avaje.tile:moditech-module:1.0</tile>
-          </tiles>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.12.2</version>
+    <version>12.13.1</version>
  </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@

  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.12.2</tag>
+    <tag>ebean-parent-12.13.1</tag>
  </scm>

  <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
    </dependency>

    <dependency>
@@ -59,14 +59,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
      <scope>test</scope>
    </dependency>

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>12.12.2-SNAPSHOT</version>
-  </parent>
-<!--  <parent>-->
-<!--    <groupId>org.avaje</groupId>-->
-<!--    <artifactId>java8-oss</artifactId>-->
-<!--    <version>2.2</version>-->
-<!--  </parent>-->
-
-  <scm>
-    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
-  </scm>
-
-  <name>ebean external mapping xml</name>
-  <description>XML implementation for mapping external named queries</description>
-  <artifactId>ebean-externalmapping-xml</artifactId>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.30</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.12.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.glassfish.jaxb</groupId>
-      <artifactId>jaxb-runtime</artifactId>
-      <version>2.3.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>classpath-scanner</artifactId>
-      <version>6.2</version>
-    </dependency>
-
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>12.12.2-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.12.2-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>junit</artifactId>
-      <version>1.0</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <!-- other tiles ... -->
-            <tile>io.ebean.tile:enhancement:12.11.3</tile>
-            <tile>io.avaje.tile:moditech-module:1.0</tile>
-          </tiles>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-</project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.12.2</version>
+    <version>12.13.1</version>
  </parent>

  <name>ebean postgis</name>
@@ -23,7 +23,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
      <scope>provided</scope>
    </dependency>

@@ -44,7 +44,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.2.8</version>
+      <version>42.2.24</version>
      <scope>provided</scope>
    </dependency>

@@ -74,7 +74,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
      <scope>test</scope>
    </dependency>

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>12.12.2-SNAPSHOT</version>
-  </parent>
-
-  <name>ebean postgis</name>
-  <description>ebean postgis module</description>
-  <url>https://ebean.io/</url>
-
-  <artifactId>ebean-postgis</artifactId>
-
-  <properties>
-    <postgis.jdbc.version>2.2.1</postgis.jdbc.version>
-  </properties>
-
-  <dependencies>
-
-    <!-- provided scope -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>12.12.2-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>net.postgis</groupId>
-      <artifactId>postgis-jdbc</artifactId>
-      <version>[${postgis.jdbc.version}]</version>
-    </dependency>
-
-    <!-- expected to be provided -->
-    <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <version>42.2.8</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- expected to be provided -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.30</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- optionally use geolatte-geom -->
-    <dependency>
-      <groupId>org.geolatte</groupId>
-      <artifactId>geolatte-geom</artifactId>
-      <version>1.0.6</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-test</artifactId>
-      <version>12.12.2-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.avaje.composite</groupId>
-      <artifactId>logback</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>junit</artifactId>
-      <version>1.0</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-
-      <!-- for testing -->
-      <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.ebean.tile:enhancement:12.11.3</tile>
-            <tile>io.avaje.tile:moditech-module:1.0</tile>
-          </tiles>
-        </configuration>
-      </plugin>
-
-    </plugins>
-
-  </build>
-
-</project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.12.2</version>
+    <version>12.13.1</version>
  </parent>

  <name>ebean querybean</name>
@@ -17,7 +17,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
      <scope>provided</scope>
    </dependency>

@@ -27,9 +27,8 @@
    -->
    <dependency>
      <groupId>io.avaje</groupId>
-      <artifactId>avaje-jsr305</artifactId>
-      <version>1.1</version>
-      <scope>provided</scope>
+      <artifactId>avaje-lang</artifactId>
+      <version>1.0</version>
    </dependency>

    <dependency>
@@ -57,21 +56,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>12.12.2</version>
+      <version>12.13.1</version>
      <scope>test</scope>
    </dependency>

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	09115a824d	[maven-release-plugin] prepare release ebean-parent-12.13.1	2021-11-26 21:57:04 +13:00
Rob Bygrave	28d4d07966	test config only, stop dumping metrics on jvm shutdown	2021-11-26 21:52:40 +13:00
Rob Bygrave	c3e91fed65	Tidy TestElementCollectionBasicSet only	2021-11-26 21:33:26 +13:00
Rob Bygrave	2cad98ad26	Move DetermineManyType into io.ebeaninternal.server.deploy.parse This allows it to be package private	2021-11-26 21:25:54 +13:00
Rob Bygrave	8a25a7b6ec	#2444 - exists and findCount queries produce NPE on entity defined with IdClass - SqlTreeProperties.add(SqlTreeProperties.java:38)	2021-11-26 21:10:31 +13:00
Rob Bygrave	83fbfd1b2a	No effective change - tidy inline for ImportedIdEmbedded, ImportedIdSimple	2021-11-26 20:54:28 +13:00
Rob Bygrave	a9c6cd15a1	#2433 - Postgres JSONB dirty checking - trim json	2021-11-26 16:39:09 +13:00
Rob Bygrave	63b9b42dc8	#2433 - Postgres JSONB dirty checking - trim json	2021-11-26 16:34:15 +13:00
Rob Bygrave	268146df85	Tidy up TypeManager API after #2435	2021-11-26 14:55:16 +13:00
Rob Bygrave	d05a77e755	reset test datasource back to h2	2021-11-26 14:48:45 +13:00
Rob Bygrave	69c768b3be	Merge branch 'majkiw-master'	2021-11-26 14:46:42 +13:00
Rob Bygrave	07f9bf98c3	#2436 - SQL Update doesn't handle named parameters for array types in Postgres	2021-11-26 14:46:06 +13:00
Rob Bygrave	9af64f61f7	#2435 - Fix DBArray is not loaded in asDto Postgres queries	2021-11-26 14:32:47 +13:00
Rob Bygrave	c1a78d3c8b	Merge branch 'master' of https://github.com/majkiw/ebean into majkiw-master	2021-11-25 18:53:28 +13:00
Rob Bygrave	08fc7399ec	Tidy DefaultTypeManager with enhanced for	2021-11-25 18:30:00 +13:00
Rob Bygrave	86d805c9fa	Tidy internals only for OrmQueryRequest after merge of #2442	2021-11-22 15:21:03 +13:00
Rob BygraveandGitHub	34135360ed	Merge pull request #2442 from FOCONIS/findmap-with-beancache-without-mapkey findMap() with beanCache should use idPoperty if mapKey = null	2021-11-22 15:15:07 +13:00
Rob Bygrave	53b4d6fd73	Merge branch 'FOCONIS-assume-infoInherit-infoType-without-children'	2021-11-22 15:12:29 +13:00
Rob Bygrave	1114ccfb3a	#2441 Flatten and re-order if block in AssocOneHelpRefInherit when determining BeanDescriptor	2021-11-22 15:12:18 +13:00
Rob Bygrave	b4403c58d1	Merge branch 'assume-infoInherit-infoType-without-children' of https://github.com/FOCONIS/ebean into FOCONIS-assume-infoInherit-infoType-without-children	2021-11-22 15:06:34 +13:00
Rob Bygrave	951903db76	Merge branch 'FOCONIS-json-deserialize-references'	2021-11-22 15:00:14 +13:00
Rob Bygrave	093d111524	#2440 - Re-use existing referenceIdPropertyOnly() method	2021-11-22 14:59:40 +13:00
Rob Bygrave	08e166a9b7	Merge branch 'json-deserialize-references' of https://github.com/FOCONIS/ebean into FOCONIS-json-deserialize-references	2021-11-22 14:51:21 +13:00
Rob Bygrave	d5fe7a9ebe	Whitespace format only - OrmQueryPropertiesParser	2021-11-22 10:23:27 +13:00
Rob BygraveandGitHub	9f52856343	Merge pull request #2439 from FOCONIS/path-properties-query-with-all-props Path properties query with all props	2021-11-22 09:15:08 +13:00
Rob BygraveandGitHub	0b529603c4	Merge pull request #2438 from FOCONIS/type-get-all-for-repeated-annotations FIX: typeGetAll did not work with repeated annotations on one class	2021-11-22 09:01:06 +13:00
Noemi Szemenyei	60d0a3da39	findMap() with beanCache should use idPoperty if mapKey = null	2021-11-19 11:53:37 +01:00
Noemi Szemenyei	1c224444c0	Assume InfoInherit infoType when it has no children	2021-11-16 13:44:53 +01:00
Jonas PöhlerandNoemi Szemenyei	d3e07defa0	FIX: Json deserialize references	2021-11-16 11:57:30 +01:00
Noemi Szemenyei	1b5d379ed3	Fix for Query with PathProperties (*,x(y))	2021-11-16 11:45:18 +01:00
Noemi Szemenyei	b90393a691	Unittest for select Query with (*,x(y))	2021-11-16 11:39:14 +01:00
Jonas PöhlerandNoemi Szemenyei	2d26740286	FIX: typeGetAll did not work with repeated annotations on one class	2021-11-16 11:24:22 +01:00
Rob Bygrave	5807874c9e	[maven-release-plugin] prepare for next development iteration	2021-11-04 11:19:32 +13:00
Rob Bygrave	ea7b4e8162	[maven-release-plugin] prepare release ebean-parent-12.13.0	2021-11-04 11:19:25 +13:00
Rob Bygrave	43742fdc0b	Bump version to 12.13.0-SNAPSHOT	2021-11-04 11:16:50 +13:00
Rob Bygrave	8ef71bd451	Bump version to 12.13.0-SNAPSHOT	2021-11-04 11:02:45 +13:00
Rob Bygrave	0f60e2240c	Bump version to 12.13.0-SNAPSHOT	2021-11-04 10:57:48 +13:00
Rob Bygrave	2cbb161ed5	Follow up to #2437 - Rename internal "dead/alive" to "replaced"	2021-11-04 10:40:04 +13:00
Rob BygraveandGitHub	a47caec85b	Merge pull request #2437 from FOCONIS/fix-persistence-context FIX: Subsequent findEach / findList does not work reliable [Fixes regression in 12.3.3]	2021-11-04 09:59:31 +13:00
Roland Praml	fd1b5f58bc	FIX: Subsequent findEach / findList does not work reliable (Regression of #2411 )	2021-11-03 11:34:04 +01:00
Michal Wysocki	39a4035f3b	Extra assertions for DBArray in `asDTO` and `sqlUpdate`	2021-11-02 13:25:42 +01:00
Rob Bygrave	0bb7d79015	Tidy build.yml	2021-10-28 22:40:10 +13:00
Rob BygraveandGitHub	9907cffe6e	Update README.md	2021-10-28 22:38:48 +13:00
Rob Bygrave	704a138ff0	Tidy build.yml and TestExtraScalarTypes	2021-10-28 22:34:55 +13:00
Rob Bygrave	f3cab4ee10	Merge branch 'master' of github.com:ebean-orm/ebean	2021-10-28 22:33:48 +13:00
Rob Bygrave	d507452d63	Fix test TestExtraScalarTypes for github workflows build	2021-10-28 22:33:28 +13:00
Rob BygraveandGitHub	893aa6cb1a	Update build.yml	2021-10-28 22:26:13 +13:00
Rob BygraveandGitHub	e92fd2ef06	Add github workflows build.yml	2021-10-28 22:19:24 +13:00
Rob BygraveandGitHub	bdad8b258a	Merge pull request #2427 from FOCONIS/bug-reload-fails-on-partial-beans FIX: When a bean is modified in persistence context and searched again, it will loose the change	2021-10-22 16:17:31 +13:00
Rob Bygrave	a6cdf8d6dc	Turn off nexus.staging.autoReleaseAfterClose	2021-10-22 10:52:16 +13:00
Rob Bygrave	e232c724c0	maven.deploy.skip test modules and fix agent versions	2021-10-22 10:49:57 +13:00
Roland Praml	d55023dbc7	FIX: When a bean is modified in persistence context and searched again, it will loose the change	2021-10-21 16:50:53 +02:00
Rob Bygrave	fa4e013692	[maven-release-plugin] prepare for next development iteration	2021-10-21 21:36:29 +13:00
Rob Bygrave	08502d7315	[maven-release-plugin] prepare release ebean-parent-12.12.3	2021-10-21 21:36:21 +13:00
Rob Bygrave	6f4bc0ac2c	Prepare release, comment out extra test modules	2021-10-21 21:33:16 +13:00
Rob Bygrave	5585866e82	Prepare release, comment out extra test modules	2021-10-21 14:07:27 +13:00
Rob Bygrave	f21f6d9592	Prepare release, comment out extra test modules	2021-10-21 13:54:39 +13:00
Rob Bygrave	03e0519951	Refactor tidy internals for DefaultServer, rename descriptorManager	2021-10-21 13:41:58 +13:00
Rob Bygrave	bc23d5829c	Refactor tidy internals for DefaultPersister, BeanDescriptorManager etc	2021-10-21 13:30:32 +13:00
Rob Bygrave	64108aac40	#2424 Preserve using PersistenceException when transaction register(Callback) called with no active transaction	2021-10-21 12:12:02 +13:00
Rob Bygrave	fcda419abb	#2424 Preserve using PersistenceException when transaction register(Callback) called with no active transaction	2021-10-21 12:06:45 +13:00
Rob Bygrave	4d34c9e868	#2424 Change error for transaction register(Callback) when no active transaction from PersistenceException to NullPointerException Ah ok, so in being more strict on null for currentTransaction() that shows up the code that registers transaction callbacks as checking for null and throwing PersistenceException. This is inconsistent with LOTS of other methods that use currentTransaction() and would result in NPE. The concept here is that PersistenceException for this case isn't better than NPE and NPE is actually more consistence wrt using currentTransaction().	2021-10-21 12:02:42 +13:00
Rob Bygrave	5178b76431	Update internals migrate from deprecated methods baseTable()	2021-10-20 20:07:54 +13:00
Rob Bygrave	8fb02662e6	#2423 Add @Nullable on single bean publish and restore by id	2021-10-20 20:06:59 +13:00
Rob Bygrave	1aac63771d	#2423 Tidy up DefaultServer internals getting descriptor	2021-10-20 19:58:11 +13:00
Rob Bygrave	3a138c3462	Tidy internals only - improve DefaultServer parameter names	2021-10-20 16:07:43 +13:00
Rob Bygrave	30088f4de7	#2423 Tidy up DefaultServer internals with Objects.requireNonNull()	2021-10-20 15:53:50 +13:00
Rob BygraveandGitHub	cc272bb950	Merge pull request #2423 from ebean-orm/feature/nonNullApi Use @NonNullApi to explicitly reflect non-null return types and params by default	2021-10-20 15:47:44 +13:00
Rob Bygrave	b3ee982b64	Use @NonNullApi to explicitly reflect non-null return types and params by default	2021-10-20 15:45:20 +13:00
Rob Bygrave	92a13ad265	Remove pom releaseBackup files that should not be there	2021-10-20 09:52:06 +13:00
Rob Bygrave	a445557ec3	#2422 - Remove extraneous jsr 305 @Nonnull	2021-10-19 17:59:25 +13:00
Rob Bygrave	c7bb027c7d	#2422 - Remove extraneous jsr 305 @Nonnull	2021-10-19 17:33:23 +13:00
Rob Bygrave	709eb369c9	#2419 - Add explicit @Nullable on findOne() methods	2021-10-19 12:12:11 +13:00
Rob Bygrave	5a4924b6cb	#2421 - Change database.diff() to return empty map rather than null with null bean argument	2021-10-19 11:58:29 +13:00
Rob Bygrave	a61c73c62a	#2418 #2420 BeanState.loadErrors() returns empty map Change Database.beanState() to throw IllegalArgumentException when bean isn't an entity bean	2021-10-19 11:52:36 +13:00
Rob Bygrave	7862648b83	#2419 - Add explicit @Nullable on findOne() methods	2021-10-19 11:50:22 +13:00
Rob Bygrave	fa252a1fe4	Javadoc for #2303 - bump to pgjdbc 42.3.0	2021-10-19 11:23:26 +13:00
Rob Bygrave	add7a8c4ba	Javadoc for #2303 - bump to pgjdbc 42.2.25 Noting that this version of pgjdbc has not been released yet. Guessing that this is the next release number.	2021-10-14 14:49:15 +13:00
Rob Bygrave	834c04bd33	Update Postgres test dependency only (#2303 )	2021-10-13 09:45:00 +13:00
Rob Bygrave	9bda4ab5c7	#2303 - Add javadoc for notes on Postgres with "allQuotedIdentifiers = true"	2021-10-13 09:37:40 +13:00
Rob Bygrave	d1ca7a30dc	Merge branch 'FOCONIS-tidy-remove-readjson-resetContext'	2021-10-12 15:11:35 +13:00
Rob Bygrave	cb67dd0f29	Merge branch 'tidy-remove-readjson-resetContext' of https://github.com/FOCONIS/ebean into FOCONIS-tidy-remove-readjson-resetContext	2021-10-12 15:11:23 +13:00
Rob Bygrave	e173f6e9a9	Tidy only DefaultPersistenceContext after merge of #2411	2021-10-12 15:10:36 +13:00
Rob BygraveandGitHub	349cd01921	Merge pull request #2411 from ebean-orm/feature/weak-reference-persistence-context Weak reference based persistence context for streaming queries	2021-10-12 14:39:47 +13:00
Rob BygraveandGitHub	8fa7fa6af3	Merge pull request #2413 from FOCONIS/feature/weak-reference-persistence-context Change DefaultPersistenceContect to use beginIterate / endIterate	2021-10-12 14:34:05 +13:00
Rob Bygrave	caf18565a0	[maven-release-plugin] prepare for next development iteration	2021-10-12 12:46:15 +13:00
Roland Praml	2f277938e5	Remove LoadContext.resetPersistenceContext	2021-10-11 17:48:09 +02:00
Roland Praml	5322ab3e7e	Remove: ReadJson.resetContext as it is not used	2021-10-11 17:22:33 +02:00
Roland Praml	100832ddd9	Changed test to test pc.beginIterate / endIterate	2021-10-11 17:16:34 +02:00
Roland Praml	3f5009aa91	Use WeakReferences when in iterate query mode	2021-10-11 16:25:21 +02:00
Roland Praml	8dbd290119	Remove: ReadJson.resetContext as it is not used	2021-10-11 13:40:03 +02:00
Rob Bygrave	ea3fb833a4	Weak reference based PersistenceContext for streaming queries	2021-10-11 22:48:18 +13:00