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

This allows it to be package private

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</version>
+    <version>12.13.1</version>
   </parent>
 
   <name>ebean api</name>

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

@@ -2,6 +2,8 @@ package io.ebean;
 
 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;
@@ -127,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).
    */

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

@@ -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)}.

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

@@ -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();
     }
   }

ebean-api/src/test/java/io/ebean/util/TestAnnotationUtil.java

@@ -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);
+
+  }
+
+}

ebean-autotune/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</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.13.0</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.13.0</version>
+      <version>12.13.1</version>
       <scope>provided</scope>
     </dependency>
 

ebean-bom/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</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.13.0</version>
+        <version>12.13.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.13.0</version>
+        <version>12.13.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.13.0</version>
+        <version>12.13.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.13.0</version>
+        <version>12.13.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.13.0</version>
+        <version>12.13.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.13.0</version>
+        <version>12.13.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.13.0</version>
+        <version>12.13.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.13.0</version>
+        <version>12.13.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.13.0</version>
+        <version>12.13.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.13.0</version>
+        <version>12.13.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.13.0</version>
+        <version>12.13.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.13.0</version>
+        <version>12.13.1</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.13.0</version>
+        <version>12.13.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.13.0</version>
+        <version>12.13.1</version>
       </dependency>
 
     </dependencies>

ebean-core-type/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</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.13.0</version>
+      <version>12.13.1</version>
     </dependency>
 
     <dependency>

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</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.13.0</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.13.0</version>
+      <version>12.13.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
     </dependency>
 
     <dependency>

ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java

@@ -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>

ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java

@@ -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.
    */

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java

@@ -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);

ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java

@@ -36,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;
@@ -259,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);
@@ -534,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);
@@ -562,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;
   }
@@ -634,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));
@@ -645,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;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java

@@ -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;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -208,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;
@@ -349,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() {
@@ -3011,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.
    *
@@ -3055,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.
    */

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java

@@ -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) {

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java

@@ -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();

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java

@@ -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()));
     }
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java

@@ -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

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java

@@ -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;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java

@@ -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() + "]");
     }

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DetermineManyType.java

@@ -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;
     }

ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java

@@ -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);

ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java

@@ -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;
   }

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java

