#2641 - toString() - Change BeanCollection toString() implementations, suppress unloaded BeanCollections

This commit is contained in:
Rob Bygrave committed 2022-04-08 18:53:57 +12:00
1 parent 5a7e8456e1
commit 183b601be8
10 files changed
+25 -38

No files matched your search

@@ -53,6 +53,12 @@ public final class ToStringBuilder {
*/ */
public void add(String name, Object value) { public void add(String name, Object value) {
if (value != null && counter <= MAX) { if (value != null && counter <= MAX) {
if (value instanceof BeanCollection) {
if (((BeanCollection<?>)value).isReference()) {
// suppress unloaded bean collections
return;
}
}
key(name); key(name);
value(value); value(value);
} }
@@ -91,7 +97,9 @@ public final class ToStringBuilder {
return; return;
} }
if (value instanceof ToStringAware) { if (value instanceof ToStringAware) {
if (push(value)) { if (value instanceof BeanCollection) {
((ToStringAware) value).toString(this);
} else if (push(value)) {
((ToStringAware) value).toString(this); ((ToStringAware) value).toString(this);
} }
} else if (value instanceof Collection) { } else if (value instanceof Collection) {
@@ -193,18 +193,11 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(50);
sb.append("BeanList ");
if (isReadOnly()) {
sb.append("readOnly ");
}
if (list == null) { if (list == null) {
sb.append("deferred "); return "BeanList<deferred>";
} else { } else {
sb.append("size[").append(list.size()).append("] "); return list.toString();
sb.append("list").append(list);
} }
return sb.toString();
} }
/** /**
@@ -197,27 +197,20 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(50);
sb.append("BeanMap ");
if (isReadOnly()) {
sb.append("readOnly ");
}
if (map == null) { if (map == null) {
sb.append("deferred "); return "BeanMap<deferred>";
} else { } else {
sb.append("size[").append(map.size()).append("]"); return map.toString();
sb.append(" map").append(map);
} }
return sb.toString();
} }
/** /**
* Equal if obj is a Map and equal in a Map sense. * Equal if object is a Map and equal in a Map sense.
*/ */
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object object) {
init(); init();
return map.equals(obj); return map.equals(object);
} }
@Override @Override
@@ -171,18 +171,11 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(50);
sb.append("BeanSet ");
if (isReadOnly()) {
sb.append("readOnly ");
}
if (set == null) { if (set == null) {
sb.append("deferred "); return "BeanSet<deferred>";
} else { } else {
sb.append("size[").append(set.size()).append("]"); return set.toString();
sb.append(" set").append(set);
} }
return sb.toString();
} }
/** /**
@@ -192,6 +192,6 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
final EcmPerson fromJson = DB.json().toBean(EcmPerson.class, asJson); final EcmPerson fromJson = DB.json().toBean(EcmPerson.class, asJson);
assertThat(fromJson.getName()).isEqualTo("Fiona021"); assertThat(fromJson.getName()).isEqualTo("Fiona021");
assertThat(fromJson.getPhoneNumbers()).hasSize(2); assertThat(fromJson.getPhoneNumbers()).hasSize(2);
assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("BeanMap size[2] map{home=021 1234, work=021 4321}"); assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("{home=021 1234, work=021 4321}");
} }
} }
@@ -183,6 +183,6 @@ class TestElementCollectionBasicSet extends BaseTestCase {
final EcsPerson fromJson = DB.json().toBean(EcsPerson.class, asJson); final EcsPerson fromJson = DB.json().toBean(EcsPerson.class, asJson);
assertThat(fromJson.getName()).isEqualTo("Fiona021"); assertThat(fromJson.getName()).isEqualTo("Fiona021");
assertThat(fromJson.getPhoneNumbers()).hasSize(2); assertThat(fromJson.getPhoneNumbers()).hasSize(2);
assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("BeanSet size[2] set[021 1234, 021 4321]"); assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("[021 1234, 021 4321]");
} }
} }
@@ -190,6 +190,6 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
final EcblPerson fromJson = DB.json().toBean(EcblPerson.class, asJson); final EcblPerson fromJson = DB.json().toBean(EcblPerson.class, asJson);
assertThat(fromJson.getName()).isEqualTo("Fiona64021"); assertThat(fromJson.getName()).isEqualTo("Fiona64021");
assertThat(fromJson.getPhoneNumbers()).hasSize(2); assertThat(fromJson.getPhoneNumbers()).hasSize(2);
assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("BeanList size[2] list[64-021-1234, 64-021-4321]"); assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("[64-021-1234, 64-021-4321]");
} }
} }
@@ -181,6 +181,6 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
final EcbmPerson fromJson = DB.json().toBean(EcbmPerson.class, asJson); final EcbmPerson fromJson = DB.json().toBean(EcbmPerson.class, asJson);
assertThat(fromJson.getName()).isEqualTo("Fiona64021"); assertThat(fromJson.getName()).isEqualTo("Fiona64021");
assertThat(fromJson.getPhoneNumbers()).hasSize(2); assertThat(fromJson.getPhoneNumbers()).hasSize(2);
assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("BeanMap size[2] map{home=64-021-1234, work=64-021-4321}"); assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("{home=64-021-1234, work=64-021-4321}");
} }
} }
@@ -45,6 +45,6 @@ public class TestElementCollectionEnumSet extends BaseTestCase {
final EcEnumPerson fromJson = DB.json().toBean(EcEnumPerson.class, asJson); final EcEnumPerson fromJson = DB.json().toBean(EcEnumPerson.class, asJson);
assertThat(fromJson.getName()).isEqualTo("Enum Person"); assertThat(fromJson.getName()).isEqualTo("Enum Person");
assertThat(fromJson.getTags()).hasSize(2); assertThat(fromJson.getTags()).hasSize(2);
assertThat(fromJson.getTags().toString()).isEqualTo("BeanSet size[2] set[BLUE, RED]"); assertThat(fromJson.getTags().toString()).isEqualTo("[BLUE, RED]");
} }
} }
+2 -2
View File
@@ -46,8 +46,8 @@
<ebean-migration.version>13.0.0</ebean-migration.version> <ebean-migration.version>13.0.0</ebean-migration.version>
<ebean-test-docker.version>4.5</ebean-test-docker.version> <ebean-test-docker.version>4.5</ebean-test-docker.version>
<ebean-datasource.version>7.5</ebean-datasource.version> <ebean-datasource.version>7.5</ebean-datasource.version>
<ebean-agent.version>13.2.0</ebean-agent.version> <ebean-agent.version>13.2.1-RC1</ebean-agent.version>
<ebean-maven-plugin.version>13.2.0</ebean-maven-plugin.version> <ebean-maven-plugin.version>13.2.1-RC1</ebean-maven-plugin.version>
<surefire.useModulePath>false</surefire.useModulePath> <surefire.useModulePath>false</surefire.useModulePath>
</properties> </properties>