diff --git a/src/main/java/com/avaje/ebean/bean/ObjectGraphNode.java b/src/main/java/com/avaje/ebean/bean/ObjectGraphNode.java index e070e43f6..ef75d3c3c 100644 --- a/src/main/java/com/avaje/ebean/bean/ObjectGraphNode.java +++ b/src/main/java/com/avaje/ebean/bean/ObjectGraphNode.java @@ -82,6 +82,7 @@ public final class ObjectGraphNode implements Serializable { } ObjectGraphNode e = (ObjectGraphNode) obj; + //noinspection StringEquality return ((e.path == path) || (e.path != null && e.path.equals(path))) && e.originQueryPoint.equals(originQueryPoint); } diff --git a/src/main/java/com/avaje/ebean/cache/ServerCacheStatistics.java b/src/main/java/com/avaje/ebean/cache/ServerCacheStatistics.java index 5e45c4f4e..a2f290916 100644 --- a/src/main/java/com/avaje/ebean/cache/ServerCacheStatistics.java +++ b/src/main/java/com/avaje/ebean/cache/ServerCacheStatistics.java @@ -40,6 +40,7 @@ public class ServerCacheStatistics { protected long evictByLRU; public String toString() { + //noinspection StringBufferReplaceableByString StringBuilder sb = new StringBuilder(80); sb.append(cacheName); sb.append(" maxSize:").append(maxSize); diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/PostgresHistorySupport.java b/src/main/java/com/avaje/ebean/config/dbplatform/PostgresHistorySupport.java index 1f6e7669e..5a99fdb5d 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/PostgresHistorySupport.java +++ b/src/main/java/com/avaje/ebean/config/dbplatform/PostgresHistorySupport.java @@ -16,6 +16,7 @@ public class PostgresHistorySupport implements DbHistorySupport { // for Postgres we are using the 'timestamp with timezone range' data type // as our sys_period column so hence the predicate below + //noinspection StringBufferReplaceableByString StringBuilder sb = new StringBuilder(40); sb.append(asOfTableAlias).append(".").append(asOfSysPeriod).append(" @> ?::timestamptz"); return sb.toString(); diff --git a/src/main/java/com/avaje/ebeaninternal/api/HashQueryPlan.java b/src/main/java/com/avaje/ebeaninternal/api/HashQueryPlan.java index 844bbcddd..83ab5ebdf 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/HashQueryPlan.java +++ b/src/main/java/com/avaje/ebeaninternal/api/HashQueryPlan.java @@ -37,7 +37,8 @@ public class HashQueryPlan { } HashQueryPlan e = (HashQueryPlan) obj; - return e.planHash == planHash + //noinspection StringEquality + return e.planHash == planHash && e.bindCount == bindCount && ((e.rawSql == rawSql) || (e.rawSql != null && e.rawSql.equals(rawSql))); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/DefaultAutoFetchManager.java b/src/main/java/com/avaje/ebeaninternal/server/autofetch/DefaultAutoFetchManager.java index dea7b241e..4117030a5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/DefaultAutoFetchManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autofetch/DefaultAutoFetchManager.java @@ -35,7 +35,8 @@ public class DefaultAutoFetchManager implements AutoFetchManager, Serializable { private static final long serialVersionUID = -6826119882781771722L; - private final String statisticsMonitor = new String(); + @SuppressWarnings("RedundantStringConstructorCall") + private final String statisticsMonitor = new String(); private final String fileName; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/Statistics.java b/src/main/java/com/avaje/ebeaninternal/server/autofetch/Statistics.java index f5e8ed3de..9a49e84ea 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/Statistics.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autofetch/Statistics.java @@ -28,7 +28,8 @@ public class Statistics implements Serializable { private final Map nodeUsageMap = new LinkedHashMap(); - private final String monitor = new String(); + @SuppressWarnings("RedundantStringConstructorCall") + private final String monitor = new String(); public Statistics(ObjectGraphOrigin origin, boolean queryTuningAddVersion) { this.origin = origin; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/StatisticsNodeUsage.java b/src/main/java/com/avaje/ebeaninternal/server/autofetch/StatisticsNodeUsage.java index ff08f08a1..e74794c41 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/StatisticsNodeUsage.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autofetch/StatisticsNodeUsage.java @@ -25,7 +25,8 @@ public class StatisticsNodeUsage implements Serializable { private static final Logger logger = LoggerFactory.getLogger(StatisticsNodeUsage.class); - private final String monitor = new String(); + @SuppressWarnings("RedundantStringConstructorCall") + private final String monitor = new String(); private final String path; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/TunedQueryInfo.java b/src/main/java/com/avaje/ebeaninternal/server/autofetch/TunedQueryInfo.java index 3cc6df1dd..5a16492ce 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/TunedQueryInfo.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autofetch/TunedQueryInfo.java @@ -28,7 +28,8 @@ public class TunedQueryInfo implements Serializable { private Long lastTuneTime = (long) 0; - private final String rateMonitor = new String(); + @SuppressWarnings("RedundantStringConstructorCall") + private final String rateMonitor = new String(); /** * The number of queries tuned by this object. diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastStatus.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastStatus.java index 993b65e11..3b0429665 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastStatus.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastStatus.java @@ -30,8 +30,9 @@ public class McastStatus { private final String lastOutgoingAcks; public String getSummary() { - - StringBuilder sb = new StringBuilder(80); + + //noinspection StringBufferReplaceableByString + StringBuilder sb = new StringBuilder(80); sb.append("txnOut:").append(totalTxnEventsSent).append("; "); sb.append("txnIn:").append(totalTxnEventsReceived).append("; "); sb.append("outPackets:").append(totalPacketsSent).append("; "); diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePool.java b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePool.java index 23b24056a..f5e940e45 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePool.java +++ b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePool.java @@ -263,7 +263,8 @@ public class DataSourcePool implements DataSource { } String transIsolation = TransactionIsolation.getLevelDescription(transactionIsolation); - StringBuilder sb = new StringBuilder(70); + //noinspection StringBufferReplaceableByString + StringBuilder sb = new StringBuilder(70); sb.append("DataSourcePool [").append(name); sb.append("] autoCommit[").append(autoCommit); sb.append("] transIsolation[").append(transIsolation); diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/Str.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/Str.java index 4da7c2a4c..e6521da23 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/Str.java +++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/Str.java @@ -31,6 +31,7 @@ public class Str { * Append two strings together. */ public static String add(String s0, String s1) { + //noinspection StringBufferReplaceableByString StringBuilder sb = new StringBuilder(s0.length() + s1.length() + 5); return sb.append(s0).append(s1).toString(); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchIds.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchIds.java index 8f2016869..5c14fbdb6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchIds.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchIds.java @@ -88,6 +88,7 @@ public class CQueryFetchIds { * Return a summary description of this query. */ public String getSummary() { + //noinspection StringBufferReplaceableByString StringBuilder sb = new StringBuilder(80); sb.append("FindIds exeMicros[").append(executionTimeMicros) .append("] rows[").append(rowCount) diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryRowCount.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryRowCount.java index 352331182..445156ee9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryRowCount.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryRowCount.java @@ -75,6 +75,7 @@ public class CQueryRowCount { * Return a summary description of this query. */ public String getSummary() { + //noinspection StringBufferReplaceableByString StringBuilder sb = new StringBuilder(80); sb.append("FindRowCount exeMicros[").append(executionTimeMicros) .append("] rows[").append(rowCount) diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java index d1f69d22d..00812252c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java @@ -41,6 +41,7 @@ public class SqlTreeProperties { } public void add(BeanProperty[] props) { + //noinspection ManualArrayToCollectionCopy for (int i = 0; i < props.length; i++) { propsList.add(props[i]); }