mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-22 15:10:02 +00:00
#2641 - toString() - Change BeanCollection toString() implementations, suppress unloaded BeanCollections
This commit is contained in:
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) {
|
||||
if (value != null && counter <= MAX) {
|
||||
if (value instanceof BeanCollection) {
|
||||
if (((BeanCollection<?>)value).isReference()) {
|
||||
// suppress unloaded bean collections
|
||||
return;
|
||||
}
|
||||
}
|
||||
key(name);
|
||||
value(value);
|
||||
}
|
||||
@@ -91,7 +97,9 @@ public final class ToStringBuilder {
|
||||
return;
|
||||
}
|
||||
if (value instanceof ToStringAware) {
|
||||
if (push(value)) {
|
||||
if (value instanceof BeanCollection) {
|
||||
((ToStringAware) value).toString(this);
|
||||
} else if (push(value)) {
|
||||
((ToStringAware) value).toString(this);
|
||||
}
|
||||
} else if (value instanceof Collection) {
|
||||
|
||||
@@ -193,18 +193,11 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder sb = new StringBuilder(50);
|
||||
sb.append("BeanList ");
|
||||
if (isReadOnly()) {
|
||||
sb.append("readOnly ");
|
||||
}
|
||||
if (list == null) {
|
||||
sb.append("deferred ");
|
||||
return "BeanList<deferred>";
|
||||
} else {
|
||||
sb.append("size[").append(list.size()).append("] ");
|
||||
sb.append("list").append(list);
|
||||
return list.toString();
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -197,27 +197,20 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder sb = new StringBuilder(50);
|
||||
sb.append("BeanMap ");
|
||||
if (isReadOnly()) {
|
||||
sb.append("readOnly ");
|
||||
}
|
||||
if (map == null) {
|
||||
sb.append("deferred ");
|
||||
return "BeanMap<deferred>";
|
||||
} else {
|
||||
sb.append("size[").append(map.size()).append("]");
|
||||
sb.append(" map").append(map);
|
||||
return map.toString();
|
||||
}
|
||||
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
|
||||
public boolean equals(Object obj) {
|
||||
public boolean equals(Object object) {
|
||||
init();
|
||||
return map.equals(obj);
|
||||
return map.equals(object);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -171,18 +171,11 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder sb = new StringBuilder(50);
|
||||
sb.append("BeanSet ");
|
||||
if (isReadOnly()) {
|
||||
sb.append("readOnly ");
|
||||
}
|
||||
if (set == null) {
|
||||
sb.append("deferred ");
|
||||
return "BeanSet<deferred>";
|
||||
} else {
|
||||
sb.append("size[").append(set.size()).append("]");
|
||||
sb.append(" set").append(set);
|
||||
return set.toString();
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user