Extract logic for checking string representation of objects into separate methods
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/e8db7237 Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/e8db7237 Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/e8db7237 Branch: refs/heads/master Commit: e8db7237a9c347d2225fce9b49ff92bb741adffa Parents: 2865655 Author: Benedikt Ritter <brit...@apache.org> Authored: Fri May 1 23:54:03 2015 +0200 Committer: Benedikt Ritter <brit...@apache.org> Committed: Fri May 1 23:54:03 2015 +0200 ---------------------------------------------------------------------- .../apache/commons/lang3/builder/ToStringStyle.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/e8db7237/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java index f988f0e..fbb4047 100644 --- a/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java +++ b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java @@ -2583,10 +2583,7 @@ public abstract class ToStringStyle implements Serializable { } final String valueAsString = value.toString(); - if (valueAsString.startsWith(getContentStart()) - && valueAsString.endsWith(getContentEnd()) - || valueAsString.startsWith(getArrayStart()) - && valueAsString.startsWith(getArrayEnd())) { + if (isJsonObject(valueAsString) || isJsonArray(valueAsString)) { buffer.append(value); return; } @@ -2594,6 +2591,16 @@ public abstract class ToStringStyle implements Serializable { appendDetail(buffer, fieldName, valueAsString); } + private boolean isJsonArray(String valueAsString) { + return valueAsString.startsWith(getArrayStart()) + && valueAsString.startsWith(getArrayEnd()); + } + + private boolean isJsonObject(String valueAsString) { + return valueAsString.startsWith(getContentStart()) + && valueAsString.endsWith(getContentEnd()); + } + /** * Appends the given String in parenthesis to the given StringBuffer. *
