From 81ef967d9f2c7b967467ffbd8a924a42ae980fe9 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sat, 27 Aug 2022 22:02:32 +1200 Subject: [PATCH] IntelliJ Inspect various improvements --- .../java/io/ebeaninternal/api/BindParams.java | 3 +-- .../java/io/ebeaninternal/api/ScopeTrans.java | 6 +++--- .../ebeaninternal/api/ScopedTransaction.java | 2 +- .../io/ebeaninternal/api/SpiExpression.java | 4 ++-- .../ebeaninternal/api/TransactionEvent.java | 2 +- .../api/TxnProfileEventCodes.java | 2 +- .../server/core/DumpMetrics.java | 6 +----- .../server/core/PersistRequestUpdateSql.java | 4 ++-- .../server/core/SpiOrmQueryRequest.java | 2 +- .../server/core/SpiResultSet.java | 2 +- .../server/core/bootup/ManifestReader.java | 3 +-- .../server/deploy/BeanDescriptor.java | 5 ++--- .../deploy/BeanDescriptorCacheHelp.java | 4 +--- .../server/deploy/BeanPropertyAssoc.java | 4 ++-- .../deploy/BeanPropertyOrderColumn.java | 2 +- .../server/deploy/DbMigrationInfo.java | 2 +- .../server/deploy/id/IdBinderSimple.java | 4 +--- .../deploy/meta/DeployIdentityMode.java | 4 ++-- .../server/deploy/meta/DeployTableJoin.java | 1 - .../io/ebeaninternal/server/dto/DtoMeta.java | 4 ++-- .../io/ebeaninternal/server/el/CharMatch.java | 4 ++-- .../io/ebeaninternal/server/el/ElFilter.java | 2 +- .../server/grammer/EqlWhereListener.java | 1 - .../server/idgen/UuidV1IdGenerator.java | 2 +- .../server/idgen/UuidV1RndIdGenerator.java | 12 +++++------ .../server/idgen/UuidV4IdGenerator.java | 2 +- .../ebeaninternal/server/persist/Binder.java | 5 +---- .../persist/platform/MultiValueBind.java | 4 +--- .../server/query/CQueryBuilder.java | 8 +++---- .../server/query/CQueryPredicates.java | 2 +- .../server/query/SqlTreeNode.java | 2 +- .../server/querydefn/DefaultOrmQuery.java | 6 +++--- .../server/querydefn/OrmQueryDetail.java | 2 +- .../server/querydefn/SimpleTextParser.java | 7 ++----- .../server/rawsql/SpiRawSql.java | 21 ++++++++----------- .../readaudit/DefaultReadAuditLogger.java | 4 ++-- .../server/transaction/JdbcTransaction.java | 2 +- .../server/type/ScalarTypeBigDecimal.java | 2 +- .../server/type/ScalarTypeDuration.java | 1 - .../server/type/ScalarTypeFile.java | 8 +------ .../server/type/TypeResolver.java | 2 +- .../server/util/BindParamsParser.java | 3 +-- .../api/mapping/DocPropertyAdapter.java | 2 +- .../docstore/api/mapping/DocumentMapping.java | 14 ++++++------- 44 files changed, 75 insertions(+), 109 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java index 1c6d43719..7fffd8c3b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java @@ -228,10 +228,9 @@ public final class BindParams implements Serializable { /** * Set a named In parameter that is multi-valued. */ - public Param setArrayParameter(String name, Collection value) { + public void setArrayParameter(String name, Collection value) { Param p = getParam(name); p.setInValue(new MultiValueWrapper(value)); - return p; } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java index da38b3856..d0bc7bcef 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java @@ -93,7 +93,7 @@ public final class ScopeTrans { /** * Return the current/active transaction. */ - protected SpiTransaction getTransaction() { + SpiTransaction getTransaction() { return transaction; } @@ -124,7 +124,7 @@ public final class ScopeTrans { } } - protected void commitTransaction() { + void commitTransaction() { if (created) { transaction.commit(); } else { @@ -175,7 +175,7 @@ public final class ScopeTrans { return e; } - protected void rollback(Throwable e) { + void rollback(Throwable e) { if (transaction != null && transaction.isActive()) { // transaction is null for NOT_SUPPORTED and sometimes SUPPORTS // and Inactive (already rolled back) if nested REQUIRED diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java index 323a9b7da..10fa49a13 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java @@ -7,7 +7,7 @@ import javax.persistence.PersistenceException; /** * Manage scoped (typically thread local) transactions. - * + *

* These can be nested and internally they are pushed and popped from a stack. */ public final class ScopedTransaction extends SpiTransactionProxy { diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java index 8fe986259..e4392bf17 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java @@ -13,8 +13,8 @@ import java.io.IOException; */ public interface SpiExpression extends Expression { - static final String SQL_TRUE = "1=1"; - static final String SQL_FALSE = "1=0"; + String SQL_TRUE = "1=1"; + String SQL_FALSE = "1=0"; /** * Simplify nested expressions if possible. diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java b/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java index c2c6194cd..2c06dbb81 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java @@ -139,7 +139,7 @@ public final class TransactionEvent implements Serializable { /** * Return the CacheChangeSet that we add cache notification messages to. - * + *

* We want to add to this change set as we process requests allowing the * PersistRequestBean to be garbage collected for large transactions. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java b/ebean-core/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java index 8c492d77b..f2339cbc9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java @@ -2,7 +2,7 @@ package io.ebeaninternal.api; /** * Event codes used in transaction profiling. - * + *

* These appear in verbose transaction profile logs. */ public interface TxnProfileEventCodes { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java index 73ad97f2c..c13a7d6db 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java @@ -100,11 +100,7 @@ final class DumpMetrics { } private void logCount(MetaCountMetric metric) { - - StringBuilder sb = new StringBuilder(); - sb.append(padNameTimed(metric.name())).append(" "); - sb.append(" count:").append(pad(metric.count())); - out(sb.toString()); + out(padNameTimed(metric.name()) + " count:" + pad(metric.count())); } private void out(String sb) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java index 63f31434a..e2f898e3c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java @@ -49,9 +49,9 @@ public final class PersistRequestUpdateSql extends PersistRequest { /** * Add this statement to JDBC batch for later execution. */ - public int addBatch() { + public void addBatch() { this.addBatch = true; - return executeStatement(true); + executeStatement(true); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java index c3f98854b..039158200 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java @@ -138,7 +138,7 @@ public interface SpiOrmQueryRequest extends BeanQueryRequest, DocQueryRequ /** * Maybe hit the bean cache returning true if everything was obtained from the * cache (that there were no misses). - * + *

* Do this for findList() on many natural keys or many Ids. */ boolean getFromBeanCache(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java index e95c0d461..ed114375b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java @@ -5,7 +5,7 @@ import java.sql.ResultSet; /** * Hold the JDBC PreparedStatement and ResultSet. - * + *

* These both must be closed properly when done. */ public final class SpiResultSet { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java index 456b90987..e794740e5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java @@ -55,7 +55,7 @@ class ManifestReader { /** * Read all the specific manifest files and return the set of packages containing type query beans. */ - private Set read(ClassLoader classLoader, String resourcePath) { + private void read(ClassLoader classLoader, String resourcePath) { try { Enumeration resources = classLoader.getResources(resourcePath); while (resources.hasMoreElements()) { @@ -66,7 +66,6 @@ class ManifestReader { } catch (IOException e) { log.log(WARNING, "Error reading " + resourcePath + " manifest resources", e); } - return packageSet; } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 5a3b1236b..eddf39e5d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -3157,18 +3157,17 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { /** * Return true if any mutable properties are dirty. */ - public boolean checkAnyMutableProperties(EntityBeanIntercept ebi) { + public void checkAnyMutableProperties(EntityBeanIntercept ebi) { for (BeanProperty beanProperty : propertiesMutable) { int propertyIndex = beanProperty.propertyIndex(); if (ebi.isLoadedProperty(propertyIndex)) { Object value = beanProperty.getValue(ebi.getOwner()); if (beanProperty.checkMutable(value, ebi.isDirtyProperty(propertyIndex), ebi)) { ebi.markPropertyAsChanged(propertyIndex); - return true; + return; } } } - return false; } public ConcurrencyMode concurrencyMode(EntityBeanIntercept ebi) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index 015fcbe70..eba2da8ee 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -706,9 +706,7 @@ final class BeanDescriptorCacheHelp { } Set loaded = new HashSet<>(); - Iterator> iterator = hits.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry hit = iterator.next(); + for (Map.Entry hit : hits.entrySet()) { Object key = hit.getKey(); EntityBeanIntercept ebi = ebis.remove(key); CachedBeanData cacheData = (CachedBeanData) hit.getValue(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java index 4d306564c..1cc67ee15 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -366,7 +366,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree */ public boolean isUpdateable() { TableJoinColumn[] columns = tableJoin.columns(); - if (columns.length <= 0) { + if (columns.length == 0) { return true; } for (TableJoinColumn column : columns) { @@ -383,7 +383,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree */ public boolean isInsertable() { TableJoinColumn[] columns = tableJoin.columns(); - if (columns.length <= 0) { + if (columns.length == 0) { return true; } for (TableJoinColumn column : columns) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java index a6ac913b9..7820e722d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java @@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; /** * Bean property for synthetic sort order value / order column. - * + *

* The value of which is held on the entity bean intercept. */ public final class BeanPropertyOrderColumn extends BeanProperty { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java index d41f781f5..a356beb41 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java @@ -30,7 +30,7 @@ public final class DbMigrationInfo { if (scripts.length == 0) { return Collections.emptyList(); } else { - return Collections.unmodifiableList(Arrays.asList(scripts)); + return List.of(scripts); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java index 97f2bae2f..729ad0adb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java @@ -145,9 +145,7 @@ public final class IdBinderSimple implements IdBinder { @Override public void addIdInBindValues(SpiExpressionRequest request, Collection values) { List copy = new ArrayList<>(values); - for (int i = 0; i < copy.size(); i++) { - copy.set(i, convertSetId(copy.get(i), null)); - } + copy.replaceAll(idValue -> convertSetId(idValue, null)); request.addBindValue(new MultiValueWrapper(copy)); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployIdentityMode.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployIdentityMode.java index 6a20d9145..6f70bff19 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployIdentityMode.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployIdentityMode.java @@ -12,10 +12,10 @@ public final class DeployIdentityMode { } private IdType type; - private IdentityGenerated generated; + private final IdentityGenerated generated; private int start; private int increment; - private int cache; + private final int cache; private String sequenceName; private boolean platformDefault; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java index 8a56e8a82..0f3ed54c1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java @@ -137,7 +137,6 @@ public final class DeployTableJoin { /** * Returns the clause of an extra @Where annotation. - * @return */ public String getExtraWhere() { return extraWhere; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java index cb7ec4797..fed2ff4c1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Map; /** - * Holds property and constructor meta data for a given DTO bean type. - * + * Holds property and constructor meta-data for a given DTO bean type. + *

* Uses this to map a mapping request (columns) to a 'query plan' (constructor and setters). */ final class DtoMeta { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/CharMatch.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/CharMatch.java index 13af0c02a..53622a8ab 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/CharMatch.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/CharMatch.java @@ -23,7 +23,7 @@ public final class CharMatch { return false; } - char ta[] = other.toCharArray(); + char[] ta = other.toCharArray(); int pos = -1; while (++pos < maxLength) { @@ -42,7 +42,7 @@ public final class CharMatch { return false; } - char ta[] = other.toCharArray(); + char[] ta = other.toCharArray(); int offset = ta.length - maxLength; int pos = maxLength; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java index bd28af35c..105dff381 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java @@ -46,7 +46,7 @@ public final class ElFilter implements Filter { return this; } - protected boolean isMatch(T bean) { + boolean isMatch(T bean) { for (ElMatcher matcher : matches) { if (!matcher.isMatch(bean)) { return false; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java index 9a239b7ea..c919a2e97 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java @@ -342,7 +342,6 @@ abstract class EqlWhereListener extends EQLBaseListener { case ':': return EqlValueType.NAMED_PARAM; case 't': - return EqlValueType.BOOL; case 'f': return EqlValueType.BOOL; case '\'': diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java index d17a8385d..386f177c5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java @@ -225,7 +225,7 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator { stateFile, propNodeId, getNodeIdentifier()); return false; } - Integer seq = Integer.valueOf(prop.getProperty("clockSeq")) & 0x3FFF; + Integer seq = Integer.parseInt(prop.getProperty("clockSeq")) & 0x3FFF; Long ts = Long.valueOf(prop.getProperty("timeStamp")); clockSeq.set(seq); timeStamp.set(ts); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java index 484d92698..21e34a8b3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java @@ -14,15 +14,15 @@ import static java.lang.System.Logger.Level.INFO; /** * IdGenerator for (pseudo) type 1 UUIDs. - * + *

* This implementation generates a type 1 UUID according to * https://tools.ietf.org/html/rfc4122.html#section-4.2 * but has no persistence storage. It generates a new random 47 bit node ID with every * UUID. - * + *

* Use this, if you want randomness in your UUIDs but want to take advantage of index * optimizations of the database. It may be good with AUTO_BINARY_OPTIMIZED and MySql. - * + *

* See: https://www.percona.com/blog/2014/12/19/store-uuid-optimized-way/ */ public class UuidV1RndIdGenerator implements PlatformIdGenerator { @@ -41,16 +41,16 @@ public class UuidV1RndIdGenerator implements PlatformIdGenerator { private final SecureRandom numberGenerator = new SecureRandom(); - protected AtomicLong timeStamp = new AtomicLong(currentUuidTime()); + protected final AtomicLong timeStamp = new AtomicLong(currentUuidTime()); - private AtomicLong nanoToMilliOffset = new AtomicLong(currentUuidTime()); + private final AtomicLong nanoToMilliOffset = new AtomicLong(currentUuidTime()); private final ReentrantLock lock = new ReentrantLock(); /** * Returns the uuid epoch. - * + *

* This is the number of 100ns intervals since 1582-10-15 00:00:00 */ private static long currentUuidTime() { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV4IdGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV4IdGenerator.java index c7d1d8093..1ed619761 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV4IdGenerator.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV4IdGenerator.java @@ -7,7 +7,7 @@ import java.util.UUID; /** * IdGenerator for java util UUID. - * + *

* This generator generates a 60bit random UUID according to * https://tools.ietf.org/html/rfc4122.html#section-4.4 * Use this generator if you want truly random UUIDs diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java index 82db7fdd6..5dd0af06a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java @@ -163,11 +163,10 @@ public final class Binder { /** * Bind an Object with unknown data type. */ - public Object bindObject(DataBind dataBind, Object value) throws SQLException { + public void bindObject(DataBind dataBind, Object value) throws SQLException { if (value == null) { // null of unknown type bindObject(dataBind, null, Types.OTHER); - return null; } else if (value instanceof MultiValueWrapper) { MultiValueWrapper wrapper = (MultiValueWrapper) value; @@ -177,7 +176,6 @@ public final class Binder { int dbType = type.jdbcType(); // let the multiValueBind decide what to do with the value multiValueBind.bindMultiValues(dataBind, values, type, one -> bindObject(dataBind, one, dbType)); - return values; } else { ScalarType type = getScalarType(value.getClass()); @@ -186,7 +184,6 @@ public final class Binder { value = type.toJdbcType(value); } bindObject(dataBind, value, type.jdbcType()); - return value; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java index 59471c793..db47defcf 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java @@ -60,9 +60,7 @@ public class MultiValueBind { sb.append(" not"); } sb.append(" in (?"); - for (int i = 1; i < size; i++) { - sb.append(",?"); - } + sb.append(",?".repeat(Math.max(0, size - 1))); sb.append(")"); return sb.toString(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index b01f254c6..acb3e1708 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -36,6 +36,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import static java.util.Objects.requireNonNullElse; + /** * Generates the SQL SELECT statements taking into account the physical * deployment properties. @@ -411,11 +413,7 @@ final class CQueryBuilder { String tableName = lower(metaData.getTableName(i)); String columnName = lower(metaData.getColumnName(i)); String path = desc.findBeanPath(schemaName, tableName, columnName); - if (path != null) { - propertyNames.add(path); - } else { - propertyNames.add(SpiRawSql.IGNORE_COLUMN); - } + propertyNames.add(requireNonNullElse(path, SpiRawSql.IGNORE_COLUMN)); } RawSql rawSql = RawSqlBuilder.resultSet(resultSet, propertyNames.toArray(new String[0])); query.setRawSql(rawSql); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java index f93ab8d17..1577768c1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java @@ -334,7 +334,7 @@ public final class CQueryPredicates { // orderById is already in the order by clause return orderBy; } - if (idPos <= -1 || idPos >= manyPos) { + if (idPos == -1 || idPos >= manyPos) { if (idPos > manyPos) { // there was an error with the order by... String msg = "A Query on [" + desc + "] includes a join to a 'many' association [" + manyProp.name() diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java index 3d50a9377..5aff65c43 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java @@ -83,5 +83,5 @@ interface SqlTreeNode { * Unselect lobs (for distinct queries on DB2 and Oracle). */ default void unselectLobs() { - }; + } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 8f4baefdf..a140a7fec 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -411,7 +411,7 @@ public class DefaultOrmQuery extends AbstractQuery implements SpiQuery { return expressionFactory; } - private final void createExtraJoinsToSupportManyWhereClause() { + private void createExtraJoinsToSupportManyWhereClause() { manyWhereJoins = new ManyWhereJoins(); if (whereExpressions != null) { whereExpressions.containsMany(beanDescriptor, manyWhereJoins); @@ -1499,12 +1499,12 @@ public class DefaultOrmQuery extends AbstractQuery implements SpiQuery { @Override @SuppressWarnings("unchecked") public final List findSingleAttributeList() { - return (List) server.findSingleAttributeList(this, transaction); + return server.findSingleAttributeList(this, transaction); } @Override public final Set findSingleAttributeSet() { - return (Set) server.findSingleAttributeSet(this, transaction); + return server.findSingleAttributeSet(this, transaction); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java index fab176ecb..8fe761119 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -232,7 +232,7 @@ public final class OrmQueryDetail implements Serializable { /** * Add or replace the fetch detail. */ - protected void fetch(OrmQueryProperties chunk) { + void fetch(OrmQueryProperties chunk) { String path = chunk.getPath(); if (path == null) { baseProps = chunk; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java index 0072c8eec..e2b4c56ea 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java @@ -144,12 +144,9 @@ public final class SimpleTextParser { private boolean isOperator(char c) { switch (c) { case '<': - return true; - case '>': - return true; - case '=': - return true; case '!': + case '=': + case '>': return true; default: diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java index 7956b9453..d38f600ee 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java @@ -64,7 +64,7 @@ public interface SpiRawSql extends RawSql { /** * Construct for unparsed SQL. */ - protected Sql(String unparsedSql) { + Sql(String unparsedSql) { this.parsed = false; this.unparsedSql = unparsedSql; this.preFrom = null; @@ -80,7 +80,7 @@ public interface SpiRawSql extends RawSql { /** * Construct for parsed SQL. */ - protected Sql(String unparsedSql, String preFrom, String preWhere, boolean andWhereExpr, + Sql(String unparsedSql, String preFrom, String preWhere, boolean andWhereExpr, String preHaving, boolean andHavingExpr, String orderByPrefix, String orderBy, boolean distinct) { this.unparsedSql = unparsedSql; @@ -199,7 +199,7 @@ public interface SpiRawSql extends RawSql { /** * Construct from parsed sql where the columns have been identified. */ - protected ColumnMapping(List columns) { + ColumnMapping(List columns) { this.immutable = false; this.parsed = true; this.propertyMap = null; @@ -213,7 +213,7 @@ public interface SpiRawSql extends RawSql { /** * Construct for unparsed sql. */ - protected ColumnMapping() { + ColumnMapping() { this.immutable = false; this.parsed = false; this.propertyMap = null; @@ -224,7 +224,7 @@ public interface SpiRawSql extends RawSql { /** * Construct for ResultSet use. */ - protected ColumnMapping(String... propertyNames) { + ColumnMapping(String... propertyNames) { this.immutable = false; this.parsed = false; this.propertyMap = null; @@ -240,7 +240,7 @@ public interface SpiRawSql extends RawSql { /** * Construct an immutable ColumnMapping based on collected information. */ - protected ColumnMapping(boolean parsed, LinkedHashMap dbColumnMap) { + ColumnMapping(boolean parsed, LinkedHashMap dbColumnMap) { this.immutable = true; this.parsed = parsed; this.dbColumnMap = dbColumnMap; @@ -281,17 +281,14 @@ public interface SpiRawSql extends RawSql { * * @throws IllegalStateException when a propertyName has not been defined for a column. */ - protected ColumnMapping createImmutableCopy() { - + ColumnMapping createImmutableCopy() { for (Column c : dbColumnMap.values()) { c.checkMapping(); } - return new ColumnMapping(parsed, dbColumnMap); } - protected void columnMapping(String dbColumn, String propertyName) { - + void columnMapping(String dbColumn, String propertyName) { if (immutable) { throw new IllegalStateException("Should never happen"); } @@ -330,7 +327,7 @@ public interface SpiRawSql extends RawSql { /** * Return the column mapping. */ - protected Map mapping() { + Map mapping() { return dbColumnMap; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java b/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java index 1e14578de..785dd57b5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java @@ -25,8 +25,8 @@ public class DefaultReadAuditLogger implements ReadAuditLogger { private static final System.Logger auditLogger = AppLog.getLogger("io.ebean.ReadAudit"); protected final JsonFactory jsonFactory = new JsonFactory(); - protected int defaultQueryBuffer = 500; - protected int defaultReadBuffer = 150; + protected final int defaultQueryBuffer = 500; + protected final int defaultReadBuffer = 150; /** * Write the query plan details in JSON format to the logger. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java index 4ae9efef8..0ad958e25 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java @@ -408,7 +408,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { @Override public final void depthDecrement() { if (depth != 0) { - depth += -1; + depth -= 1; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java index 223e26d05..c771ff59b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java @@ -63,7 +63,7 @@ class ScalarTypeBigDecimal extends ScalarTypeBase { if (!dataInput.readBoolean()) { return null; } else { - return new BigDecimal(dataInput.readDouble()); + return BigDecimal.valueOf(dataInput.readDouble()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java index c73347add..1589a22af 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java @@ -3,7 +3,6 @@ package io.ebeaninternal.server.type; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import io.ebean.core.type.*; -import io.ebean.core.type.BasicTypeConverter; import java.io.DataInput; import java.io.DataOutput; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java index 823942445..5e4ad5df8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java @@ -146,12 +146,10 @@ final class ScalarTypeFile extends ScalarTypeBase { /** * Helper method to pump bytes from input to output. */ - public long pump(InputStream is, OutputStream out) throws IOException { - + public void pump(InputStream is, OutputStream out) throws IOException { long totalBytes = 0; InputStream input = null; OutputStream output = null; - try { input = new BufferedInputStream(is, bufferSize); output = new BufferedOutputStream(out, bufferSize); @@ -162,11 +160,7 @@ final class ScalarTypeFile extends ScalarTypeBase { output.write(buffer, 0, length); totalBytes += length; } - output.flush(); - - return totalBytes; - } finally { if (output != null) { try { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java index 873984ba0..e469291d1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java @@ -12,7 +12,7 @@ import java.util.Map; /** * This class is a modified version of TypeResolver from https://github.com/jhalterman/typetools * which is Apache 2 license. - * + *

* It is a cut down version removing the lambda support and related sun.misc.Unsafe use etc. */ final class TypeResolver { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java index 845d8d285..d08d2a136 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java @@ -172,8 +172,7 @@ public final class BindParamsParser { private void addCollectionParams(OrderedList orderedList, Param param, Collection inValue) { // Chop up Collection parameter into a number of individual parameters - Collection collection = inValue; - for (int c = 0; c < collection.size(); c++) { + for (int c = 0; c < inValue.size(); c++) { if (c > 0) { orderedList.appendSql(","); } diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java index 4385be512..64b112c91 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.json.PathStack; */ public abstract class DocPropertyAdapter implements DocPropertyVisitor { - protected PathStack pathStack = new PathStack(); + protected final PathStack pathStack = new PathStack(); @Override public void visitProperty(DocPropertyMapping property) { diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java index 57f8006ef..533769ce5 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java @@ -8,13 +8,13 @@ import io.ebean.docstore.DocMapping; */ public final class DocumentMapping implements DocMapping { - protected final String queueId; - protected final String name; - protected final String type; - protected final FetchPath paths; - protected final DocPropertyMapping properties; - protected int shards; - protected int replicas; + private final String queueId; + private final String name; + private final String type; + private final FetchPath paths; + private final DocPropertyMapping properties; + private int shards; + private int replicas; public DocumentMapping(String queueId, String name, String type, FetchPath paths, DocPropertyMapping properties, int shards, int replicas) { this.queueId = queueId;