diff --git a/ebean-api/src/main/java/io/ebean/OrderBy.java b/ebean-api/src/main/java/io/ebean/OrderBy.java index d083387b3..68e5acbb5 100644 --- a/ebean-api/src/main/java/io/ebean/OrderBy.java +++ b/ebean-api/src/main/java/io/ebean/OrderBy.java @@ -333,10 +333,10 @@ public class OrderBy implements Serializable { sb.append(property); } if (!ascending) { - sb.append(" ").append("desc"); + sb.append(' ').append("desc"); } if (nulls != null) { - sb.append(" ").append(nulls).append(" ").append(highLow); + sb.append(' ').append(nulls).append(' ').append(highLow); } return sb.toString(); } diff --git a/ebean-api/src/main/java/io/ebean/bean/ToStringBuilder.java b/ebean-api/src/main/java/io/ebean/bean/ToStringBuilder.java index 8aee05e41..49f589d41 100644 --- a/ebean-api/src/main/java/io/ebean/bean/ToStringBuilder.java +++ b/ebean-api/src/main/java/io/ebean/bean/ToStringBuilder.java @@ -45,7 +45,7 @@ public final class ToStringBuilder { id.putIfAbsent(bean, 0); } if (counter <= MAX) { - sb.append(bean.getClass().getSimpleName()).append("@").append(counter).append("("); + sb.append(bean.getClass().getSimpleName()).append('@').append(counter).append('('); } } @@ -77,7 +77,7 @@ public final class ToStringBuilder { */ public void end() { if (counter <= MAX) { - sb.append(")"); + sb.append(')'); } } @@ -90,7 +90,7 @@ public final class ToStringBuilder { } else { sb.append(", "); } - sb.append(name).append(":"); + sb.append(name).append(':'); } private void value(Object value) { @@ -125,20 +125,20 @@ public final class ToStringBuilder { sb.append("{}"); } else { boolean firstElement = true; - sb.append("{"); + sb.append('{'); for (Map.Entry entry : map.entrySet()) { if (firstElement) { firstElement = false; } else { sb.append(", "); } - sb.append(entry.getKey()).append(":"); + sb.append(entry.getKey()).append(':'); value(entry.getValue()); if (counter > MAX) { return; } } - sb.append("}"); + sb.append('}'); } } @@ -151,7 +151,7 @@ public final class ToStringBuilder { return; } boolean firstElement = true; - sb.append("["); + sb.append('['); for (Object o : c) { if (firstElement) { firstElement = false; @@ -163,7 +163,7 @@ public final class ToStringBuilder { return; } } - sb.append("]"); + sb.append(']'); } private boolean push(Object bean) { @@ -178,7 +178,7 @@ public final class ToStringBuilder { Integer idx = id.putIfAbsent(bean, counter++); if (idx != null) { --counter; - sb.append(bean.getClass().getSimpleName()).append("@").append(idx); + sb.append(bean.getClass().getSimpleName()).append('@').append(idx); return false; } first = true; diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/BasicSqlLimitOffset.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/BasicSqlLimitOffset.java index bf2f8557f..58c2469d2 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/BasicSqlLimitOffset.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/BasicSqlLimitOffset.java @@ -23,11 +23,11 @@ public class BasicSqlLimitOffset implements BasicSqlLimiter { sb.append(dbSql); if (maxRows > 0) { - sb.append(" ").append(LIMIT); - sb.append(" ").append(maxRows); + sb.append(' ').append(LIMIT); + sb.append(' ').append(maxRows); } if (firstRow > 0) { - sb.append(" ").append(OFFSET).append(" "); + sb.append(' ').append(OFFSET).append(' '); sb.append(firstRow); } return sb.toString(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionRequest.java index 5edd4a72a..cf53a0131 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpressionRequest.java @@ -41,6 +41,11 @@ public interface SpiExpressionRequest { */ SpiExpressionRequest append(String expression); + /** + * Append to the expression sql without any parsing. + */ + SpiExpressionRequest append(char c); + /** * Append to the expression sql with logical property parsing to db columns with logical path prefix. *

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 c13a7d6db..275c2fc7f 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 @@ -121,7 +121,7 @@ final class DumpMetrics { } private void appendQueryName(MetaQueryMetric metric, StringBuilder sb) { - sb.append("query:").append(padName(metric.name())).append(" "); + sb.append("query:").append(padName(metric.name())).append(' '); } private void appendProfileAndSql(MetaQueryMetric metric, StringBuilder sb) { @@ -136,7 +136,7 @@ final class DumpMetrics { private void log(MetaTimedMetric metric) { StringBuilder sb = new StringBuilder(); - sb.append(padNameTimed(metric.name())).append(" "); + sb.append(padNameTimed(metric.name())).append(' '); appendCounters(metric, sb); out(sb.toString()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java index 951f6b92b..d24bb936a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java @@ -105,9 +105,9 @@ public final class TableJoin { @Override public String toString() { StringBuilder sb = new StringBuilder(30); - sb.append(type).append(" ").append(table).append(" "); + sb.append(type).append(' ').append(table).append(' '); for (TableJoinColumn column : columns) { - sb.append(column).append(" "); + sb.append(column).append(' '); } return sb.toString(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java index 81e386b70..4742f4c87 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java @@ -68,7 +68,7 @@ final class AllEqualsExpression extends NonPrepareExpression { if (propMap.isEmpty()) { return; } - request.append("("); + request.append('('); int count = 0; for (Map.Entry entry : propMap.entrySet()) { Object value = entry.getValue(); @@ -84,7 +84,7 @@ final class AllEqualsExpression extends NonPrepareExpression { } count++; } - request.append(")"); + request.append(')'); } /** @@ -105,9 +105,9 @@ final class AllEqualsExpression extends NonPrepareExpression { } else { builder.append(" =?"); } - builder.append(","); + builder.append(','); } - builder.append("]"); + builder.append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java index 3c55023dd..a50b48469 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java @@ -44,7 +44,7 @@ final class ArrayContainsExpression extends AbstractExpression { public void queryPlanHash(StringBuilder builder) { builder.append("ArrayContains[").append(propName) .append(" b:").append(contains) - .append(" ?:").append(values.length).append("]"); + .append(" ?:").append(values.length).append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java index 3757643c2..5c031f78e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java @@ -30,7 +30,7 @@ final class ArrayIsEmptyExpression extends AbstractExpression { } else { builder.append("ArrayIsNotEmpty["); } - builder.append(propName).append("]"); + builder.append(propName).append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java index aab1c549b..c2fd44779 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java @@ -57,7 +57,7 @@ final class BetweenExpression extends AbstractExpression { @Override public void queryPlanHash(StringBuilder builder) { - builder.append("Between[").append(propName).append("]"); + builder.append("Between[").append(propName).append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java index 0c860636a..fed80ff63 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java @@ -86,7 +86,7 @@ final class BetweenPropertyExpression extends NonPrepareExpression { @Override public void queryPlanHash(StringBuilder builder) { - builder.append("BetweenProperties[").append("low:").append(lowProperty).append(" high:").append(highProperty).append("]"); + builder.append("BetweenProperties[").append("low:").append(lowProperty).append(" high:").append(highProperty).append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java index 09f505ba4..ac98f1824 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java @@ -61,9 +61,9 @@ final class CaseInsensitiveEqualExpression extends AbstractValueExpression { @Override public void queryPlanHash(StringBuilder builder) { if (not) { - builder.append("Ine[").append(propName).append("]"); + builder.append("Ine[").append(propName).append(']'); } else { - builder.append("Ieq[").append(propName).append("]"); + builder.append("Ieq[").append(propName).append(']'); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java index 83c305224..7483a3335 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java @@ -209,7 +209,7 @@ final class DefaultExampleExpression implements SpiExpression, ExampleExpression if (list.isEmpty()) { request.append(SQL_TRUE); } else { - request.append("("); + request.append('('); for (int i = 0; i < list.size(); i++) { SpiExpression item = list.get(i); if (i > 0) { @@ -217,7 +217,7 @@ final class DefaultExampleExpression implements SpiExpression, ExampleExpression } item.addSql(request); } - request.append(")"); + request.append(')'); } } @@ -229,9 +229,9 @@ final class DefaultExampleExpression implements SpiExpression, ExampleExpression builder.append("Example["); for (SpiExpression expr : list) { expr.queryPlanHash(builder); - builder.append(","); + builder.append(','); } - builder.append("]"); + builder.append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java index 49e7a7144..a9c64bcaa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java @@ -610,7 +610,7 @@ public class DefaultExpressionList implements SpiExpressionList { builder.append("textRoot:true "); } if (allDocNestedPath != null) { - builder.append("path:").append(allDocNestedPath).append(" "); + builder.append("path:").append(allDocNestedPath).append(' '); } for (SpiExpression expr : list) { expr.queryPlanHash(builder); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java index 3170dbee2..28468b834 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java @@ -82,7 +82,7 @@ public final class DefaultExpressionRequest implements SpiExpressionRequest { */ @Override public void appendLike(boolean rawLikeExpression) { - sql.append(" "); + sql.append(' '); sql.append(queryRequest.dbLikeClause(rawLikeExpression)); } @@ -114,15 +114,18 @@ public final class DefaultExpressionRequest implements SpiExpressionRequest { return sql; } - /** - * Append text the underlying sql expression. - */ @Override public SpiExpressionRequest append(String expression) { sql.append(expression); return this; } + @Override + public SpiExpressionRequest append(char c) { + sql.append(c); + return this; + } + @Override public SpiExpressionRequest property(String expression) { if (deployParser == null) { @@ -160,7 +163,7 @@ public final class DefaultExpressionRequest implements SpiExpressionRequest { if (bindLog == null) { bindLog = new StringBuilder(); } else { - bindLog.append(","); + bindLog.append(','); } bindLog.append(val); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java index 60b831dc7..81f00e49d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java @@ -82,7 +82,7 @@ final class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreE @Override public void queryPlanHash(StringBuilder builder) { builder.append("ExistsQuery[").append(" not:").append(not); - builder.append(" sql:").append(sql).append(" ?:").append(bindParams.size()).append("]"); + builder.append(" sql:").append(sql).append(" ?:").append(bindParams.size()).append(']'); } @Override @@ -95,7 +95,7 @@ final class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreE if (not) { request.append("not "); } - request.append("exists (").parse(sql).append(")"); + request.append("exists (").parse(sql).append(')'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsSqlQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsSqlQueryExpression.java index 7f09de4c5..497c417c6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsSqlQueryExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsSqlQueryExpression.java @@ -58,7 +58,7 @@ final class ExistsSqlQueryExpression implements SpiExpression, UnsupportedDocSto @Override public void queryPlanHash(StringBuilder builder) { builder.append("ExistsSqlQuery[").append(" not:").append(not); - builder.append(" sql:").append(subQuery).append(" ?:").append(bindParams.length).append("]"); + builder.append(" sql:").append(subQuery).append(" ?:").append(bindParams.length).append(']'); } @Override @@ -73,7 +73,7 @@ final class ExistsSqlQueryExpression implements SpiExpression, UnsupportedDocSto if (not) { request.append("not "); } - request.append("exists (").parse(subQuery).append(")"); + request.append("exists (").parse(subQuery).append(')'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java index 3ad63ae14..41805a82b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java @@ -109,7 +109,7 @@ public final class IdInExpression extends NonPrepareExpression implements IdInCo // query plan specific to the number of parameters in the IN clause builder.append(idCollection.size()); } - builder.append("]"); + builder.append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java index 272286b70..e47fcf925 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java @@ -193,7 +193,7 @@ public final class InExpression extends AbstractExpression implements IdInCommon builder.append(bindValues.size()); } } - builder.append("]"); + builder.append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java index 077c253a9..e0c975ffe 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java @@ -103,15 +103,15 @@ final class InPairsExpression extends AbstractExpression { } else { builder.append("InPairs["); } - builder.append(property0).append("-"); - builder.append(property1).append("-"); - builder.append(separator).append("-"); + builder.append(property0).append('-'); + builder.append(property1).append('-'); + builder.append(separator).append('-'); builder.append(suffix).append(" ?"); if (!multiValueSupported || entries.isEmpty()) { // query plan specific to the number of parameters in the IN clause builder.append(entries.size()); } - builder.append("]"); + builder.append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java index ec0348e4b..47b5e6f4a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InRangeExpression.java @@ -55,12 +55,12 @@ final class InRangeExpression extends AbstractExpression { if (prop != null && prop.isDbEncrypted()) { pname = prop.beanProperty().decryptProperty(propName); } - request.append("(").property(pname).append(" >= ? and ").property(pname).append(" < ?)"); + request.append('(').property(pname).append(" >= ? and ").property(pname).append(" < ?)"); } @Override public void queryPlanHash(StringBuilder builder) { - builder.append("InRange[").append(propName).append("]"); + builder.append("InRange[").append(propName).append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InTuplesExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InTuplesExpression.java index 90be80a46..2d62d4f0f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InTuplesExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InTuplesExpression.java @@ -98,10 +98,10 @@ final class InTuplesExpression extends AbstractExpression { request.append(not ? SQL_TRUE : SQL_FALSE); return; } - request.append("("); + request.append('('); for (int i = 0; i < properties.length; i++) { if (i > 0) { - request.append(","); + request.append(','); } request.property(properties[i]); } @@ -111,7 +111,7 @@ final class InTuplesExpression extends AbstractExpression { } else { addSqlBinding(request); } - request.append(")"); + request.append(')'); } private void addSqlLiterals(SpiExpressionRequest request) { @@ -136,7 +136,7 @@ final class InTuplesExpression extends AbstractExpression { final String eb = entryBinding(); for (int i = 0; i < entries.size(); i++) { if (i > 0) { - request.append(","); + request.append(','); } request.append(eb); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java index de426f425..299961da9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java @@ -84,7 +84,7 @@ final class IsEmptyExpression extends AbstractExpression { request .append("exists (select 1 ") .parse(prop.assocIsEmpty(request, propertyPath)) - .append(")"); + .append(')'); } /** @@ -97,7 +97,7 @@ final class IsEmptyExpression extends AbstractExpression { } else { builder.append("IsNotEmpty["); } - builder.append(propName).append("]"); + builder.append(propName).append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java index f2af9a83e..07876e629 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java @@ -80,7 +80,7 @@ final class JsonPathExpression extends AbstractExpression { if (upperValue != null) { builder.append(" ?2"); } - builder.append("]"); + builder.append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java index 7c93917da..d90062675 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java @@ -152,7 +152,7 @@ final class JunctionExpression implements SpiJunction, SpiExpression, Expr List list = exprList.internalList(); if (!list.isEmpty()) { request.append(type.prefix()); - request.append("("); + request.append('('); for (int i = 0; i < list.size(); i++) { SpiExpression item = list.get(i); if (i > 0) { @@ -160,7 +160,7 @@ final class JunctionExpression implements SpiJunction, SpiExpression, Expr } item.addSql(request); } - request.append(")"); + request.append(')'); } } @@ -176,12 +176,12 @@ final class JunctionExpression implements SpiJunction, SpiExpression, Expr */ @Override public void queryPlanHash(StringBuilder builder) { - builder.append(type).append("["); + builder.append(type).append('['); for (SpiExpression expr : exprList.internalList()) { expr.queryPlanHash(builder); - builder.append(","); + builder.append(','); } - builder.append("]"); + builder.append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java index 3027eed5a..c99c648aa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java @@ -44,7 +44,7 @@ final class LikeExpression extends AbstractValueExpression { pname = prop.beanProperty().decryptProperty(propName); } if (caseInsensitive) { - request.append("lower(").property(pname).append(")"); + request.append("lower(").property(pname).append(')'); } else { request.property(pname); } @@ -62,9 +62,9 @@ final class LikeExpression extends AbstractValueExpression { @Override public void queryPlanHash(StringBuilder builder) { if (caseInsensitive){ - builder.append("I"); + builder.append('I'); } - builder.append("Like[").append(type).append(" ").append(propName).append("]"); + builder.append("Like[").append(type).append(' ').append(propName).append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java index 0f17974e4..a98ac8166 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java @@ -141,11 +141,11 @@ abstract class LogicExpression implements SpiExpression { @Override public void addSql(SpiExpressionRequest request) { - request.append("("); + request.append('('); expOne.addSql(request); request.append(conjunction ? AND : OR); expTwo.addSql(request); - request.append(")"); + request.append(')'); } @Override @@ -159,11 +159,11 @@ abstract class LogicExpression implements SpiExpression { */ @Override public void queryPlanHash(StringBuilder builder) { - builder.append("Logic").append(conjunction ? AND : OR).append("["); + builder.append("Logic").append(conjunction ? AND : OR).append('['); expOne.queryPlanHash(builder); - builder.append(","); + builder.append(','); expTwo.queryPlanHash(builder); - builder.append("]"); + builder.append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java index d14b8f83d..ce960c3f4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java @@ -49,7 +49,7 @@ final class NativeILikeExpression extends AbstractExpression { */ @Override public void queryPlanHash(StringBuilder builder) { - builder.append("NativeILike[").append(propName).append("]"); + builder.append("NativeILike[").append(propName).append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java index 0bb63f1ed..72a495fd9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java @@ -72,10 +72,10 @@ final class NestedPathWrapperExpression implements SpiExpression { public void queryPlanHash(StringBuilder builder) { builder.append("NestedPath["); if (nestedPath != null) { - builder.append("path:").append(nestedPath).append(" "); + builder.append("path:").append(nestedPath).append(' '); } delegate.queryPlanHash(builder); - builder.append("]"); + builder.append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java index 462e60d9e..6eae8b1fa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NotExpression.java @@ -96,7 +96,7 @@ final class NotExpression implements SpiExpression { public void queryPlanHash(StringBuilder builder) { builder.append("Not["); exp.queryPlanHash(builder); - builder.append("]"); + builder.append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java index ca1f347d0..7168f61c8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NullExpression.java @@ -86,7 +86,7 @@ final class NullExpression extends AbstractExpression { } else { builder.append("Null["); } - builder.append(propName).append("]"); + builder.append(propName).append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java index 72c968e28..afe6572a8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpression.java @@ -65,7 +65,7 @@ final class RawExpression extends NonPrepareExpression { if (values != null) { builder.append(" ?").append(values.length); } - builder.append("]"); + builder.append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpressionBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpressionBuilder.java index db893cccb..057732572 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpressionBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/RawExpressionBuilder.java @@ -54,9 +54,9 @@ final class RawExpressionBuilder { StringBuilder sqlExpand = new StringBuilder(values.size() * 2); for (int i = 0; i < values.size(); i++) { if (i > 0) { - sqlExpand.append(","); + sqlExpand.append(','); } - sqlExpand.append("?"); + sqlExpand.append('?'); } return sqlExpand.toString(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java index 93b1953c8..59bc76d03 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java @@ -117,7 +117,7 @@ public final class SimpleExpression extends AbstractValueExpression { */ @Override public void queryPlanHash(StringBuilder builder) { - builder.append(type.name()).append("[").append(propName).append("]"); + builder.append(type.name()).append('[').append(propName).append(']'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SubQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SubQueryExpression.java index ff60d7479..44adcbeb5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SubQueryExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SubQueryExpression.java @@ -57,7 +57,7 @@ final class SubQueryExpression extends AbstractExpression implements Unsupported public void queryPlanHash(StringBuilder builder) { builder.append("SubQuery[").append(propName).append(op.expression) .append(" sql:").append(sql) - .append(" ?:").append(bindParams.size()).append("]"); + .append(" ?:").append(bindParams.size()).append(']'); } /** @@ -75,7 +75,7 @@ final class SubQueryExpression extends AbstractExpression implements Unsupported @Override public void addSql(SpiExpressionRequest request) { - request.property(propName).append(op.expression).append("(").parse(sql).append(")"); + request.property(propName).append(op.expression).append('(').parse(sql).append(')'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SubQueryRawExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SubQueryRawExpression.java index 007386d5b..d69cdc1bf 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SubQueryRawExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SubQueryRawExpression.java @@ -31,7 +31,7 @@ final class SubQueryRawExpression extends AbstractExpression implements Unsuppor public void queryPlanHash(StringBuilder builder) { builder.append("SubQueryRaw[").append(propName).append(op.expression) .append(" subQuery:").append(subQuery) - .append(" ?:").append(bindParams.length).append("]"); + .append(" ?:").append(bindParams.length).append(']'); } @Override @@ -43,7 +43,7 @@ final class SubQueryRawExpression extends AbstractExpression implements Unsuppor @Override public void addSql(SpiExpressionRequest request) { - request.property(propName).append(op.expression).append("(").append(subQuery).append(")"); + request.property(propName).append(op.expression).append('(').append(subQuery).append(')'); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java index b17fbf533..a91131d53 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/BaseDbExpression.java @@ -11,7 +11,7 @@ abstract class BaseDbExpression implements DbExpressionHandler { @Override public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) { final String bitOp = bitOp(operator); - request.append("(").property(propName).append(" ").append(bitOp).append(" ? ").append(compare).append(" ?)"); + request.append('(').property(propName).append(' ').append(bitOp).append(" ? ").append(compare).append(" ?)"); } private String bitOp(BitwiseOp operator) { @@ -30,7 +30,7 @@ abstract class BaseDbExpression implements DbExpressionHandler { */ protected void bitwiseFunction(SpiExpressionRequest request, String propName, BitwiseOp operator, String compare) { final String funcName = functionName(operator); - request.append(funcName).append("(").property(propName).append(", ?) ").append(compare).append(" ?"); + request.append(funcName).append('(').property(propName).append(", ?) ").append(compare).append(" ?"); } protected String functionName(BitwiseOp operator) { @@ -60,7 +60,7 @@ abstract class BaseDbExpression implements DbExpressionHandler { */ String concatOperator(String property0, String separator, String property1, String suffix) { StringBuilder sb = new StringBuilder(40); - sb.append("(").append(property0).append("||'").append(separator).append("'||").append(property1); + sb.append('(').append(property0).append("||'").append(separator).append("'||").append(property1); if (suffix != null && !suffix.isEmpty()) { sb.append("||'").append(suffix).append('\''); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java index e94e94e3a..8791cfa07 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/H2DbExpression.java @@ -11,6 +11,6 @@ final class H2DbExpression extends BasicDbExpression { @Override public void bitwise(SpiExpressionRequest request, String propName, BitwiseOp operator, long flags, String compare, long match) { final String funcName = functionName(operator); - request.append(funcName).append("(").property(propName).append(", cast(? as long)) ").append(compare).append(" cast(? as long)"); + request.append(funcName).append('(').property(propName).append(", cast(? as long)) ").append(compare).append(" cast(? as long)"); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java index bc582e51c..9c8910fca 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/HanaDbExpression.java @@ -21,7 +21,7 @@ final class HanaDbExpression extends BaseDbExpression { @Override public void arrayIsEmpty(SpiExpressionRequest request, String propName, boolean empty) { - request.append("cardinality(").property(propName).append(")"); + request.append("cardinality(").property(propName).append(')'); if (empty) { request.append(" = 0"); } else { @@ -36,7 +36,7 @@ final class HanaDbExpression extends BaseDbExpression { if (suffix != null && !suffix.isEmpty()) { sb.append("||'").append(suffix).append('\''); } - sb.append(")"); + sb.append(')'); return sb.toString(); } @@ -50,7 +50,7 @@ final class HanaDbExpression extends BaseDbExpression { if (!contains) { request.append(" not "); } - request.append(" member of ").property(propName).append(")"); + request.append(" member of ").property(propName).append(')'); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MariaDbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MariaDbExpression.java index 0d5cc3ff6..6e336e642 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MariaDbExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MariaDbExpression.java @@ -10,6 +10,6 @@ final class MariaDbExpression extends BasicDbExpression { @Override public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) { - request.append("(").property(propName).append(" ->> '$.").append(path).append("')").append(operator.bind()); + request.append('(').property(propName).append(" ->> '$.").append(path).append("')").append(operator.bind()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java index ca37679f9..59965abba 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/MySqlDbExpression.java @@ -10,7 +10,7 @@ final class MySqlDbExpression extends BasicDbExpression { @Override public void json(SpiExpressionRequest request, String propName, String path, Op operator, Object value) { - request.append("(").property(propName).append(" ->> '$.").append(path).append("')").append(operator.bind()); + request.append('(').property(propName).append(" ->> '$.").append(path).append("')").append(operator.bind()); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java index 66d3da284..ab036d175 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/PostgresDbExpression.java @@ -18,13 +18,13 @@ final class PostgresDbExpression extends BaseDbExpression { String[] paths = path.split("\\."); if (paths.length == 1) { // (t0.content ->> 'title') = 'Some value' - request.append("(").property(propName).append(" ->> '").append(path).append("')"); + request.append('(').property(propName).append(" ->> '").append(path).append("')"); } else { // (t0.content #>> '{path,inner}') = 'Some value' - request.append("(").property(propName).append(" #>> '{"); + request.append('(').property(propName).append(" #>> '{"); for (int i = 0; i < paths.length; i++) { if (i > 0) { - request.append(","); + request.append(','); } request.append(paths[i]); } @@ -42,9 +42,9 @@ final class PostgresDbExpression extends BaseDbExpression { for (int i = 1; i < values.length; i++) { request.append(",?"); } - request.append("]").append(PostgresCast.cast(values[0], true)); + request.append(']').append(PostgresCast.cast(values[0], true)); if (!contains) { - request.append(")"); + request.append(')'); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java index 900f47aae..6feb77cf7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java @@ -28,7 +28,7 @@ final class DTimeMetricStats implements TimedMetricStats { public String toString() { StringBuilder sb = new StringBuilder(); if (name != null) { - sb.append("name:").append(name).append(" "); + sb.append("name:").append(name).append(' '); } sb.append("count:").append(count) .append(" total:").append(total) 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 e9e58f78a..55faebf8b 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 @@ -148,7 +148,7 @@ final class CQueryBuilder { StringBuilder sb = new StringBuilder(200); sb.append("update ").append(request.descriptor().baseTable()); if (rootTableAlias != null) { - sb.append(" ").append(rootTableAlias); + sb.append(' ').append(rootTableAlias); } sb.append(" set ").append(predicates.dbUpdateClause()); String updateClause = sb.toString(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java index eac5fea14..1f79e4aeb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java @@ -70,7 +70,7 @@ final class CQueryBuilderRawSql { } else { sb.append(sql.getPreFrom()); } - sb.append(" "); + sb.append(' '); String s = sql.getPreWhere(); BindParams bindParams = request.query().bindParams(); @@ -80,7 +80,7 @@ final class CQueryBuilderRawSql { // clause (so not allowed in having etc - use unparsed) s = BindParamsParser.parse(bindParams, s); } - sb.append(s).append(" "); + sb.append(s).append(' '); String dynamicWhere = null; if (request.query().getId() != null) { @@ -109,12 +109,12 @@ final class CQueryBuilderRawSql { } else { sb.append(" where "); } - sb.append(dynamicWhere).append(" "); + sb.append(dynamicWhere).append(' '); } String preHaving = sql.getPreHaving(); if (hasValue(preHaving)) { - sb.append(preHaving).append(" "); + sb.append(preHaving).append(' '); } String dbHaving = predicates.dbHaving(); @@ -124,10 +124,10 @@ final class CQueryBuilderRawSql { } else { sb.append(" having "); } - sb.append(dbHaving).append(" "); + sb.append(dbHaving).append(' '); } if (hasValue(orderBy)) { - sb.append(" ").append(sql.getOrderByPrefix()).append(" ").append(orderBy); + sb.append(' ').append(sql.getOrderByPrefix()).append(' ').append(orderBy); } return sb.toString().trim(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java index b615fcd4e..b7451b246 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java @@ -122,12 +122,12 @@ final class DefaultDbSqlContext implements DbSqlContext { } tableJoins.add(joinKey); - sb.append(" ").append(type); + sb.append(' ').append(type); boolean addAsOfOnClause = false; if (draftSupport != null) { appendTable(table, draftSupport.draftTable(table)); } else if (!historyQuery) { - sb.append(" ").append(table).append(" "); + sb.append(' ').append(table).append(' '); } else { // check if there is an associated history table and if so // use the unionAll view - we expect an additional predicate to match @@ -174,9 +174,9 @@ final class DefaultDbSqlContext implements DbSqlContext { private void appendTable(String table, String draftTable) { if (draftTable != null) { // there is an associated history table and view so use that - sb.append(" ").append(draftTable).append(" "); + sb.append(' ').append(draftTable).append(' '); } else { - sb.append(" ").append(table).append(" "); + sb.append(' ').append(table).append(' '); } } @@ -237,7 +237,7 @@ final class DefaultDbSqlContext implements DbSqlContext { } // we only want to add this join once formulaJoins.add(converted); - sb.append(" "); + sb.append(' '); if (joinType == SqlJoinType.OUTER) { if ("join".equalsIgnoreCase(converted.substring(0, 4))) { // prepend left as we are in the 'many' part @@ -259,7 +259,7 @@ final class DefaultDbSqlContext implements DbSqlContext { sb.append(COMMA); sb.append(converted); if (columnAlias != null) { - sb.append(" ").append(columnAlias); + sb.append(' ').append(columnAlias); } else { appendColumnAlias(); } @@ -286,7 +286,7 @@ final class DefaultDbSqlContext implements DbSqlContext { private void appendColumnAlias() { if (useColumnAlias) { - sb.append(" "); + sb.append(' '); sb.append(columnAliasPrefix); sb.append(columnIndex); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java index 5c8cd3799..590d7ecb4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java @@ -66,13 +66,10 @@ final class SqlTreeNodeRoot extends SqlTreeNodeBean { */ @Override public SqlJoinType appendFromBaseTable(DbSqlContext ctx, SqlJoinType joinType) { - ctx.append(baseTable); - ctx.append(" ").append(baseTableAlias); - ctx.appendFromForUpdate(); + ctx.append(baseTable).append(" ").append(baseTableAlias).appendFromForUpdate(); if (includeJoin != null) { - String a1 = baseTableAlias; - String a2 = "int_"; // unique alias for intersection join - includeJoin.addJoin(joinType, a1, a2, ctx); + // unique alias for intersection join + includeJoin.addJoin(joinType, baseTableAlias, "int_", ctx); } return joinType; } 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 e2ce3f307..c570254a0 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 @@ -108,7 +108,7 @@ public final class OrmQueryDetail implements Serializable { if (fetchPaths != null) { for (OrmQueryProperties join : fetchPaths.values()) { if (sb.length() > 0) { - sb.append(" "); + sb.append(' '); } join.asStringDebug("fetch ", sb); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java index 8b41ae8b0..d2feee9dd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java @@ -265,7 +265,7 @@ public final class OrmQueryProperties implements Serializable { public void asStringDebug(String prefix, StringBuilder sb) { sb.append(prefix); if (path != null) { - sb.append(path).append(" "); + sb.append(path).append(' '); } if (allProperties) { sb.append("(*)"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java index 48e61789b..9968c426a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java @@ -67,7 +67,7 @@ final class DRawSqlColumnsParser { StringBuilder sb = new StringBuilder(); sb.append(split[0]); for (int i = 1; i < split.length - 2; i++) { - sb.append(" ").append(split[i]); + sb.append(' ').append(split[i]); } return new ColumnMapping.Column(indexPos++, sb.toString(), split[split.length - 1]); } diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java index 3fe031260..323cb80cd 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java @@ -51,19 +51,19 @@ public final class DocPropertyOptions { public String toString() { StringBuilder sb = new StringBuilder(); if (code != null) { - sb.append("code:").append(code).append(" "); + sb.append("code:").append(code).append(' '); } if (sortable != null) { - sb.append("sortable:").append(sortable).append(" "); + sb.append("sortable:").append(sortable).append(' '); } if (store != null) { - sb.append("store:").append(store).append(" "); + sb.append("store:").append(store).append(' '); } if (boost != null) { - sb.append("boost:").append(boost).append(" "); + sb.append("boost:").append(boost).append(' '); } if (nullValue != null) { - sb.append("nullValue:").append(nullValue).append(" "); + sb.append("nullValue:").append(nullValue).append(' '); } return sb.toString(); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java index 191cb3584..74ee2ef76 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java @@ -54,6 +54,12 @@ public class TDSpiExpressionRequest implements SpiExpressionRequest { return this; } + @Override + public SpiExpressionRequest append(char c) { + sql.append(c); + return this; + } + @Override public SpiExpressionRequest property(String expression) { sql.append(expression); diff --git a/platforms/hana/src/main/java/io/ebean/platform/hana/HanaBasicSqlLimiter.java b/platforms/hana/src/main/java/io/ebean/platform/hana/HanaBasicSqlLimiter.java index d25d1f801..ea476652d 100644 --- a/platforms/hana/src/main/java/io/ebean/platform/hana/HanaBasicSqlLimiter.java +++ b/platforms/hana/src/main/java/io/ebean/platform/hana/HanaBasicSqlLimiter.java @@ -9,11 +9,11 @@ final class HanaBasicSqlLimiter implements BasicSqlLimiter { StringBuilder sb = new StringBuilder(50 + dbSql.length()); sb.append(dbSql); if (maxRows > 0) { - sb.append(" ").append("limit"); - sb.append(" ").append(maxRows); + sb.append(' ').append("limit"); + sb.append(' ').append(maxRows); if (firstRow > 0) { - sb.append(" ").append("offset").append(" "); + sb.append(' ').append("offset").append(' '); sb.append(firstRow); } } diff --git a/platforms/sqlanywhere/src/main/java/io/ebean/platform/sqlanywhere/SqlAnywhereLimiter.java b/platforms/sqlanywhere/src/main/java/io/ebean/platform/sqlanywhere/SqlAnywhereLimiter.java index 5748ce6be..d264457ec 100644 --- a/platforms/sqlanywhere/src/main/java/io/ebean/platform/sqlanywhere/SqlAnywhereLimiter.java +++ b/platforms/sqlanywhere/src/main/java/io/ebean/platform/sqlanywhere/SqlAnywhereLimiter.java @@ -22,11 +22,11 @@ public final class SqlAnywhereLimiter implements SqlLimiter { } int maxRows = request.getMaxRows(); if (maxRows > 0) { - sb.append("top ").append(maxRows).append(" "); + sb.append("top ").append(maxRows).append(' '); } int firstRow = request.getFirstRow(); if (firstRow > 0) { - sb.append("start at ").append(firstRow + 1).append(" "); + sb.append("start at ").append(firstRow + 1).append(' '); } sb.append(dbSql); String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery()); diff --git a/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerBasicSqlLimiter.java b/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerBasicSqlLimiter.java index 66dee4e07..b368c366b 100644 --- a/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerBasicSqlLimiter.java +++ b/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerBasicSqlLimiter.java @@ -14,8 +14,8 @@ final class SqlServerBasicSqlLimiter implements BasicSqlLimiter { if (!dbSql.toLowerCase().contains("order by")) { sb.append(" order by 1"); } - sb.append(" ").append("offset"); - sb.append(" ").append(firstRow).append(" rows"); + sb.append(' ').append("offset"); + sb.append(' ').append(firstRow).append(" rows"); if (maxRows > 0) { sb.append(" fetch next ").append(maxRows).append(" rows only"); } diff --git a/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerSqlLimiter.java b/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerSqlLimiter.java index eaa0d994a..da8b5edcd 100644 --- a/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerSqlLimiter.java +++ b/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerSqlLimiter.java @@ -21,7 +21,7 @@ final class SqlServerSqlLimiter implements SqlLimiter { if (request.isDistinct()) { sb.append("distinct "); } - sb.append("top ").append(maxRows).append(" "); + sb.append("top ").append(maxRows).append(' '); sb.append(dbSql); return new SqlLimitResponse(sb.toString()); } @@ -30,8 +30,8 @@ final class SqlServerSqlLimiter implements SqlLimiter { sb.append("distinct "); } sb.append(dbSql); - sb.append(" ").append("offset"); - sb.append(" ").append(firstRow).append(" rows"); + sb.append(' ').append("offset"); + sb.append(' ').append(firstRow).append(" rows"); if (maxRows > 0) { sb.append(" fetch next ").append(maxRows).append(" rows only"); }