#1663 Additionally trim the OrmQueryDetail.asString() output removing extra whitespace

This commit is contained in:
rob bygrave committed 2019-03-29 00:43:32 +13:00
1 parent 4971db54c8
commit 32b8fd0e26
3 files changed
+8 -5

No files matched your search

@@ -121,7 +121,10 @@ public class OrmQueryDetail implements Serializable {
} }
if (fetchPaths != null) { if (fetchPaths != null) {
for (OrmQueryProperties join : fetchPaths.values()) { for (OrmQueryProperties join : fetchPaths.values()) {
join.append(" fetch ", sb); if (sb.length() > 0) {
sb.append(" ");
}
join.append("fetch ", sb);
} }
} }
return sb.toString(); return sb.toString();
@@ -294,7 +294,7 @@ public class OrmQueryProperties implements Serializable {
sb.append(path).append(" "); sb.append(path).append(" ");
} }
if (!isEmpty()) { if (!isEmpty()) {
sb.append("(").append(rawProperties).append(") "); sb.append("(").append(rawProperties).append(")");
} }
return sb.toString(); return sb.toString();
} }
@@ -49,7 +49,7 @@ public class ProfileOriginTest extends BaseTestCase {
OrmQueryDetail detail = po.buildDetail(desc); OrmQueryDetail detail = po.buildDetail(desc);
assertThat(detail.asString().trim()).isEqualTo("select (orderDate) fetch customer (name)"); assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (name)");
} }
@Test @Test
@@ -90,7 +90,7 @@ public class ProfileOriginTest extends BaseTestCase {
OrmQueryDetail detail = po.buildDetail(desc); OrmQueryDetail detail = po.buildDetail(desc);
assertThat(detail.asString().trim()).isEqualTo("select (orderDate) fetch customer (billingAddress)"); assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (billingAddress)");
} }
@@ -120,7 +120,7 @@ public class ProfileOriginTest extends BaseTestCase {
po.collectUsageInfo(c); po.collectUsageInfo(c);
OrmQueryDetail detail = po.buildDetail(desc); OrmQueryDetail detail = po.buildDetail(desc);
assertThat(detail.asString().trim()).isEqualTo("fetch details (orderQty,shipQty,unitPrice) fetch details.product (name)"); assertThat(detail.asString()).isEqualTo("fetch details (orderQty,shipQty,unitPrice) fetch details.product (name)");
} }
private NodeUsageCollector node(String path) { private NodeUsageCollector node(String path) {