diff --git a/src/main/java/io/ebean/common/AbstractBeanCollection.java b/src/main/java/io/ebean/common/AbstractBeanCollection.java
index 33f05fb89..25001b91b 100644
--- a/src/main/java/io/ebean/common/AbstractBeanCollection.java
+++ b/src/main/java/io/ebean/common/AbstractBeanCollection.java
@@ -219,7 +219,6 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
 
   /**
    * Copies all relevant properties for a clone. See {@link #getShallowCopy()}
-   * @param other
    */
   protected void setFromOriginal(AbstractBeanCollection<E> other) {
     this.disableLazyLoad = other.disableLazyLoad;
diff --git a/src/main/java/io/ebean/config/PlatformConfig.java b/src/main/java/io/ebean/config/PlatformConfig.java
index 2aa48c3f0..d06868d1b 100644
--- a/src/main/java/io/ebean/config/PlatformConfig.java
+++ b/src/main/java/io/ebean/config/PlatformConfig.java
@@ -77,6 +77,9 @@ public class PlatformConfig {
     this.geometrySRID = platformConfig.geometrySRID;
     this.dbUuid = platformConfig.dbUuid;
     this.caseSensitiveCollation = platformConfig.caseSensitiveCollation;
+    this.allQuotedIdentifiers = platformConfig.allQuotedIdentifiers;
+    this.databaseInetAddressVarchar = platformConfig.databaseInetAddressVarchar;
+    this.customDbTypeMappings = platformConfig.customDbTypeMappings;
   }
 
   /**
diff --git a/src/main/java/io/ebean/plugin/BeanType.java b/src/main/java/io/ebean/plugin/BeanType.java
index bb487de35..e11aa32a0 100644
--- a/src/main/java/io/ebean/plugin/BeanType.java
+++ b/src/main/java/io/ebean/plugin/BeanType.java
@@ -223,7 +223,6 @@ public interface BeanType<T> {
 
   /**
    * Visit all children recursively
-   * @param visitor
    */
   void visitAllInheritanceChildren(Consumer<BeanType<?>> visitor);
 
diff --git a/src/main/java/io/ebeaninternal/api/BindParams.java b/src/main/java/io/ebeaninternal/api/BindParams.java
index 4188b20b2..5490164e3 100644
--- a/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -115,10 +115,10 @@ public class BindParams implements Serializable {
    * Return a Natural Key bind param if supported.
    */
   public NaturalKeyBindParam getNaturalKeyBindParam() {
-    if (positionedParameters != null) {
+    if (!positionedParameters.isEmpty()) {
       return null;
     }
-    if (namedParameters != null && namedParameters.size() == 1) {
+    if (namedParameters.size() == 1) {
       Entry<String, Param> e = namedParameters.entrySet().iterator().next();
       return new NaturalKeyBindParam(e.getKey(), e.getValue().getInValue());
     }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 0b958a291..ff6745913 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -134,7 +134,7 @@ public class BaseTableDdl implements TableDdl {
         if (defaultValue == null) {
           handleStrictError(tableName, columnName);
         }
-        before = Arrays.asList(platformDdl.getUpdateNullWithDefault());
+        before = Collections.singletonList(platformDdl.getUpdateNullWithDefault());
       } else {
         before = getScriptsForPlatform(alter.getBefore(), platformDdl.getPlatform().getName());
       }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
index e37ca0377..811bad5c9 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
@@ -150,7 +150,7 @@ public class CurrentModel {
       List<DdlScript> ddlScript = extraDdl.getDdlScript();
       for (DdlScript script : ddlScript) {
         if (script.isInit() && ExtraDdlXmlReader.matchPlatform(server.getDatabasePlatform().getName(), script.getPlatforms())) {
-          ddl.append(prefix + script.getName()).append('\n');
+          ddl.append(prefix).append(script.getName()).append('\n');
           ddl.append(script.getValue());
         }
       }
diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
index c80281472..62eafd3e3 100644
--- a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
+++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
@@ -769,7 +769,7 @@ public class MTable {
           nullableColumns.add(columnName);
         }
       }
-      uniq.setNullableColumns(nullableColumns.toArray(new String[nullableColumns.size()]));
+      uniq.setNullableColumns(nullableColumns.toArray(new String[0]));
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
index c9a47fb90..7822f5aed 100644
--- a/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java
@@ -100,7 +100,7 @@ public final class RelationalQueryRequest extends AbstractSqlQueryRequest {
     for (int i = 1; i < columnsPlusOne; i++) {
       propNames.add(metaData.getColumnLabel(i));
     }
-    return propNames.toArray(new String[propNames.size()]);
+    return propNames.toArray(new String[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
index 89525901f..544f72297 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java
@@ -39,7 +39,7 @@ public final class BeanDescriptorDraftHelp<T> {
       }
     }
 
-    return list.toArray(new BeanProperty[list.size()]);
+    return list.toArray(new BeanProperty[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
index 0d525bb81..d563bf065 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java
@@ -142,7 +142,7 @@ class BeanLifecycleAdapterFactory {
    * Utility method to covert List of Method into array (because we care about performance here).
    */
   static Method[] toArray(List<Method> methodList) {
-    return methodList.toArray(new Method[methodList.size()]);
+    return methodList.toArray(new Method[0]);
   }
 
   static RuntimeException unwrapException(ReflectiveOperationException e) {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 90a72710a..05854d937 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -683,7 +683,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
       }
     }
 
-    return list.toArray(new ExportedProperty[list.size()]);
+    return list.toArray(new ExportedProperty[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 1e23e340b..c2cc6c843 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -582,7 +582,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
       }
     }
 
-    return list.toArray(new ExportedProperty[list.size()]);
+    return list.toArray(new ExportedProperty[0]);
   }
 
   /**
@@ -769,10 +769,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
       writeJson.writeNullField(name);
 
     } else {
-      if (writeJson.isParentBean(value)) {
-        // bi-directional and already rendered parent
-
-      } else {
+      if (!writeJson.isParentBean(value)) {
         // Hmmm, not writing complex non-entity bean
         if (value instanceof EntityBean) {
           writeJson.beginAssocOne(name, bean);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
index db79a24e7..404336aca 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java
@@ -44,7 +44,7 @@ public class ChainedBeanPersistController implements BeanPersistController {
    */
   public ChainedBeanPersistController(List<BeanPersistController> list) {
     this.list = list;
-    BeanPersistController[] c = list.toArray(new BeanPersistController[list.size()]);
+    BeanPersistController[] c = list.toArray(new BeanPersistController[0]);
     Arrays.sort(c, SORTER);
     this.chain = c;
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
index 6879320b1..b92aa4ec7 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java
@@ -50,7 +50,7 @@ public class ChainedBeanPersistListener implements BeanPersistListener {
    */
   public ChainedBeanPersistListener(List<BeanPersistListener> list) {
     this.list = list;
-    this.chain = list.toArray(new BeanPersistListener[list.size()]);
+    this.chain = list.toArray(new BeanPersistListener[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
index 123bed237..e9ba81c95 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java
@@ -19,7 +19,7 @@ public class ChainedBeanPostConstructListener implements BeanPostConstructListen
    */
   public ChainedBeanPostConstructListener(List<BeanPostConstructListener> list) {
     this.list = list;
-    this.chain = list.toArray(new BeanPostConstructListener[list.size()]);
+    this.chain = list.toArray(new BeanPostConstructListener[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
index 38a26159f..9da1fdd66 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java
@@ -19,7 +19,7 @@ public class ChainedBeanPostLoad implements BeanPostLoad {
    */
   public ChainedBeanPostLoad(List<BeanPostLoad> list) {
     this.list = list;
-    this.chain = list.toArray(new BeanPostLoad[list.size()]);
+    this.chain = list.toArray(new BeanPostLoad[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
index d96e69727..15501ef0e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java
@@ -24,7 +24,7 @@ public class ChainedBeanQueryAdapter implements BeanQueryAdapter {
    */
   public ChainedBeanQueryAdapter(List<BeanQueryAdapter> list) {
     this.list = list;
-    BeanQueryAdapter[] c = list.toArray(new BeanQueryAdapter[list.size()]);
+    BeanQueryAdapter[] c = list.toArray(new BeanQueryAdapter[0]);
     Arrays.sort(c, SORTER);
     this.chain = c;
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
index 8e7b10fc2..e521dfbf3 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
@@ -78,7 +78,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
    */
   public static ImportedIdSimple[] sort(List<ImportedIdSimple> list) {
 
-    ImportedIdSimple[] importedIds = list.toArray(new ImportedIdSimple[list.size()]);
+    ImportedIdSimple[] importedIds = list.toArray(new ImportedIdSimple[0]);
 
     // sort into the same order as the BeanProperties
     Arrays.sort(importedIds, COMPARATOR);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 15f9e9723..01ceca31a 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -561,7 +561,7 @@ public class DeployBeanDescriptor<T> {
     if (indexDefinitions == null) {
       return null;
     } else {
-      return indexDefinitions.toArray(new IndexDefinition[indexDefinitions.size()]);
+      return indexDefinitions.toArray(new IndexDefinition[0]);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index 1e1f35989..8475af9fc 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -284,7 +284,7 @@ public class DeployBeanPropertyLists {
    * properties).
    */
   public BeanProperty[] getBaseScalar() {
-    return baseScalar.toArray(new BeanProperty[baseScalar.size()]);
+    return baseScalar.toArray(new BeanProperty[0]);
   }
 
   public BeanProperty getId() {
@@ -292,11 +292,11 @@ public class DeployBeanPropertyLists {
   }
 
   public BeanProperty[] getNonTransients() {
-    return nonTransients.toArray(new BeanProperty[nonTransients.size()]);
+    return nonTransients.toArray(new BeanProperty[0]);
   }
 
   public BeanProperty[] getTransients() {
-    return transients.toArray(new BeanProperty[transients.size()]);
+    return transients.toArray(new BeanProperty[0]);
   }
 
   public BeanProperty getVersionProperty() {
@@ -304,23 +304,23 @@ public class DeployBeanPropertyLists {
   }
 
   public BeanProperty[] getLocal() {
-    return local.toArray(new BeanProperty[local.size()]);
+    return local.toArray(new BeanProperty[0]);
   }
 
   public BeanProperty[] getMutable() {
-    return mutable.toArray(new BeanProperty[mutable.size()]);
+    return mutable.toArray(new BeanProperty[0]);
   }
 
   public BeanPropertyAssocOne<?>[] getEmbedded() {
-    return embedded.toArray(new BeanPropertyAssocOne[embedded.size()]);
+    return embedded.toArray(new BeanPropertyAssocOne[0]);
   }
 
   public BeanPropertyAssocOne<?>[] getOneImported() {
-    return onesImported.toArray(new BeanPropertyAssocOne[onesImported.size()]);
+    return onesImported.toArray(new BeanPropertyAssocOne[0]);
   }
 
   public BeanPropertyAssocOne<?>[] getOnes() {
-    return ones.toArray(new BeanPropertyAssocOne[ones.size()]);
+    return ones.toArray(new BeanPropertyAssocOne[0]);
   }
 
   public BeanPropertyAssocOne<?>[] getOneExportedSave() {
@@ -340,11 +340,11 @@ public class DeployBeanPropertyLists {
   }
 
   public BeanProperty[] getNonMany() {
-    return nonManys.toArray(new BeanProperty[nonManys.size()]);
+    return nonManys.toArray(new BeanProperty[0]);
   }
 
   public BeanPropertyAssocMany<?>[] getMany() {
-    return manys.toArray(new BeanPropertyAssocMany[manys.size()]);
+    return manys.toArray(new BeanPropertyAssocMany[0]);
   }
 
   public BeanPropertyAssocMany<?>[] getManySave() {
@@ -397,7 +397,7 @@ public class DeployBeanPropertyLists {
         list.add(prop);
       }
     }
-    return list.toArray(new BeanProperty[list.size()]);
+    return list.toArray(new BeanProperty[0]);
   }
 
   /**
@@ -412,7 +412,7 @@ public class DeployBeanPropertyLists {
         list.add(prop);
       }
     }
-    return list.toArray(new BeanProperty[list.size()]);
+    return list.toArray(new BeanProperty[0]);
   }
 
   /**
@@ -443,7 +443,7 @@ public class DeployBeanPropertyLists {
       }
     }
 
-    return (BeanPropertyAssocOne[]) list.toArray(new BeanPropertyAssocOne[list.size()]);
+    return (BeanPropertyAssocOne[]) list.toArray(new BeanPropertyAssocOne[0]);
   }
 
   private BeanPropertyAssocMany<?>[] getMany2Many() {
@@ -454,7 +454,7 @@ public class DeployBeanPropertyLists {
       }
     }
 
-    return (BeanPropertyAssocMany[]) list.toArray(new BeanPropertyAssocMany[list.size()]);
+    return (BeanPropertyAssocMany[]) list.toArray(new BeanPropertyAssocMany[0]);
   }
 
   private BeanPropertyAssocMany<?>[] getMany(Mode mode) {
@@ -476,7 +476,7 @@ public class DeployBeanPropertyLists {
       }
     }
 
-    return (BeanPropertyAssocMany[]) list.toArray(new BeanPropertyAssocMany[list.size()]);
+    return (BeanPropertyAssocMany[]) list.toArray(new BeanPropertyAssocMany[0]);
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
index 3161e0dfc..a63f60531 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
@@ -106,7 +106,7 @@ public class DeployTableJoin {
    * Return the join columns.
    */
   public DeployTableJoinColumn[] columns() {
-    return columns.toArray(new DeployTableJoinColumn[columns.size()]);
+    return columns.toArray(new DeployTableJoinColumn[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 1932970fe..a136dadb8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -189,7 +189,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
 
   private void checkForNoConstraint(DeployBeanPropertyAssocOne<?> prop, JoinColumn joinColumn) {
     ForeignKey foreignKey = joinColumn.foreignKey();
-    if (foreignKey != null && foreignKey.value() == ConstraintMode.NO_CONSTRAINT) {
+    if (foreignKey.value() == ConstraintMode.NO_CONSTRAINT) {
       prop.setForeignKey(new PropertyForeignKey());
     }
   }
diff --git a/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java
index 271af5c47..93b17b708 100644
--- a/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java
@@ -58,13 +58,12 @@ public class ElPropertyChainBuilder {
    * Build the immutable ElGetChain from the build information.
    */
   public ElPropertyChain build() {
-    return new ElPropertyChain(containsMany, embedded, expression, chain.toArray(new ElPropertyValue[chain.size()]));
+    return new ElPropertyChain(containsMany, embedded, expression, chain.toArray(new ElPropertyValue[0]));
   }
 
   /**
    * Permits to set whole chain as embedded when the leaf is embedded
-   * @param embedded
-     */
+   */
   public void setEmbedded(boolean embedded) {
     this.embedded = embedded;
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
index 0b3bd28b3..25b914f8c 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
@@ -352,7 +352,7 @@ public final class BatchControl {
    * Return the BatchedBeanHolder's ready for sorting and executing.
    */
   private BatchedBeanHolder[] getBeanHolderArray() {
-    return beanHoldMap.values().toArray(new BatchedBeanHolder[beanHoldMap.size()]);
+    return beanHoldMap.values().toArray(new BatchedBeanHolder[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
index 6b5eb26dd..58b80d766 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java
@@ -114,7 +114,7 @@ public class BatchedPstmtHolder {
     // the flush may get called recursively in executeBatch/postExecute.
     // which leads that we process stmtMap.values() twice in the loop.
     // So we copy the values, that we want to flush and clear it immediately.
-    BatchedPstmt[] values = stmtMap.values().toArray(new BatchedPstmt[stmtMap.values().size()]);
+    BatchedPstmt[] values = stmtMap.values().toArray(new BatchedPstmt[0]);
     clear();
 
     for (BatchedPstmt bs : values) {
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java
index 0f149ac76..44b9a201e 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java
@@ -20,7 +20,7 @@ public class BindableEmbedded implements Bindable {
 
   public BindableEmbedded(BeanPropertyAssocOne<?> embProp, List<Bindable> bindList) {
     this.embProp = embProp;
-    this.items = bindList.toArray(new Bindable[bindList.size()]);        //this.props = propList.toArray(new BeanProperty[propList.size()]);
+    this.items = bindList.toArray(new Bindable[0]);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java
index 2c76a1c52..e09e9e706 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java
@@ -17,7 +17,7 @@ public class BindableList implements Bindable {
   private final Bindable[] items;
 
   public BindableList(List<Bindable> list) {
-    items = list.toArray(new Bindable[list.size()]);
+    items = list.toArray(new Bindable[0]);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 438e8033b..8fa4bc712 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -452,7 +452,7 @@ class CQueryBuilder {
         }
       }
 
-      RawSql rawSql = RawSqlBuilder.resultSet(resultSet, propertyNames.toArray(new String[propertyNames.size()]));
+      RawSql rawSql = RawSqlBuilder.resultSet(resultSet, propertyNames.toArray(new String[0]));
       query.setRawSql(rawSql);
       return createRawSqlSqlTree(request, predicates);
 
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
index cb5ae732e..2d87d37ef 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
@@ -101,7 +101,7 @@ class DefaultDbSqlContext implements DbSqlContext {
       return null;
     }
 
-    return encryptedProps.toArray(new BeanProperty[encryptedProps.size()]);
+    return encryptedProps.toArray(new BeanProperty[0]);
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 8d15d0085..0e5891dad 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -719,7 +719,7 @@ public final class SqlTreeBuilder {
           extras.add(predProp);
         }
       }
-      return extras.toArray(new String[extras.size()]);
+      return extras.toArray(new String[0]);
     }
 
   }
diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
index d36a0f2cd..face5d463 100644
--- a/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
+++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
@@ -61,7 +61,7 @@ public class SqlTreeProperties {
   }
 
   public STreeProperty[] getProps() {
-    return propsList.toArray(new STreeProperty[propsList.size()]);
+    return propsList.toArray(new STreeProperty[0]);
   }
 
   boolean isPartialObject() {
diff --git a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
index 92e3e1078..2ee3b354d 100644
--- a/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
+++ b/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java
@@ -49,7 +49,7 @@ final class DRawSqlColumnsParser {
           tmp.add(aSplit.trim());
         }
       }
-      split = tmp.toArray(new String[tmp.size()]);
+      split = tmp.toArray(new String[0]);
     }
 
     if (split.length == 0) {
diff --git a/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java b/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java
index 4db3da3b7..9b7ab4127 100644
--- a/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java
+++ b/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java
@@ -233,7 +233,7 @@ public class CsvUtilReader {
       }
     } while (inQuotes);
     tokensOnThisLine.add(sb.toString().trim());
-    return tokensOnThisLine.toArray(new String[tokensOnThisLine.size()]);
+    return tokensOnThisLine.toArray(new String[0]);
   }
 
   /**