You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2015/05/01 23:57:05 UTC
[09/11] [lang] Format source code
Format source code
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/28656559
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/28656559
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/28656559
Branch: refs/heads/master
Commit: 28656559d2fc67193a84d5cbc48d378b2016f74a
Parents: 07ec8ad
Author: Benedikt Ritter <br...@apache.org>
Authored: Fri May 1 23:51:03 2015 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Fri May 1 23:51:03 2015 +0200
----------------------------------------------------------------------
.../commons/lang3/builder/ToStringStyle.java | 27 +++++++++-----------
.../lang3/builder/JsonToStringStyleTest.java | 12 ++++-----
2 files changed, 17 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/28656559/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 c404a02..f988f0e 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java
@@ -2568,32 +2568,29 @@ public abstract class ToStringStyle implements Serializable {
protected void appendDetail(StringBuffer buffer, String fieldName, Object value) {
if (value == null) {
-
appendNullText(buffer, fieldName);
return;
}
if (value instanceof String || value instanceof Character) {
-
- appendValueAsString(buffer, value.toString());
+ appendValueAsString(buffer, value.toString());
return;
}
-
+
if (value instanceof Number || value instanceof Boolean) {
-
- buffer.append(value);
- return;
+ buffer.append(value);
+ return;
}
-
+
final String valueAsString = value.toString();
- if (valueAsString.startsWith(getContentStart()) && valueAsString.endsWith(getContentEnd())
- || valueAsString.startsWith(getArrayStart()) && valueAsString.startsWith(getArrayEnd())
- ) {
-
- buffer.append(value);
- return;
+ if (valueAsString.startsWith(getContentStart())
+ && valueAsString.endsWith(getContentEnd())
+ || valueAsString.startsWith(getArrayStart())
+ && valueAsString.startsWith(getArrayEnd())) {
+ buffer.append(value);
+ return;
}
-
+
appendDetail(buffer, fieldName, valueAsString);
}
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/28656559/src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java
index e5821d5..f5fadac 100644
--- a/src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java
@@ -91,34 +91,32 @@ public class JsonToStringStyleTest {
assertEquals("{\"a\":\"hello\",\"b\":\"world\"}", new ToStringBuilder(base)
.appendSuper("{\"a\":\"hello\"}").append("b", "world").toString());
}
-
+
@Test
public void testChar() {
-
try {
new ToStringBuilder(base).append('A').toString();
fail("Should have generated UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
}
-
+
assertEquals("{\"a\":\"A\"}", new ToStringBuilder(base).append("a", 'A')
.toString());
assertEquals("{\"a\":\"A\",\"b\":\"B\"}", new ToStringBuilder(base).append("a", 'A').append("b", 'B')
.toString());
}
-
+
@Test
public void testDate() {
-
final Date now = new Date();
final Date afterNow = new Date(System.currentTimeMillis() + 1);
-
+
try {
new ToStringBuilder(base).append(now).toString();
fail("Should have generated UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
}
-
+
assertEquals("{\"now\":\"" + now.toString() +"\"}", new ToStringBuilder(base).append("now", now)
.toString());
assertEquals("{\"now\":\"" + now.toString() +"\",\"after\":\"" + afterNow.toString() + "\"}", new ToStringBuilder(base).append("now", now).append("after", afterNow)