@@ -14,6 +14,7 @@ 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;
@@ -148,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) {

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -586,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
@@ -1586,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;

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java

@@ -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);
   }
 
   /**

ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java

@@ -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());

ebean-core/src/main/java/io/ebeaninternal/server/type/JsonTrim.java

@@ -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;
       }

ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java

@@ -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>).

ebean-ddl-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</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.13.0</version>
+      <version>12.13.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>provided</scope>
     </dependency>
 

ebean-externalmapping-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</version>
+    <version>12.13.1</version>
   </parent>
 
   <name>ebean external mapping api</name>

ebean-externalmapping-xml/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</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.13.0</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.13.0</version>
+      <version>12.13.1</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-postgis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</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.13.0</version>
+      <version>12.13.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-querybean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</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.13.0</version>
+      <version>12.13.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -56,21 +56,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-redis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</version>
+    <version>12.13.1</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</version>
+    <version>12.13.1</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
     </dependency>
 
     <dependency>

ebean-test/src/test/java/io/ebean/DtoQueryTest.java

@@ -208,19 +208,33 @@ public class DtoQueryTest extends BaseTestCase {
 
     ResetBasicData.reset();
 
+    LoggedSql.start();
     List<Integer> ids = Arrays.asList(1, 2);
 
-    List<DCust> list = server().findDto(DCust.class, "select id, name from o_customer where id = any(?)")
+    List<DCust> list = DB.findDto(DCust.class, "select id, name from o_customer where id = any(?)")
       .setParameter(ids)
       .findList();
 
     assertThat(list).isNotEmpty();
 
-    list = server().findDto(DCust.class, "select id, name from o_customer where id in (:idList)")
+    List<DCust> list1 = DB.findDto(DCust.class, "select id, name from o_customer where id in (:idList)")
       .setParameter("idList", ids)
       .findList();
 
-    assertThat(list).isNotEmpty();
+    assertThat(list1).isNotEmpty();
+
+
+    List<DCust> list2 = DB.findDto(DCust.class, "select id, name from o_customer where id = any(:idList)")
+      .setArrayParameter("idList", ids)
+      .findList();
+
+    assertThat(list2).isNotEmpty();
+
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains(" id = any(?)");
+    assertThat(sql.get(1)).contains(" id in (?,?)");
+    assertThat(sql.get(2)).contains(" id = any(?)");
   }
 
   @ForPlatform(Platform.POSTGRES)

ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java

@@ -1,8 +1,11 @@
 package io.ebean.text;
 
+import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.FetchPath;
 import io.ebean.Query;
+import io.ebean.test.LoggedSql;
+
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +17,7 @@ import java.util.List;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class PathPropertiesTests {
+public class PathPropertiesTests extends BaseTestCase {
 
   private static final Logger log = LoggerFactory.getLogger(PathPropertiesTests.class);
 
@@ -212,4 +215,16 @@ public class PathPropertiesTests {
     String asJson = DB.json().toJson(list, pathProps);
     log.info("Json: {}", asJson);
   }
+  
+  @Test
+  public void test_withAllPropsQuery() {
+    PathProperties root = PathProperties.parse("*,billingAddress(line1)");
+    LoggedSql.start();
+    Query<Customer> query = DB.find(Customer.class).apply(root);
+    query.findList();
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.name, t0.smallnote, t0.anniversary, t0.cretime, t0.updtime, t0.version, t0.shipping_address_id, t1.id, t1.line_1 from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id;");
+  }
+
 }

ebean-test/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java

@@ -34,8 +34,10 @@ public class DtoMetaBuilderTest {
     Map<String, Method> methods = getIncludedMethodsFor(D0.class);
 
     assertThat(methods).hasSize(2);
-    assertThat(DtoMetaBuilder.propertyType(methods.get("setName"))).isEqualTo(String.class);
-    assertThat(DtoMetaBuilder.propertyType(methods.get("setId"))).isEqualTo(long.class);
+    assertThat(DtoMetaProperty.propertyClass(methods.get("setName"))).isEqualTo(String.class);
+    assertThat(DtoMetaProperty.propertyClass(methods.get("setId"))).isEqualTo(long.class);
+    assertThat(DtoMetaProperty.propertyType(methods.get("setName"))).isEqualTo(String.class);
+    assertThat(DtoMetaProperty.propertyType(methods.get("setId"))).isEqualTo(long.class);
   }
 
   @Test

ebean-test/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java

@@ -5,17 +5,59 @@ import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class JsonTrimTest {
+class JsonTrimTest {
 
   @Test
-  public void trim_array() {
+  void trim_array() {
     final String trimmed = JsonTrim.trim("[{\"name\": \"one\", \"along\": 1, \"timestamp\": 1629609021559}, {\"name\": \"two\", \"along\": 2, \"timestamp\": 1629609021559}]");
     assertThat(trimmed).isEqualTo("[{\"name\":\"one\",\"along\":1,\"timestamp\":1629609021559},{\"name\":\"two\",\"along\":2,\"timestamp\":1629609021559}]");
   }
 
   @Test
-  public void trim_object() {
+  void trim_object() {
     final String trimmed = JsonTrim.trim("{\"name\":  \"one\",\t \t \"along\": 1, \"timestamp\": 1629609021559}");
     assertThat(trimmed).isEqualTo("{\"name\":\"one\",\"along\":1,\"timestamp\":1629609021559}");
   }
+
+  @Test
+  void trim_object_embeddedEscapeSlash() {
+    final String trimmed = JsonTrim.trim("{\"a\":  \"o\\nf\",\t \t \n \"b\": 1}");
+    assertThat(trimmed).isEqualTo("{\"a\":\"o\\nf\",\"b\":1}");
+  }
+
+  @Test
+  void trim_escapedTabNewLine() {
+    final String trimmed = JsonTrim.trim("{\"a\":  \"o\\t\\nf\",\t \t \n \"b\": 1}");
+    assertThat(trimmed).isEqualTo("{\"a\":\"o\\t\\nf\",\"b\":1}");
+  }
+
+  @Test
+  void trim_leadingEscapedNewLine() {
+    final String trimmed = JsonTrim.trim("{\"a\":  \"\\no\\t\\nf\\n\",\t \t \n \"b\": 1}");
+    assertThat(trimmed).isEqualTo("{\"a\":\"\\no\\t\\nf\\n\",\"b\":1}");
+  }
+
+  @Test
+  void trim_trailingEscapedNewLine() {
+    final String trimmed = JsonTrim.trim("{\"a\":  \"o\\t\\nf\\n\",\t \t \n \"b\": 1}");
+    assertThat(trimmed).isEqualTo("{\"a\":\"o\\t\\nf\\n\",\"b\":1}");
+  }
+
+  @Test
+  void trim_trailingEscapedSlash() {
+    final String trimmed = JsonTrim.trim("{\"a\":  \"o\\t\\nf\\\\\",\t \t \n \"b\": 1}");
+    assertThat(trimmed).isEqualTo("{\"a\":\"o\\t\\nf\\\\\",\"b\":1}");
+  }
+
+  @Test
+  void trim_object_embeddedEscaped() {
+    final String trimmed = JsonTrim.trim("{\"name\":  \"one\nfoo\nbar\\bazz\tboo\",\t \t \n \"along\": 1}");
+    assertThat(trimmed).isEqualTo("{\"name\":\"one\nfoo\nbar\\bazz\tboo\",\"along\":1}");
+  }
+
+  @Test
+  void trim_escaped() {
+    final String trimmed = JsonTrim.trim(" \t \n {\"a\": \n \"\\t1\\t2\\n3\\\\\",\t \n \"b\": \"\\t1\\t2\\n3\\\\\" , \t \n \"c\": \"\\t1\\t2\\n3\\\\\" \t \n }");
+    assertThat(trimmed).isEqualTo("{\"a\":\"\\t1\\t2\\n3\\\\\",\"b\":\"\\t1\\t2\\n3\\\\\",\"c\":\"\\t1\\t2\\n3\\\\\"}");
+  }
 }

ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java

@@ -2,12 +2,18 @@ package org.tests.basic;
 
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
+import io.ebean.test.LoggedSql;
+
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Country;
+import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 
+import java.util.List;
 import java.util.Map;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestLoadBeanCache extends BaseTestCase {
@@ -31,4 +37,30 @@ public class TestLoadBeanCache extends BaseTestCase {
 
     assertTrue(loadedNz == nz);
   }
+  
+  @Test
+  public void testLoadWithFindMap() {
+
+    ResetBasicData.reset();
+    
+    List<Object> ids = DB.find(Customer.class).findIds();
+    assertEquals(ids.size(), 4);
+
+    DB.getDefault().pluginApi().cacheManager().clearAll();
+    
+    // hit database
+    LoggedSql.start();
+    DB.find(Customer.class).where().idIn(ids).findMap();
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    
+    // hit beanCache
+    LoggedSql.start();
+    DB.find(Customer.class).where().idIn(ids).findMap();
+    sql = LoggedSql.stop();
+    assertThat(sql).hasSize(0);
+
+  }
+  
+  
 }

ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java

@@ -4,7 +4,6 @@ import javax.persistence.Entity;
 import javax.persistence.Inheritance;
 
 @Entity
-@Inheritance
 public class Target1 extends TargetBase {
 
   public Target1(String name) {

ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java

@@ -3,6 +3,9 @@ package org.tests.lazyforeignkeys;
 import io.ebean.annotation.DbForeignKey;
 
 import javax.persistence.*;
+
+import org.tests.model.basic.Cat;
+
 import java.util.UUID;
 
 
@@ -22,6 +25,11 @@ public class MainEntityRelation {
   @JoinColumn(name = "id2")
   @DbForeignKey(noConstraint = true)
   private MainEntity entity2;
+  
+  @ManyToOne
+  @JoinColumn(name = "cat_id")
+  @DbForeignKey(noConstraint = true)
+  private Cat cat;
 
   private String attr1;
 
@@ -41,6 +49,14 @@ public class MainEntityRelation {
     this.entity2 = entity2;
   }
 
+  public Cat getCat() {
+    return cat;
+  }
+
+  public void setCat(Cat cat) {
+    this.cat = cat;
+  }
+
   public String getAttr1() {
     return attr1;
   }

ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java

@@ -8,6 +8,7 @@ import io.ebean.text.PathProperties;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.tests.model.basic.Cat;
 
 import java.util.List;
 
@@ -56,7 +57,7 @@ public class TestLazyForeignKeys extends BaseTestCase {
 
     List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(3);
-    assertSql(sql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2 from main_entity_relation");
+    assertSql(sql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2, t1.species, t0.cat_id from main_entity_relation t0 left join animal t1 on t1.id = t0.cat_id");
     if (isSqlServer() || isOracle()) {
       assertSql(sql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, CASE WHEN t0.id is null THEN 1 ELSE 0 END from main_entity t0");
     } else {
@@ -86,4 +87,17 @@ public class TestLazyForeignKeys extends BaseTestCase {
     assertFalse(rel1.getEntity1().isDeleted());
     assertTrue(rel1.getEntity2().isDeleted());
   }
+  
+  @Test
+  public void testGetWithDbForeignKey() {
+    MainEntityRelation relation = DB.find(MainEntityRelation.class).findOne();
+    Cat cat = new Cat();
+    cat.setId(123L);
+    relation.setCat(cat);
+    DB.save(relation);
+    
+    relation = DB.find(MainEntityRelation.class).findOne();
+    
+    assertNotNull(relation.getCat());
+  }
 }

ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java

@@ -1,9 +1,6 @@
 package org.tests.model.array;
 
-import io.ebean.BaseTestCase;
-import io.ebean.DB;
-import io.ebean.Query;
-import io.ebean.SqlRow;
+import io.ebean.*;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
@@ -272,4 +269,123 @@ public class TestDbArray_basic extends BaseTestCase {
     assertThat(found.getUids()).hasSameElementsAs(uids);
     assertThat(found.getStatuses()).hasSameElementsAs(statuses);
   }
+
+  @Test
+  @ForPlatform(Platform.POSTGRES)
+  public void asDto_withArray() {
+    DB.find(EArrayBean.class).delete();
+    bean.setName("array in dto test");
+
+    List<String> phNumbers = bean.getPhoneNumbers();
+    phNumbers.add("4321");
+    phNumbers.add("9823");
+    List<Double> doubs = bean.getDoubs();
+    doubs.add(1.23);
+    doubs.add(4.56);
+    DB.save(bean);
+    // Data is saved correctly
+
+    LoggedSql.start();
+    DtoQuery<EArrayBeanDto> query = DB.find(EArrayBean.class)
+      // Interestingly writing `select("id,name,phone_numbers,doubs")`
+      //   generates `select t0.id, t0.name, t0.id, t0.doubs`
+      //   surprisingly changing unknown property to id
+      .select("id,name,phoneNumbers,doubs")
+      .asDto(EArrayBeanDto.class)
+      // Shouldn't be necessary
+      // But without it I see error
+      //  Unable to map DB column phone_numbers to a property with a setter method on class org.tests.model.array.TestDbArray_basic$EArrayBeanDto
+      .setRelaxedMode();
+
+    List<EArrayBeanDto> dtos = query.findList();
+
+    List<String> sql = LoggedSql.stop();
+    assertSql(sql.get(0)).contains("select t0.id, t0.name, t0.phone_numbers, t0.doubs");
+
+    for (EArrayBeanDto dto : dtos) {
+      assertThat(dto.id).isNotNull();
+      assertThat(dto.name).isNotNull();
+      // Failure: null
+      assertThat(dto.phoneNumbers).isNotNull();
+      // Failure: null
+      assertThat(dto.doubs).isNotNull();
+    }
+  }
+
+  @Test
+  @ForPlatform(Platform.POSTGRES)
+  public void sqlUpdate_withArray() {
+    DB.find(EArrayBean.class).delete();
+    bean.setName("array in sql update test");
+    DB.save(bean);
+    // Data is saved correctly
+    List<String> phNumbers = new ArrayList<>();
+    phNumbers.add("4321");
+    phNumbers.add("9823");
+
+    LoggedSql.start();
+
+    // Positional param works
+    SqlUpdate update1 = DB.sqlUpdate("UPDATE earray_bean SET phone_numbers = ?")
+      .setParameter(1, phNumbers);
+    update1.execute();
+    System.out.println("done");
+
+    // Named param fails with
+    // javax.persistence.PersistenceException:
+    // ERROR: syntax error at or near "$2"
+    SqlUpdate update2 = DB.sqlUpdate("UPDATE earray_bean SET phone_numbers = :pns")
+      .setArrayParameter("pns", phNumbers);
+    update2.execute();
+
+    found = DB.find(EArrayBean.class, bean.getId());
+    System.out.println(found);
+    assertEquals("array in sql update test", found.getName());
+    assertThat(found.getPhoneNumbers()).containsExactly("4321", "9823");
+  }
+
+  public static class EArrayBeanDto {
+
+    Integer id;
+    List<String> phoneNumbers;
+    List<Double> doubs;
+    String name;
+
+    @Override
+    public String toString() {
+      return "id:" + id + " name:" + name + " phoneNumbers:" + phoneNumbers + " doubs:" + doubs;
+    }
+
+    public Integer getId() {
+      return id;
+    }
+
+    public void setId(Integer id) {
+      this.id = id;
+    }
+
+    public String getName() {
+      return name;
+    }
+
+    public void setName(String name) {
+      this.name = name;
+    }
+
+    public List<String> getPhoneNumbers() {
+      return phoneNumbers;
+    }
+
+    public void setPhoneNumbers(List<String> phoneNumbers) {
+      this.phoneNumbers = phoneNumbers;
+    }
+
+    public List<Double> getDoubs() {
+      return doubs;
+    }
+
+    public void setDoubs(List<Double> doubs) {
+      this.doubs = doubs;
+    }
+  }
 }

ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java

@@ -6,18 +6,19 @@ import io.ebean.Transaction;
 import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestIdClassScalar extends BaseTestCase {
+class TestIdClassScalar extends BaseTestCase {
 
-  private BUser user = new BUser("Fiona");
-  private BSite site = new BSite("avaje.io");
+  private final BUser user = new BUser("Fiona");
+  private final BSite site = new BSite("avaje.io");
 
   @Test
-  public void testBEmbId_equalsHashcode() {
+  void testBEmbId_equalsHashcode() {
 
     BEmbId a = new BEmbId(UUID.randomUUID(), UUID.randomUUID());
     BEmbId b = new BEmbId(a.getSiteId(), a.getUserId());
@@ -35,13 +36,11 @@ public class TestIdClassScalar extends BaseTestCase {
     assertThat(a).isNotEqualTo(d);
     assertThat(a.hashCode()).isNotEqualTo(d.hashCode());
 
-
     assertThat(a.hashCode()).isEqualTo(a.otherHash());
-
   }
 
   @Test
-  public void fetchMany() {
+  void fetchMany() {
     UUID siteId = UUID.randomUUID();
     UUID userId = UUID.randomUUID();
 
@@ -59,7 +58,7 @@ public class TestIdClassScalar extends BaseTestCase {
   }
 
   @Test
-  public void insertBatch() {
+  void insertBatch() {
     UUID siteId = UUID.randomUUID();
     UUID userId = UUID.randomUUID();
 
@@ -81,11 +80,9 @@ public class TestIdClassScalar extends BaseTestCase {
   }
 
   @Test
-  public void test() {
-
+  void test() {
     DB.save(user);
     DB.save(site);
-
     insertUpdateBridgeD(user, site);
     insertUpdateBridgeE(user, site);
   }
@@ -94,7 +91,6 @@ public class TestIdClassScalar extends BaseTestCase {
    * Test where matching by db column naming convention.
    */
   private void insertUpdateBridgeD(BUser user, BSite site) {
-
     LoggedSql.start();
 
     BSiteUserD access = new BSiteUserD(BAccessLevel.ONE, site.id, user.id);
@@ -139,7 +135,6 @@ public class TestIdClassScalar extends BaseTestCase {
    * Test where matching by db column naming convention.
    */
   private void insertUpdateBridgeE(BUser user, BSite site) {
-
     LoggedSql.start();
 
     BSiteUserE access = new BSiteUserE(BAccessLevel.ONE, site, user);
@@ -181,4 +176,47 @@ public class TestIdClassScalar extends BaseTestCase {
     assertSql(sql.get(1)).contains("update bsite_user_e set access_level=? where site_id=? and user_id=?");
 
   }
+
+  @Test
+  void idClass_existsQuery() {
+    BUser user = new BUser("JunkUser2");
+    BSite site = new BSite("JunkSite2");
+    BSiteUserE access = new BSiteUserE(BAccessLevel.ONE, site, user);
+
+    DB.save(user);
+    DB.save(site);
+    DB.save(access);
+
+    boolean exists = DB.find(BSiteUserE.class)
+      .where().eq("user.id", user.id)
+      .exists();
+
+    assertThat(exists).isTrue();
+    assertThat(DB.find(BSiteUserE.class).where().eq("user.id", user.id).findCount()).isEqualTo(1);
+
+    DB.delete(access);
+    DB.deleteAll(Arrays.asList(user, site));
+  }
+
+  @Test
+  void idClass_existsQuery_scalarImportedProperties() {
+    BUser user = new BUser("JunkUser3");
+    BSite site = new BSite("JunkSite3");
+    DB.save(user);
+    DB.save(site);
+
+    BSiteUserD access = new BSiteUserD(BAccessLevel.ONE, site.id, user.id);
+    DB.save(access);
+
+    boolean exists = DB.find(BSiteUserD.class)
+      .where().eq("userId", user.id)
+      .exists();
+
+    assertThat(exists).isTrue();
+    assertThat(DB.find(BSiteUserD.class).where().eq("userId", user.id).findCount()).isEqualTo(1);
+
+    DB.delete(access);
+    DB.deleteAll(Arrays.asList(user, site));
+  }
+
 }

ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java

@@ -10,11 +10,10 @@ import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestElementCollectionBasicSet extends BaseTestCase {
+class TestElementCollectionBasicSet extends BaseTestCase {
 
   @Test
-  public void test() {
-
+  void test() {
     LoggedSql.start();
 
     EcsPerson person = new EcsPerson("Fiona021");
@@ -172,8 +171,7 @@ public class TestElementCollectionBasicSet extends BaseTestCase {
   }
 
   @Test
-  public void json() {
-
+  void json() {
     EcsPerson person = new EcsPerson("Fiona021");
     person.getPhoneNumbers().add("021 1234");
     person.getPhoneNumbers().add("021 4321");

ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java

@@ -47,15 +47,10 @@ public class TestTextJsonReferenceBean extends BaseTestCase {
       prodDesc.isReference(eb._ebean_getIntercept());
 
       BeanState beanState = DB.beanState(refProd);
-      assertTrue(beanState.isNew());
+      assertTrue(beanState.isReference());
 
       String name = refProd.getName();
-      assertNull(name);
-
-      // Set to be 'loaded' to invoke lazy loading
-      beanState.setLoaded();
-      String name2 = refProd.getName();
-      assertNotNull(name2);
+      assertNotNull(name);
     }
 
     List<Order> orders = DB.find(Order.class)

ebean-test/src/test/resources/ebean.properties

@@ -25,7 +25,7 @@ ebean.packages=org.tests,org.etest
 datasource.default=h2
 #datasource.h2.capturestacktrace=true
 
-ebean.dumpMetricsOnShutdown=true
+#ebean.dumpMetricsOnShutdown=true
 ebean.dumpMetricsOptions=sql,hash,loc
 #ebean.queryPlan.thresholdMicros=1000
 ebean.queryPlan.enable=true

ebean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</version>
+    <version>12.13.1</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
     </dependency>
 
   </dependencies>

kotlin-querybean-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</version>
+    <version>12.13.1</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.13.0</version>
+      <version>12.13.1</version>
       <scope>test</scope>
     </dependency>
 

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.13.0</version>
+  <version>12.13.1</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.13.0</tag>
+    <tag>ebean-parent-12.13.1</tag>
   </scm>
 
   <licenses>

querybean-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.0</version>
+    <version>12.13.1</version>
   </parent>
 
   <name>querybean generator</name>