Simple fixes (#976)

* Should be only the really simple stuff.
* Final cleanups.

src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java

@@ -31,11 +31,8 @@ public class AutoTuneXmlReader {
     if (!file.exists()) {
       return new Autotune();
     }
-    FileInputStream is = new FileInputStream(file);
-    try {
+    try (FileInputStream is = new FileInputStream(file)) {
       return read(is);
-    } finally {
-      is.close();
     }
   }
 

src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java

@@ -276,7 +276,7 @@ public class DefaultServerCache implements ServerCache {
     long trimmedByTTL = 0;
     long trimmedByLRU = 0;
 
-    ArrayList<CacheEntry> activeList = new ArrayList<>();
+    ArrayList<CacheEntry> activeList = new ArrayList<>(map.size());
 
     long idleExpire = System.currentTimeMillis() - (maxIdleSecs * 1000);
     long ttlExpire = System.currentTimeMillis() - (maxSecsToLive * 1000);

src/main/java/io/ebeaninternal/server/core/DefaultContainer.java

@@ -270,10 +270,8 @@ public class DefaultContainer implements SpiContainer {
       return null;
     }
 
-    DataSource ds;
-
     if (config.getDataSourceJndiName() != null) {
-      ds = jndiDataSourceFactory.lookup(config.getDataSourceJndiName());
+      DataSource ds = jndiDataSourceFactory.lookup(config.getDataSourceJndiName());
       if (ds == null) {
         throw new PersistenceException("JNDI lookup for DataSource " + config.getDataSourceJndiName() + " returned null.");
       } else {

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

@@ -309,13 +309,10 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
   }
 
   public void findEach(Consumer<T> consumer) {
-    QueryIterator<T> it = queryEngine.findIterate(this);
-    try {
+    try (QueryIterator<T> it = queryEngine.findIterate(this)) {
       while (it.hasNext()) {
         consumer.accept(it.next());
       }
-    } finally {
-      it.close();
     }
   }
 

src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java

@@ -736,7 +736,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   @Override
   public final void checkRowCount(int rowCount) {
     if (ConcurrencyMode.VERSION == concurrencyMode && rowCount != 1) {
-      String m = Message.msg("persist.conc2", "" + rowCount);
+      String m = Message.msg("persist.conc2", String.valueOf(rowCount));
       throw new OptimisticLockException(m, null, bean);
     }
     switch (type) {

src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java

@@ -138,10 +138,10 @@ public final class RelationalQueryRequest {
    */
   private String[] getPropertyNames() throws SQLException {
 
-    ArrayList<String> propNames = new ArrayList<>();
     ResultSetMetaData metaData = resultSet.getMetaData();
 
     int columnsPlusOne = metaData.getColumnCount() + 1;
+    ArrayList<String> propNames = new ArrayList<>(columnsPlusOne - 1);
     for (int i = 1; i < columnsPlusOne; i++) {
       propNames.add(metaData.getColumnLabel(i));
     }

src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -817,9 +817,8 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   /**
    * Return the bean change for a delete.
    */
-  @SuppressWarnings("unchecked")
   private BeanChange deleteBeanChange(PersistRequestBean<T> request) {
-    return newBeanChange(request.getBeanId(), ChangeType.DELETE, Collections.EMPTY_MAP);
+    return newBeanChange(request.getBeanId(), ChangeType.DELETE, Collections.<String, ValuePair>emptyMap());
   }
 
   /**
@@ -2153,7 +2152,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
 
     if (propertyDeploy && chain != null) {
       ElPropertyDeploy fk = elDeployCache.get(propName);
-      if (fk != null && fk instanceof BeanFkeyProperty) {
+      if (fk instanceof BeanFkeyProperty) {
         // propertyDeploy chain for foreign key column
         return ((BeanFkeyProperty) fk).create(chain.getExpression(), chain.isContainsMany());
       }

src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java

@@ -296,11 +296,12 @@ final class BeanDescriptorCacheHelp<T> {
 
     BeanDescriptor<?> targetDescriptor = many.getTargetDescriptor();
 
-    List<Object> idList = new ArrayList<>();
     Collection<?> actualDetails = BeanCollectionUtil.getActualEntries(details);
     if (actualDetails == null) {
       return null;
     }
+
+    List<Object> idList = new ArrayList<>(actualDetails.size());
     for (Object bean : actualDetails) {
       idList.add(targetDescriptor.getId((EntityBean) bean));
     }

src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java

@@ -567,7 +567,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
   private void checkForValidEmbeddedId(BeanDescriptor<?> d) {
     IdBinder idBinder = d.getIdBinder();
-    if (idBinder != null && idBinder instanceof IdBinderEmbedded) {
+    if (idBinder instanceof IdBinderEmbedded) {
       IdBinderEmbedded embId = (IdBinderEmbedded) idBinder;
       BeanDescriptor<?> idBeanDescriptor = embId.getIdBeanDescriptor();
       Class<?> idType = idBeanDescriptor.getBeanType();
@@ -886,7 +886,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
       // get the target type short name
       String targetType = prop.getTargetType().getName();
-      String shortTypeName = targetType.substring(targetType.lastIndexOf(".") + 1);
+      String shortTypeName = targetType.substring(targetType.lastIndexOf('.') + 1);
 
       // name includes (probably ends with) the target type short name?
       int p = name.indexOf(shortTypeName);

src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java

@@ -360,7 +360,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
 
   private ImportedIdSimple[] createImportedList(BeanPropertyAssoc<?> owner, TableJoinColumn[] cols, BeanProperty[] props, BeanProperty[] others) {
 
-    ArrayList<ImportedIdSimple> list = new ArrayList<>();
+    ArrayList<ImportedIdSimple> list = new ArrayList<>(cols.length);
 
     for (TableJoinColumn col : cols) {
       list.add(createImportedScalar(owner, col, props, others));

src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java

@@ -29,8 +29,7 @@ public class ChainedBeanPostConstructListener implements BeanPostConstructListen
     if (list.contains(c)) {
       return this;
     } else {
-      List<BeanPostConstructListener> newList = new ArrayList<>();
-      newList.addAll(list);
+      List<BeanPostConstructListener> newList = new ArrayList<>(list);
       newList.add(c);
 
       return new ChainedBeanPostConstructListener(newList);
@@ -44,8 +43,7 @@ public class ChainedBeanPostConstructListener implements BeanPostConstructListen
     if (!list.contains(c)) {
       return this;
     } else {
-      ArrayList<BeanPostConstructListener> newList = new ArrayList<>();
-      newList.addAll(list);
+      ArrayList<BeanPostConstructListener> newList = new ArrayList<>(list);
       newList.remove(c);
 
       return new ChainedBeanPostConstructListener(newList);

src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java

@@ -53,7 +53,7 @@ public class DeployDocPropertyOptions {
   }
 
   private void setNullValue(String value) {
-    if (!value.equals("")) {
+    if (!value.isEmpty()) {
       mapping.setNullValue(value);
     }
   }

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java

@@ -17,7 +17,7 @@ public class GeneratedCounterLong implements GeneratedProperty {
    */
   @Override
   public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
-    return (long) 1;
+    return 1L;
   }
 
   /**

src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java

@@ -633,9 +633,7 @@ public class DeployBeanDescriptor<T> {
 
   public void sortProperties() {
 
-    ArrayList<DeployBeanProperty> list = new ArrayList<>();
-    list.addAll(propMap.values());
-
+    ArrayList<DeployBeanProperty> list = new ArrayList<>(propMap.values());
     Collections.sort(list, PROP_ORDER);
 
     propMap = new LinkedHashMap<>(list.size());

src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java

@@ -585,7 +585,7 @@ public class DeployBeanProperty {
    */
   public void setSqlFormula(String formulaSelect, String formulaJoin) {
     this.sqlFormulaSelect = formulaSelect;
-    this.sqlFormulaJoin = formulaJoin.equals("") ? null : formulaJoin;
+    this.sqlFormulaJoin = formulaJoin.isEmpty() ? null : formulaJoin;
     this.dbRead = true;
     this.dbInsertable = false;
     this.dbUpdateable = false;

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java

@@ -56,7 +56,7 @@ public abstract class AnnotationBase {
    * <p>
    * If a <code>repeatable</code> annotation class is specified and the annotation is platform
    * specific(see {@link #getPlatformMatchingAnnotation(Set, Platform)}), then the platform specific
-   * annotation is returned. Otherwise the first annotation is retured. Note that you must no longer
+   * annotation is returned. Otherwise the first annotation is returned. Note that you must no longer
    * handle "java 1.6 repeatable containers" like {@link JoinColumn} / {@link JoinColumns} yourself.
    * </p>
    * <p>
@@ -256,7 +256,7 @@ public abstract class AnnotationBase {
   }
 
   // caches for getRepeatableValueMethod
-  private static final Method getNullMethod() {
+  private static Method getNullMethod() {
     try {
       return AnnotationBase.class.getDeclaredMethod("getNullMethod");
     } catch (NoSuchMethodException e) {

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java

@@ -119,7 +119,7 @@ public class AnnotationClass extends AnnotationParser {
     Entity entity = AnnotationBase.findAnnotation(cls,Entity.class);
     if (entity != null) {
       descriptor.setEntityType(EntityType.ORM);
-      if (entity.name().equals("")) {
+      if (entity.name().isEmpty()) {
         descriptor.setName(cls.getSimpleName());
       } else {
         descriptor.setName(entity.name());

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java

@@ -46,7 +46,24 @@ import io.ebean.annotation.WhenModified;
 import io.ebean.annotation.WhoCreated;
 import io.ebean.annotation.WhoModified;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.PersistenceException;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.sql.Types;
@@ -503,12 +520,12 @@ public class AnnotationFields extends AnnotationParser {
 
     } else if (strategy == GenerationType.SEQUENCE) {
       descriptor.setIdType(IdType.SEQUENCE);
-      if (!genName.equals("")) {
+      if (!genName.isEmpty()) {
         descriptor.setIdGeneratorName(genName);
       }
 
     } else if (strategy == GenerationType.AUTO) {
-      if (!genName.equals("")) {
+      if (!genName.isEmpty()) {
         // use a custom IdGenerator
         PlatformIdGenerator idGenerator = generatedPropFactory.getIdGenerator(genName);
         if (idGenerator == null) {

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java

@@ -56,7 +56,7 @@ public abstract class AnnotationParser extends AnnotationBase {
 
     Set<AttributeOverride> attrOverrides = getAll(prop, AttributeOverride.class);
     if (!attrOverrides.isEmpty()) {
-      HashMap<String, String> propMap = new HashMap<>();
+      HashMap<String, String> propMap = new HashMap<>(attrOverrides.size());
       for (AttributeOverride attrOverride : attrOverrides) {
         propMap.put(attrOverride.name(), attrOverride.column().name());
       }

src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java

@@ -31,7 +31,7 @@ public class DeployBeanInfo<T> {
 	}
 
 	public String toString() {
-		return ""+descriptor;
+		return String.valueOf(descriptor);
 	}
 
 	/**

src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java

@@ -230,7 +230,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   }
 
   private EntityBean checkEntityBean(Object bean) {
-    if (bean == null || (!(bean instanceof EntityBean))) {
+    if (!(bean instanceof EntityBean)) {
       throw new IllegalStateException("Expecting an EntityBean");
     }
     return (EntityBean) bean;

src/main/java/io/ebeaninternal/server/expression/InExpression.java

@@ -34,7 +34,7 @@ class InExpression extends AbstractExpression {
   }
 
   private Object[] values() {
-    List<Object> vals = new ArrayList<>();
+    List<Object> vals = new ArrayList<>(sourceValues.size());
     for (Object sourceValue : sourceValues) {
       NamedParamHelp.valueAdd(vals, sourceValue);
     }

src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java

@@ -8,6 +8,7 @@ import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 public class SimpleExpression extends AbstractValueExpression {
 
@@ -36,7 +37,7 @@ public class SimpleExpression extends AbstractValueExpression {
       String idName = prop.getAssocIdExpression(propName, "");
       Object[] ids = prop.getAssocIdValues((EntityBean) value());
       if (ids == null || ids.length != 1) {
-        throw new IllegalArgumentException("Expecting 1 Id value for " + idName + " but got " + ids);
+        throw new IllegalArgumentException("Expecting 1 Id value for " + idName + " but got " + Arrays.toString(ids));
       }
       context.writeSimple(type, idName, ids[0]);
     } else {

src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java

@@ -181,14 +181,8 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex
 
       if (context.hitCache) {
         // check each of the beans in the batch to see if they are in the L2 cache.
-        Iterator<EntityBeanIntercept> iterator = list.iterator();
-        while (iterator.hasNext()) {
-          EntityBeanIntercept batchEbi = iterator.next();
-          if (batchEbi != ebi && context.desc.cacheBeanLoad(batchEbi, persistenceContext)) {
-            // bean successfully loaded from L2 cache so remove from batch load
-            iterator.remove();
-          }
-        }
+        // bean successfully loaded from L2 cache so remove from batch load
+        list.removeIf(batchEbi -> batchEbi != ebi && context.desc.cacheBeanLoad(batchEbi, persistenceContext));
       }
 
       LoadBeanRequest req = new LoadBeanRequest(this, ebi.getLazyLoadProperty(), context.hitCache);

src/main/java/io/ebeaninternal/server/persist/BindValues.java

@@ -81,7 +81,7 @@ public class BindValues {
     }
 
     public String toString() {
-      return "" + value;
+      return String.valueOf(value);
     }
   }
 }

src/main/java/io/ebeaninternal/server/persist/Binder.java

@@ -80,7 +80,7 @@ public class Binder {
 
       if (bindBuf != null) {
         bindBuf.append(logPrefix);
-        if (logPrefix.equals("")) {
+        if (logPrefix.isEmpty()) {
           logPrefix = ", ";
         }
         bindBuf.append(bindValue.getName());
@@ -163,7 +163,7 @@ public class Binder {
       }
 
     } catch (SQLException ex) {
-      logger.warn(Message.msg("fetch.bind.error", "" + (dataBind.currentPos() - 1), value));
+      logger.warn(Message.msg("fetch.bind.error", String.valueOf(dataBind.currentPos() - 1), value));
       throw ex;
     }
   }
@@ -333,7 +333,7 @@ public class Binder {
           break;
 
         default:
-          String msg = Message.msg("persist.bind.datatype", "" + dataType, "" + b.currentPos());
+          String msg = Message.msg("persist.bind.datatype", String.valueOf(dataType), String.valueOf(b.currentPos()));
           throw new SQLException(msg);
       }
 

src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java

@@ -165,7 +165,7 @@ public final class DefaultPersister implements Persister {
    * Helper method to return the list of Id values for the list of beans.
    */
   private <T> List<Object> getBeanIds(BeanDescriptor<T> desc, List<T> beans) {
-    List<Object> idList = new ArrayList<>();
+    List<Object> idList = new ArrayList<>(beans.size());
     for (T liveBean : beans) {
       idList.add(desc.getBeanId(liveBean));
     }

src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java

@@ -160,8 +160,7 @@ public class ExeUpdateSql {
 
   private int leadingTrim(String s) {
     int len = s.length();
-    int i;
-    for (i = 0; i < len; i++) {
+    for (int i = 0; i < len; i++) {
       if (!Character.isWhitespace(s.charAt(i))) {
         return i;
       }

src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java

@@ -85,7 +85,7 @@ public final class DmlBeanPersister implements BeanPersister {
       throw new PersistenceException(msg, e);
 
     } finally {
-      if (!batched && handler != null) {
+      if (!batched) {
         handler.close();
       }
     }

src/main/java/io/ebeaninternal/server/query/CQuery.java

@@ -535,7 +535,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
 
     List<Version<T>> versionList = new ArrayList<>();
 
-    Version version;
+    Version<T> version;
     while ((version = readNextVersion()) != null) {
       versionList.add(version);
     }
@@ -544,7 +544,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
     return versionList;
   }
 
-  private Version readNextVersion() throws SQLException {
+  private Version<T> readNextVersion() throws SQLException {
 
     if (moveToNextRow()) {
       return rootNode.loadVersion(this);

src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java

@@ -377,11 +377,11 @@ class CQueryBuilder {
       PreparedStatement statement = connection.prepareStatement(sql);
       predicates.bind(statement, connection);
 
-      List<String> propertyNames = new ArrayList<>();
-
       ResultSet resultSet = statement.executeQuery();
       ResultSetMetaData metaData = resultSet.getMetaData();
+
       int cols = 1 + metaData.getColumnCount();
+      List<String> propertyNames = new ArrayList<>(cols - 1);
       for (int i = 1; i < cols; i++) {
         String tableName = metaData.getTableName(i).toLowerCase();
         String columnName = metaData.getColumnName(i).toLowerCase();

src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java

@@ -119,7 +119,7 @@ public final class CQueryPlanStats {
       return Collections.emptyList();
     }
 
-    List<MetaQueryPlanOriginCount> list = new ArrayList<>();
+    List<MetaQueryPlanOriginCount> list = new ArrayList<>(origins.size());
 
     for (Entry<ObjectGraphNode, LongAdder> entry : origins.entrySet()) {
       if (reset) {

src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java

@@ -31,7 +31,7 @@ import java.util.UUID;
  */
 public class DefaultSqlRow implements SqlRow {
 
-  static final long serialVersionUID = -3120927797041336242L;
+  private static final long serialVersionUID = -3120927797041336242L;
 
   private final String dbTrueValue;
 

src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java

@@ -387,7 +387,7 @@ public class SqlTreeBuilder {
 
     } else if (p instanceof BeanPropertyAssoc<?> && p.isEmbedded()) {
       // if the property is embedded we need to lookup the real column name
-      int pos = propName.indexOf(".");
+      int pos = propName.indexOf('.');
       if (pos > -1) {
         String name = propName.substring(pos + 1);
         p = ((BeanPropertyAssoc<?>) p).getTargetDescriptor().findBeanProperty(name);

src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java

@@ -203,9 +203,6 @@ class SqlTreeNodeBean implements SqlTreeNode {
       lazyLoadParentId = lazyLoadParentIdBinder.read(ctx);
     }
 
-    // bean already existing in the persistence context
-    EntityBean contextBean = null;
-
     Class<?> localType;
     BeanDescriptor<?> localDesc;
     IdBinder localIdBinder;
@@ -237,6 +234,8 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
     PersistenceContext persistenceContext = (!readId || temporalVersions) ? null : ctx.getPersistenceContext();
 
+    // bean already existing in the persistence context
+    EntityBean contextBean = null;
     if (readId) {
       Object id = localIdBinder.readSet(ctx, localBean);
       if (id == null) {

src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java

@@ -251,8 +251,7 @@ public class TCsvReader<T> implements CsvReader<T> {
       EntityBean entityBean = descriptor.createEntityBean();
       T bean = (T) entityBean;
 
-      int columnPos = 0;
-      for (; columnPos < line.length; columnPos++) {
+      for (int columnPos = 0; columnPos < line.length; columnPos++) {
         convertAndSetColumn(columnPos, line[columnPos], entityBean);
       }
 

src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java

@@ -161,8 +161,6 @@ public class DJsonContext implements JsonContext {
     ReadJson readJson = new ReadJson(desc, src, options, determineObjectMapper(options));
     try {
 
-      List<T> list = new ArrayList<>();
-
       JsonToken currentToken = src.getCurrentToken();
       if (currentToken != JsonToken.START_ARRAY) {
         JsonToken event = src.nextToken();
@@ -171,6 +169,7 @@ public class DJsonContext implements JsonContext {
         }
       }
 
+      List<T> list = new ArrayList<>();
       do {
         T bean = desc.jsonRead(readJson, null);
         if (bean == null) {

src/main/java/io/ebeaninternal/server/transaction/ExplicitJdbcTransaction.java

@@ -34,11 +34,8 @@ public class ExplicitJdbcTransaction extends JdbcTransaction {
   }
 
   private void executeStatement(String statement) throws SQLException {
-    PreparedStatement stmt = connection.prepareStatement(statement);
-    try {
+    try (PreparedStatement stmt = connection.prepareStatement(statement)) {
       stmt.execute();
-    } finally {
-      stmt.close();
     }
   }
 

src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java

@@ -15,7 +15,7 @@ import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.lib.util.Str;
 import io.ebeaninternal.server.persist.BatchControl;
-import io.ebeanservice.docstore.api.*;
+import io.ebeanservice.docstore.api.DocStoreTransaction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/io/ebeaninternal/server/type/ConvertInetAddresses.java

@@ -248,7 +248,7 @@ public final class ConvertInetAddresses {
       }
       byte[] bytes = new byte[2 * IPV6_PART_COUNT];
       for (int i = 0; i < IPV6_PART_COUNT; i++) {
-        int piece = address[i].equals("") ? 0 : Integer.parseInt(address[i], 16);
+        int piece = address[i].isEmpty() ? 0 : Integer.parseInt(address[i], 16);
         bytes[2 * i] = (byte) ((piece & 0xFF00) >>> 8);
         bytes[2 * i + 1] = (byte) (piece & 0xFF);
       }
@@ -283,7 +283,6 @@ public final class ConvertInetAddresses {
 
   private static String convertDottedQuadToHex(String ipString) {
     int lastColon = ipString.lastIndexOf(':');
-    String initialPart = ipString.substring(0, lastColon + 1);
     String dottedQuad = ipString.substring(lastColon + 1);
     byte[] quad = textToNumericFormatV4(dottedQuad);
     if (quad == null) {
@@ -291,6 +290,8 @@ public final class ConvertInetAddresses {
     }
     String penultimate = Integer.toHexString(((quad[0] & 0xff) << 8) | (quad[1] & 0xff));
     String ultimate = Integer.toHexString(((quad[2] & 0xff) << 8) | (quad[3] & 0xff));
+
+    String initialPart = ipString.substring(0, lastColon + 1);
     return initialPart + penultimate + ":" + ultimate;
   }
 

src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java

@@ -52,7 +52,20 @@ import java.time.YearMonth;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Currency;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**

src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java

@@ -87,11 +87,8 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
         return null;
       }
       try {
-        InputStreamReader reader = new InputStreamReader(is);
-        try {
+        try (InputStreamReader reader = new InputStreamReader(is)) {
           return parse(reader);
-        } finally {
-          reader.close();
         }
       } catch (IOException e) {
         throw new SQLException("Error reading Blob stream from DB", e);

src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java

@@ -126,9 +126,7 @@ public class ScalarTypeJsonSet {
 
     @SuppressWarnings("unchecked")
     private Set convertList(List list) {
-      LinkedHashSet set = new LinkedHashSet();
-      set.addAll(list);
-      return set;
+      return new LinkedHashSet(list);
     }
   }
 

src/main/java/io/ebeaninternal/server/util/BindParamsParser.java

@@ -153,7 +153,7 @@ public class BindParamsParser {
 
         // check if inValue is a Collection type...
         Object inValue = param.getInValue();
-        if (inValue != null && inValue instanceof Collection<?>) {
+        if (inValue instanceof Collection<?>) {
           // Chop up Collection parameter into a number
           // of individual parameters and add each one individually
           Collection<?> collection = (Collection<?>) inValue;