You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/10/25 15:05:27 UTC
juneau git commit: Formatting fixes.
Repository: juneau
Updated Branches:
refs/heads/master be06a309a -> 7aa1d47e3
Formatting fixes.
Project: http://git-wip-us.apache.org/repos/asf/juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/juneau/commit/7aa1d47e
Tree: http://git-wip-us.apache.org/repos/asf/juneau/tree/7aa1d47e
Diff: http://git-wip-us.apache.org/repos/asf/juneau/diff/7aa1d47e
Branch: refs/heads/master
Commit: 7aa1d47e385110ee86e0ae9b00cbb7a81f80b0a6
Parents: be06a30
Author: JamesBognar <ja...@apache.org>
Authored: Wed Oct 25 11:05:24 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Wed Oct 25 11:05:24 2017 -0400
----------------------------------------------------------------------
.../juneau/jena/RdfSerializerSession.java | 2 +-
.../apache/juneau/json/JsonParserSession.java | 6 ++---
.../juneau/json/JsonSerializerSession.java | 25 +++++++++-----------
.../juneau/serializer/SerializerSession.java | 9 ++++++-
.../apache/juneau/uon/UonSerializerSession.java | 2 +-
.../yaml/proto/YamlSerializerSession.java | 2 +-
6 files changed, 25 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juneau/blob/7aa1d47e/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index 1f42a0f..8c4faa6 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -335,7 +335,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
Namespace ns = juneauBpNs;
Property p = model.createProperty(ns.getUri(), encodeElementName(toString(key)));
- RDFNode n = serializeAnything(value, false, valueType, key == null ? null : toString(key), null, r);
+ RDFNode n = serializeAnything(value, false, valueType, toString(key), null, r);
if (n != null)
r.addProperty(p, n);
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/7aa1d47e/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
index dc589dd..2373ac2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -318,11 +318,11 @@ public final class JsonParserSession extends ReaderParserSession {
state = S5;
}
} else if (state == S5) {
- if (c == ',')
+ if (c == ',') {
state = S6;
- else if (isCommentOrWhitespace(c))
+ } else if (isCommentOrWhitespace(c)) {
skipCommentsAndSpace(r.unread());
- else if (c == '}') {
+ } else if (c == '}') {
return m;
} else {
break;
http://git-wip-us.apache.org/repos/asf/juneau/blob/7aa1d47e/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
index 628c1f0..0083dab 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
@@ -119,32 +119,29 @@ public class JsonSerializerSession extends WriterSerializerSession {
}
// '\0' characters are considered null.
- if (o == null || (sType.isChar() && ((Character)o).charValue() == 0))
+ if (o == null || (sType.isChar() && ((Character)o).charValue() == 0)) {
out.append("null");
- else if (sType.isNumber() || sType.isBoolean())
+ } else if (sType.isNumber() || sType.isBoolean()) {
out.append(o);
- else if (sType.isBean())
+ } else if (sType.isBean()) {
serializeBeanMap(out, toBeanMap(o), typeName);
- else if (sType.isUri() || (pMeta != null && pMeta.isUri()))
+ } else if (sType.isUri() || (pMeta != null && pMeta.isUri())) {
out.uriValue(o);
- else if (sType.isMap()) {
+ } else if (sType.isMap()) {
if (o instanceof BeanMap)
serializeBeanMap(out, (BeanMap)o, typeName);
else
serializeMap(out, (Map)o, eType);
- }
- else if (sType.isCollection()) {
+ } else if (sType.isCollection()) {
serializeCollection(out, (Collection) o, eType);
- }
- else if (sType.isArray()) {
+ } else if (sType.isArray()) {
serializeCollection(out, toList(sType.getInnerClass(), o), eType);
- }
- else if (sType.isReader() || sType.isInputStream()) {
+ } else if (sType.isReader() || sType.isInputStream()) {
IOUtils.pipe(o, out);
- }
- else
+ } else {
out.stringValue(toString(o));
-
+ }
+
if (wrapperAttr != null) {
indent--;
out.cre(indent-1).append('}');
http://git-wip-us.apache.org/repos/asf/juneau/blob/7aa1d47e/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index 305847f..dedb486 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -714,9 +714,16 @@ public abstract class SerializerSession extends BeanSession {
/**
* Converts the specified object to a <code>String</code>.
+ *
+ * <p>
+ * Also has the following effects:
+ * <ul>
+ * <li><code>Class</code> object is converted to a readable name. See {@link ClassUtils#getReadableClassName(Class)}.
+ * <li>Whitespace is trimmed if the trim-strings setting is enabled.
+ * </ul>
*
* @param o The object to convert to a <code>String</code>.
- * @return The
+ * @return The object converted to a String, or <jk>null</jk> if the input was <jk>null</jk>.
*/
public final String toString(Object o) {
if (o == null)
http://git-wip-us.apache.org/repos/asf/juneau/blob/7aa1d47e/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
index b57352b..aad1c93 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
@@ -199,7 +199,7 @@ public class UonSerializerSession extends WriterSerializerSession {
Object value = e.getValue();
Object key = generalize(e.getKey(), keyType);
out.cr(indent).appendObject(key, false).append('=');
- serializeAnything(out, value, valueType, (key == null ? null : toString(key)), null);
+ serializeAnything(out, value, valueType, toString(key), null);
if (mapEntries.hasNext())
out.append(',');
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/7aa1d47e/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerSession.java
index 35a9243..db40dd8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerSession.java
@@ -161,7 +161,7 @@ public class YamlSerializerSession extends WriterSerializerSession {
out.attr(toString(key)).append(':').s();
- serializeAnything(out, value, valueType, (key == null ? null : toString(key)), null);
+ serializeAnything(out, value, valueType, toString(key), null);
if (mapEntries.hasNext())
out.nl(i);