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 f3ca6555f..da38b3856 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java @@ -87,7 +87,7 @@ public final class ScopeTrans { @Override public String toString() { - return "ScopeTrans[" + transaction + "]"; + return "ScopeTrans " + transaction; } /** 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 383746f13..323a9b7da 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java @@ -30,7 +30,7 @@ public final class ScopedTransaction extends SpiTransactionProxy { @Override public String toString() { - return "ScopedTransaction[" + current + "]"; + return "ScopedTransaction " + current; } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java index 21f04704d..25a478bc2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java @@ -52,7 +52,7 @@ public final class RemoteCacheEvent implements BinaryWritable { @Override public String toString() { - return "CacheEvent[ clearAll:" + clearAll + " caches:" + clearCaches + "]"; + return "CacheEvent clearAll:" + clearAll + " caches:" + clearCaches; } public static RemoteCacheEvent readBinaryMessage(BinaryReadContext dataInput) throws IOException { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cluster/BinaryTransactionEventReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/cluster/BinaryTransactionEventReader.java index aebf45ea4..4c3138a45 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cluster/BinaryTransactionEventReader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cluster/BinaryTransactionEventReader.java @@ -32,7 +32,7 @@ public class BinaryTransactionEventReader { String serverName = dataInput.readUTF(); SpiEbeanServer server = (SpiEbeanServer) serverLookup.getServer(serverName); if (server == null) { - throw new IllegalStateException("EbeanServer not found for name [" + serverName + "]"); + throw new IllegalStateException("Database not found for name " + serverName); } RemoteTransactionEvent event = new RemoteTransactionEvent(server); event.readBinary(dataInput); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index 8e1f2fb84..4731ebd01 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -229,7 +229,7 @@ final class DefaultBeanLoader { Object dbBean = query.findOne(); if (dbBean == null) { - throw new EntityNotFoundException("Bean not found during lazy load or refresh." + " id[" + id + "] type[" + desc.type() + "]"); + throw new EntityNotFoundException("Bean not found during lazy load or refresh. Id:" + id + " type:" + desc.type()); } desc.resetManyProperties(dbBean); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 133fadef6..2c604ed98 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -1079,7 +1079,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { if (list.isEmpty()) { return null; } else if (list.size() > 1) { - throw new NonUniqueResultException("Unique expecting 0 or 1 results but got [" + list.size() + "]"); + throw new NonUniqueResultException("Unique expecting 0 or 1 results but got " + list.size()); } else { return list.get(0); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index 2af16b25b..4016596f0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -928,20 +928,20 @@ public final class PersistRequestBean extends PersistRequest implements BeanP } private void logSummaryMessage() { - String draft = (beanDescriptor.isDraftable() && !publish) ? " draft[true]" : ""; + String draft = (beanDescriptor.isDraftable() && !publish) ? "] draft[true]" : "]"; String name = beanDescriptor.name(); switch (type) { case INSERT: - transaction.logSummary("Inserted [" + name + "] [" + (idValue == null ? "" : idValue) + "]" + draft); + transaction.logSummary("Inserted [" + name + "] [" + (idValue == null ? "" : idValue) + draft); break; case UPDATE: - transaction.logSummary("Updated [" + name + "] [" + idValue + "]" + draft); + transaction.logSummary("Updated [" + name + "] [" + idValue + draft); break; case DELETE: - transaction.logSummary("Deleted [" + name + "] [" + idValue + "]" + draft); + transaction.logSummary("Deleted [" + name + "] [" + idValue + draft); break; case DELETE_SOFT: - transaction.logSummary("SoftDelete [" + name + "] [" + idValue + "]" + draft); + transaction.logSummary("SoftDelete [" + name + "] [" + idValue + draft); break; default: break; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java index 1edabf5bd..70eebd927 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java @@ -86,8 +86,7 @@ public final class PersistRequestCallableSql extends PersistRequest { persistExecute.collectSqlCall(label, startNanos); } if (transaction.isLogSummary()) { - String m = "CallableSql label[" + callableSql.getLabel() + "]" + " rows[" + rowCount + "]" + " bind[" + bindLog + "]"; - transaction.logSummary(m); + transaction.logSummary("CallableSql label[" + callableSql.getLabel() + "]" + " rows[" + rowCount + "]" + " bind[" + bindLog + "]"); } // register table modifications with the transaction event diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java index 08de8e27d..eb865a0bd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java @@ -83,8 +83,7 @@ public final class PersistRequestOrmUpdate extends PersistRequest { OrmUpdateType ormUpdateType = ormUpdate.getOrmUpdateType(); String tableName = ormUpdate.getBaseTable(); if (transaction.isLogSummary()) { - String m = ormUpdateType + " table[" + tableName + "] rows[" + rowCount + "] bind[" + bindLog + "]"; - transaction.logSummary(m); + transaction.logSummary(ormUpdateType + " table[" + tableName + "] rows[" + rowCount + "] bind[" + bindLog + "]"); } if (ormUpdate.isNotifyCache()) { // add the modification info to the TransactionEvent diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java index e1a0d352c..aa8c72b5a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java @@ -46,7 +46,7 @@ public final class BeanCollectionUtil { } else if (o instanceof Collection) { return ((Collection) o); } - throw new PersistenceException("expecting a Map or Collection but got [" + o.getClass().getName() + "]"); + throw new PersistenceException("expecting a Map or Collection but got " + o.getClass().getName()); } /** @@ -73,6 +73,6 @@ public final class BeanCollectionUtil { } else if (o instanceof Collection) { return ((Collection) o); } - throw new PersistenceException("expecting a Map or Collection but got [" + o.getClass().getName() + "]"); + throw new PersistenceException("expecting a Map or Collection but got " + o.getClass().getName()); } } 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 17a5ba950..1f01cbcfb 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 @@ -1891,7 +1891,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { } BeanPropertyAssoc assocProp = (BeanPropertyAssoc) other._findBeanProperty(split[0]); if (assocProp == null) { - throw new IllegalStateException("Unknown property path [" + split[0] + "] from[" + path + "]"); + throw new IllegalStateException("Unknown property path " + split[0] + " from " + path); } BeanDescriptor targetDesc = assocProp.targetDescriptor(); path = split[1]; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index f54784a34..1c8311a4d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -988,14 +988,14 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy private DeployBeanPropertyAssocOne mappedOneToOne(DeployBeanPropertyAssocOne prop, String mappedBy, DeployBeanDescriptor targetDesc) { DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy); if (mappedProp == null) { - throw new PersistenceException("Error on " + prop.getFullBeanName() + " Can not find mappedBy property [" + targetDesc + "." + mappedBy + "]"); + throw new PersistenceException("Error on " + prop.getFullBeanName() + " Can not find mappedBy property " + targetDesc + "." + mappedBy); } if (!(mappedProp instanceof DeployBeanPropertyAssocOne)) { - throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "]is not a OneToOne?"); + throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property " + targetDesc + "." + mappedBy + " is not a OneToOne?"); } DeployBeanPropertyAssocOne mappedAssocOne = (DeployBeanPropertyAssocOne) mappedProp; if (!mappedAssocOne.isOneToOne()) { - throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "]is not a OneToOne?"); + throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property " + targetDesc + "." + mappedBy + " is not a OneToOne?"); } return mappedAssocOne; } @@ -1078,10 +1078,10 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy private DeployBeanPropertyAssocOne mappedManyToOne(DeployBeanPropertyAssocMany prop, DeployBeanDescriptor targetDesc, String mappedBy) { DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy); if (mappedProp == null) { - throw new PersistenceException("Error on " + prop.getFullBeanName() + " Can not find mappedBy property [" + mappedBy + "] " + "in [" + targetDesc + "]"); + throw new PersistenceException("Error on " + prop.getFullBeanName() + " Can not find mappedBy property " + mappedBy + " in " + targetDesc); } if (!(mappedProp instanceof DeployBeanPropertyAssocOne)) { - throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + mappedBy + "]is not a ManyToOne?" + "in [" + targetDesc + "]"); + throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property " + mappedBy + " is not a ManyToOne? in " + targetDesc); } return (DeployBeanPropertyAssocOne) mappedProp; } @@ -1129,15 +1129,15 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy private DeployBeanPropertyAssocMany mappedManyToMany(DeployBeanPropertyAssocMany prop, String mappedBy, DeployBeanDescriptor targetDesc) { DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy); if (mappedProp == null) { - throw new PersistenceException("Error on " + prop.getFullBeanName() + " Can not find mappedBy property [" + mappedBy + "] " + "in [" + targetDesc + "]"); + throw new PersistenceException("Error on " + prop.getFullBeanName() + " Can not find mappedBy property " + mappedBy + " in " + targetDesc); } if (!(mappedProp instanceof DeployBeanPropertyAssocMany)) { - throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "] is not a ManyToMany?"); + throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property " + targetDesc + "." + mappedBy + " is not a ManyToMany?"); } DeployBeanPropertyAssocMany mappedAssocMany = (DeployBeanPropertyAssocMany) mappedProp; if (!mappedAssocMany.isManyToMany()) { - throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "] is not a ManyToMany?"); + throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property " + targetDesc + "." + mappedBy + " is not a ManyToMany?"); } return mappedAssocMany; } 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 d98f6d849..78d1c2179 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 @@ -434,7 +434,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree if (!idProp.isEmbedded()) { // simple single scalar id if (cols.length != 1) { - CoreLog.log.log(ERROR, "No Imported Id column for [" + idProp + "] in table [" + join.getTable() + "]"); + CoreLog.log.log(ERROR, "No Imported Id column for {0} in table {1}", idProp, join.getTable()); return null; } else { BeanProperty[] idProps = {idProp}; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index a96ea496e..78263cf82 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -718,7 +718,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST } } } - throw new RuntimeException("Can not find Master [" + beanType + "] in Child[" + targetDesc + "]"); + throw new RuntimeException("Can not find Master " + beanType + " in Child " + targetDesc); } /** @@ -734,7 +734,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST } String from = descriptor.fullName(); String to = targetDesc.fullName(); - throw new PersistenceException(from + ": Could not find mapKey property [" + mapKey + "] on [" + to + "]"); + throw new PersistenceException(from + ": Could not find mapKey property " + mapKey + " on " + to); } public IntersectionRow buildManyDeleteChildren(EntityBean parentBean, List excludeDetailIds) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java index 0349ac196..b82c72bae 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java @@ -41,7 +41,7 @@ final class DetermineAggPath { } } - throw new IllegalArgumentException("Could not find path in aggregation formula [" + aggregation + "]"); + throw new IllegalArgumentException("Could not find path in aggregation formula " + aggregation); } private static boolean isNamePart(char ch) { @@ -94,7 +94,7 @@ final class DetermineAggPath { pos = pos + 1; continue; } - throw new IllegalArgumentException("Can not find path to many in aggregation formula [" + aggregation + "]"); + throw new IllegalArgumentException("Can not find path to many in aggregation formula " + aggregation); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java index faab87419..3634123e2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java @@ -26,7 +26,7 @@ class DynamicPropertyAggregationFormula extends DynamicPropertyBase { @Override public String toString() { - return "DynamicPropertyFormula[" + parsedFormula + "]"; + return "DynamicPropertyFormula " + parsedFormula; } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java index ac9aaabb5..82493154b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java @@ -32,7 +32,7 @@ final class FormulaPropertyPath { int openBracket = formula.indexOf('('); int closeBracket = formula.lastIndexOf(')'); if (openBracket == -1 || closeBracket == -1) { - throw new IllegalStateException("Unable to parse formula [" + formula + "]"); + throw new IllegalStateException("Unable to parse formula " + formula); } outerFunction = formula.substring(0, openBracket).trim(); internalExpression = trimDistinct(formula.substring(openBracket + 1, closeBracket)); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java index ae588e466..e72d7463d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java @@ -354,7 +354,7 @@ public final class InheritInfo { @Override public String toString() { - return "InheritInfo[" + type.getName() + "] disc[" + discriminatorStringValue + "]"; + return "InheritInfo " + type.getName() + " disc:" + discriminatorStringValue; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java index 3df70b406..67e41e3ea 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java @@ -255,7 +255,7 @@ public final class DeployInheritInfo implements Comparable { public String toString() { String root = parent == null ? null : parent.getName(); String name = type == null ? null : type.getName(); - return "InheritInfo[" + name + "]" + " root[" + root + "]" + " disValue[" + discriminatorStringValue + "]"; + return "InheritInfo " + name + " root:" + root + " disc:" + discriminatorStringValue; } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java index 459da0229..c20c0ad86 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java @@ -141,7 +141,7 @@ public final class DeployUtil { if (scalarType != null || property.isTransient()) { return scalarType; } - throw new PersistenceException(property.getFullBeanName() + " has no ScalarType - type[" + propType.getName() + "]"); + throw new PersistenceException(property.getFullBeanName() + " has no ScalarType - type " + propType.getName()); } catch (IllegalArgumentException e) { if (property.isTransient()) { // expected for transient properties with unknown/non-mapped types @@ -174,7 +174,7 @@ public final class DeployUtil { Class type = prop.getPropertyType(); ScalarType scalarType = typeManager.getArrayScalarType(type, prop.getGenericType(), prop.isNullable()); if (scalarType == null) { - throw new RuntimeException("No ScalarType for @DbArray type for [" + prop.getFullBeanName() + "]"); + throw new RuntimeException("No ScalarType for @DbArray type for " + prop.getFullBeanName()); } int dbType = scalarType.jdbcType(); prop.setDbType(dbType); @@ -206,7 +206,7 @@ public final class DeployUtil { prop.setMutationDetection(mutationDetection); ScalarType scalarType = typeManager.getJsonScalarType(prop, dbType, dbLength); if (scalarType == null) { - throw new RuntimeException("No ScalarType for JSON property [" + prop + "] [" + dbType + "]"); + throw new RuntimeException("No ScalarType for JSON property " + prop + " dbType:" + dbType); } prop.setScalarType(scalarType); if (dbType == Types.VARCHAR || dbLength > 0) { @@ -251,7 +251,7 @@ public final class DeployUtil { scalarType = typeManager.getScalarType(type, lobType); if (scalarType == null) { // this should never occur actually - throw new RuntimeException("No ScalarType for LOB type [" + type + "] [" + lobType + "]"); + throw new RuntimeException("No ScalarType for LOB type " + type + " dbType:" + lobType); } prop.setDbType(lobType); prop.setScalarType(scalarType); 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 683bf1421..9a239b7ea 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 @@ -351,7 +351,7 @@ abstract class EqlWhereListener extends EQLBaseListener { if (Character.isDigit(firstChar)) { return EqlValueType.NUMBER; } - throw new IllegalArgumentException("Unexpected first character in value [" + valueAsText + "]"); + throw new IllegalArgumentException("Unexpected first character in value " + valueAsText); } } 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 0687c940a..82db7fdd6 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 @@ -340,9 +340,7 @@ public final class Binder { if (data != null) { dataClass = data.getClass().getName(); } - String m = "Error with property[" + b.currentPos() + "] dt[" + dataType + "]"; - m += "data[" + data + "][" + dataClass + "]"; - throw new PersistenceException(m, e); + throw new PersistenceException("Error with property:" + b.currentPos() + " dt:" + dataType + " data:" + data + " " + dataClass, e); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java index 043f210aa..4a4abe17d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java @@ -70,7 +70,7 @@ final class DmlBeanPersister implements BeanPersister { } } catch (SQLException e) { // log the error to the transaction log - String msg = "Error[" + StringHelper.removeNewLines(e.getMessage()) + "]"; + String msg = "Error: " + StringHelper.removeNewLines(e.getMessage()); if (request.transaction().isLogSummary()) { request.transaction().logSummary(msg); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java index f2afacce1..c7845c6f8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java @@ -101,7 +101,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { persistRequest.postExecute(); } catch (OptimisticLockException e) { // add the SQL and bind values to error message - String m = e.getMessage() + " sql[" + sql + "] bind[" + bindLog + "]"; + final String m = e.getMessage() + " sql[" + sql + "] bind[" + bindLog + "]"; persistRequest.transaction().logSummary("OptimisticLockException:" + m); throw new OptimisticLockException(m, null, e.getEntity()); } 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 3594c19a0..b01f254c6 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 @@ -482,8 +482,8 @@ final class CQueryBuilder { } else if (beanProperty.isDiscriminator()) { propertyName = SplitName.parent(propertyName); } else if (beanProperty instanceof BeanPropertyAssocOne) { - String msg = "Column [" + column.getDbColumn() + "] mapped to complex Property[" + propertyName + "]"; - msg += ". It should be mapped to a simple property (probably the Id property). "; + String msg = "Column " + column.getDbColumn() + " mapped to complex property " + propertyName + + ". It should be mapped to a simple property (probably the Id property)."; throw new PersistenceException(msg); } if (propertyName != null) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java index c4fec72dd..4a2686f16 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java @@ -129,14 +129,12 @@ public final class CQueryEngine { SpiTransaction t = request.transaction(); if (t.isLogSummary()) { // log the error to the transaction log - String msg = "ERROR executing query, bindLog[" + bindLog + "] error[" + StringHelper.removeNewLines(e.getMessage()) + "]"; - t.logSummary(msg); + t.logSummary("ERROR executing query, bindLog[" + bindLog + "] error:" + StringHelper.removeNewLines(e.getMessage())); } // ensure 'rollback' is logged if queryOnly transaction t.connection(); // build a decent error message for the exception - String m = "Query threw SQLException:" + e.getMessage() + " Bind values:[" + bindLog + "] Query was:" + sql; - return dbPlatform.translate(m, e); + return dbPlatform.translate("Query threw SQLException:" + e.getMessage() + " Bind values:[" + bindLog + "] Query was:" + sql, e); } /** 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 d6833b98e..f93ab8d17 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 @@ -337,10 +337,10 @@ public final class CQueryPredicates { 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(); - msg += "] with an incorrect orderBy [" + orderBy + "]. The id property [" + orderById + "]"; - msg += " must come before the many property [" + manyProp.name() + "] in the orderBy."; - msg += " Ebean has automatically modified the orderBy clause to do this."; + String msg = "A Query on [" + desc + "] includes a join to a 'many' association [" + manyProp.name() + + "] with an incorrect orderBy [" + orderBy + "]. The id property [" + orderById + + "] must come before the many property [" + manyProp.name() + "] in the orderBy." + + " Ebean has automatically modified the orderBy clause to do this."; CoreLog.log.log(WARNING, msg); } // the id needs to come before the manyPropName diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java index 367b67685..0311bf64d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java @@ -133,8 +133,7 @@ final class SqlTreeAlias { s = aliasMap.get(prefix); } if (s == null) { - String msg = "Could not determine table alias for [" + prefix + "] manyMap[" + manyWhereAliasMap + "] aliasMap[" + aliasMap + "]"; - throw new RuntimeException(msg); + throw new RuntimeException("Could not determine table alias for " + prefix + " manyMap:" + manyWhereAliasMap + " aliasMap:" + aliasMap); } return s; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java index 8120aa093..fc82d72ca 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java @@ -181,7 +181,7 @@ public final class DefaultDtoQuery extends AbstractQuery implements SpiDtoQue @Override public String toString() { - return "DtoQuery [" + sql + "]"; + return "DtoQuery " + sql; } @Override 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 86bb27c5a..8f4baefdf 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 @@ -1714,7 +1714,7 @@ public class DefaultOrmQuery extends AbstractQuery implements SpiQuery { @Override public final String toString() { - return "Query [" + whereExpressions + "]"; + return "Query " + whereExpressions; } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java index f059e4b7c..4b7c59625 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java @@ -121,7 +121,7 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq @Override public String toString() { - return "SqlQuery [" + query + "]"; + return "SqlQuery " + query; } @Override 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 73bc6ff19..7956b9453 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 @@ -98,9 +98,9 @@ public interface SpiRawSql extends RawSql { @Override public String toString() { if (!parsed) { - return "unparsed[" + unparsedSql + "]"; + return "unparsed " + unparsedSql; } - return "select[" + preFrom + "] preWhere[" + preWhere + "] preHaving[" + preHaving + "] orderBy[" + orderBy + "]"; + return "select:" + preFrom + " preWhere:" + preWhere + " preHaving:" + preHaving + " orderBy:" + orderBy; } public boolean isDistinct() { @@ -301,8 +301,7 @@ public interface SpiRawSql extends RawSql { } else { Column column = dbColumnMap.get(dbColumn); if (column == null) { - String msg = "DB Column [" + dbColumn + "] not found in mapping. Expecting one of [" + dbColumnMap.keySet() + "]"; - throw new IllegalArgumentException(msg); + throw new IllegalArgumentException("DB Column " + dbColumn + " not found in mapping. Expecting one of " + dbColumnMap.keySet()); } column.setPropertyName(propertyName); } @@ -420,8 +419,7 @@ public interface SpiRawSql extends RawSql { private void checkMapping() { if (propertyName == null) { - String msg = "No propertyName defined (Column mapping) for dbColumn [" + dbColumn + "]"; - throw new IllegalStateException(msg); + throw new IllegalStateException("No propertyName defined (Column mapping) for dbColumn " + dbColumn); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java index 675169318..06b78861e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java @@ -21,7 +21,7 @@ public final class DeleteByIdMap { @Override public String toString() { - return "DeleteById[" + beanMap.values() + "]"; + return "DeleteById " + beanMap.values(); } public void notifyCache(CacheChangeSet changeSet) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java index a3b97ec2a..cf5db3580 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java @@ -27,7 +27,7 @@ public final class RemoteTableMod implements BinaryWritable { @Override public String toString() { - return "TableMod[" + timestamp + "; " + tables + "]"; + return "TableMod " + timestamp + "; " + tables; } public long getTimestamp() { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java index 5f34e31fe..93860f047 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java @@ -51,10 +51,8 @@ final class EnumToDbIntegerMap extends EnumToDbValueMap { return this; } catch (Exception e) { - String msg = "Error converted enum type[" + beanValue.getClass().getName(); - msg += "] enum value[" + beanValue + "] string value [" + stringDbValue + "]"; - msg += " to an Integer."; - throw new PersistenceException(msg, e); + throw new PersistenceException("Error converted enum [" + beanValue.getClass().getName() + + "] value[" + beanValue + "] string value [" + stringDbValue + "] to an Integer.", e); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java index 2bf5e8292..2596b68f0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java @@ -163,8 +163,7 @@ final class ScalarTypeEnumStandard { return null; } else { if (ordinal < 0 || ordinal >= enumArray.length) { - String m = "Unexpected ordinal [" + ordinal + "] out of range [" + enumArray.length + "]"; - throw new IllegalStateException(m); + throw new IllegalStateException("Unexpected ordinal " + ordinal + " out of range " + enumArray.length); } return enumArray[ordinal]; } @@ -196,8 +195,7 @@ final class ScalarTypeEnumStandard { ordinal = Integer.parseInt(dbValue.toString()); } if (ordinal < 0 || ordinal >= enumArray.length) { - String m = "Unexpected ordinal [" + ordinal + "] out of range [" + enumArray.length + "]"; - throw new IllegalStateException(m); + throw new IllegalStateException("Unexpected ordinal " + ordinal + " out of range " + enumArray.length); } return enumArray[ordinal]; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java index 32f8e67c5..334e86417 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java @@ -74,7 +74,7 @@ final class ScalarTypeJsonSet { try { return convertElements(EJson.parseSet(value, false)); } catch (IOException e) { - throw new PersistenceException("Failed to parse JSON content as Set: [" + value + "]", e); + throw new PersistenceException("Failed to parse JSON content as Set: " + value, e); } } } @@ -177,7 +177,7 @@ final class ScalarTypeJsonSet { try { return convertList(EJson.parseList(value)); } catch (IOException e) { - throw new PersistenceException("Failed to parse JSON content as Set: [" + value + "]", e); + throw new PersistenceException("Failed to parse JSON content as Set: " + value, e); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java index 25177d7df..761ea90fd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java @@ -56,7 +56,7 @@ public final class TypeReflectHelper { if (upperBounds != null && upperBounds.length == 1) { return getClass(upperBounds[0]); } - throw new IllegalArgumentException("Don't know how to determine Class from Type [" + type + "]"); + throw new IllegalArgumentException("Don't know how to determine Class from type " + type); } return (Class) type; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java index 4ad7722c8..b41362d84 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java @@ -16,7 +16,7 @@ final class UtilDateParser { try { return formatter().parse(jsonDateTime); } catch (ParseException e) { - throw new RuntimeException("Error parsing Date[" + jsonDateTime + "]", e); + throw new RuntimeException("Error parsing Date " + jsonDateTime, e); } } 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 3a05759d2..845d8d285 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 @@ -142,7 +142,7 @@ public final class BindParamsParser { param = params.getParameter(paramName); } if (param == null) { - throw new PersistenceException("Bind value is not set or null for [" + paramName + "] in [" + sql + "]"); + throw new PersistenceException("Bind value is not set or null for " + paramName + " in " + sql); } return param; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/util/SortByClauseParser.java b/ebean-core/src/main/java/io/ebeaninternal/util/SortByClauseParser.java index 98bb40bd8..fbbc10134 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/util/SortByClauseParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/util/SortByClauseParser.java @@ -38,7 +38,7 @@ public final class SortByClauseParser { } String[] words = section.split(" "); if (words.length < 1 || words.length > 3) { - throw new RuntimeException("Expecting 1 to 3 words in [" + section + "] but got [" + words.length + "]"); + throw new RuntimeException("Expecting 1 to 3 words in [" + section + "] but got " + words.length); } Boolean nullsHigh = null; @@ -71,8 +71,7 @@ public final class SortByClauseParser { if (SortByClause.NULLSLOW.equalsIgnoreCase(word)) { return Boolean.FALSE; } - String m = "Expecting nullsHigh or nullsLow but got [" + word + "] in [" + rawSortBy + "]"; - throw new RuntimeException(m); + throw new RuntimeException("Expecting nullsHigh or nullsLow but got [" + word + "] in " + rawSortBy); } @@ -83,8 +82,7 @@ public final class SortByClauseParser { if (SortByClause.DESC.equalsIgnoreCase(word)) { return false; } - String m = "Expect ASC or DESC but got [" + word + "] in [" + rawSortBy + "]"; - throw new RuntimeException(m); + throw new RuntimeException("Expect ASC or DESC but got " + word + " in " + rawSortBy); } } diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java index e11a0f991..ea00b55ea 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java @@ -15,13 +15,11 @@ import org.tests.rawsql.ACustomer; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertTrue; -public class TestRawSqlParsing extends BaseTestCase { +class TestRawSqlParsing extends BaseTestCase { @Test - public void test() { - + void test() { String sql = " select order_id, sum(order_qty*unit_price) as totalAmount" + " from o_order_detail " @@ -35,13 +33,12 @@ public class TestRawSqlParsing extends BaseTestCase { Sql rs = ((SpiRawSql)rawSql).getSql(); String s = rs.toString(); - assertTrue(s.contains("[order_id, sum")); + assertThat(s).contains("select:order_id, sum"); } @Test @ForPlatform(Platform.POSTGRES) - public void testDoubleColon() { - + void testDoubleColon() { ResetBasicData.reset(); String sql = "select id, name from o_customer where name=:name and MD5(id::text) BETWEEN '00000000000000000000000000000000' AND 'ffffffffffffffffffffffffffffffff'"; @@ -59,8 +56,7 @@ public class TestRawSqlParsing extends BaseTestCase { } @Test - public void testWhere() { - + void testWhere() { ResetBasicData.reset(); RawSql sql = RawSqlBuilder.parse("SELECT id, name FROM o_customer ${where}").create(); @@ -75,8 +71,7 @@ public class TestRawSqlParsing extends BaseTestCase { @ForPlatform({Platform.H2, Platform.POSTGRES}) @Test - public void testUnion() { - + void testUnion() { ResetBasicData.reset(); String sql = @@ -100,10 +95,9 @@ public class TestRawSqlParsing extends BaseTestCase { assertThat(sqlOf(query)).contains(") all_split limit 5 offset 1"); } - @ForPlatform({Platform.H2, Platform.POSTGRES}) @Test - public void testUnion_explicitWhere() { + void testUnion_explicitWhere() { ResetBasicData.reset(); String sql = @@ -135,7 +129,7 @@ public class TestRawSqlParsing extends BaseTestCase { @ForPlatform({Platform.H2, Platform.POSTGRES}) @Test - public void testUnion_explicitAndhere() { + void testUnion_explicitAndhere() { ResetBasicData.reset(); String sql = @@ -167,8 +161,7 @@ public class TestRawSqlParsing extends BaseTestCase { @ForPlatform({Platform.H2, Platform.POSTGRES}) @Test - public void testColumnName2() { - + void testColumnName2() { ResetBasicData.reset(); String sql = "select 42 custId, 'bar' customerName from o_customer"; @@ -189,8 +182,7 @@ public class TestRawSqlParsing extends BaseTestCase { @ForPlatform({Platform.H2, Platform.POSTGRES}) @Test - public void testColumnAlias() { - + void testColumnAlias() { ResetBasicData.reset(); String sql = "select 43 custId, name as custName from o_customer"; @@ -211,8 +203,7 @@ public class TestRawSqlParsing extends BaseTestCase { @ForPlatform({Platform.H2, Platform.POSTGRES}) @Test - public void testColumnNameMapping() { - + void testColumnNameMapping() { ResetBasicData.reset(); String sql = "select v.custId, v.customerName from (select id custId, name customerName from o_customer) v";