Repository: incubator-juneau Updated Branches: refs/heads/master 8d699b2fb -> 0aada18ef
Remove support for classAttrs on collections and arrays. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/0aada18e Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/0aada18e Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/0aada18e Branch: refs/heads/master Commit: 0aada18ef8bb0e0d30d6ac17d3f5cbd0e9c76b08 Parents: 8d699b2 Author: jamesbognar <[email protected]> Authored: Fri Sep 9 12:39:47 2016 -0400 Committer: jamesbognar <[email protected]> Committed: Fri Sep 9 12:39:58 2016 -0400 ---------------------------------------------------------------------- .../org/apache/juneau/html/HtmlSerializer.java | 12 +++------ .../org/apache/juneau/json/JsonSerializer.java | 24 ++--------------- .../juneau/msgpack/MsgPackSerializer.java | 20 ++------------ .../juneau/urlencoding/UonSerializer.java | 28 ++------------------ .../a/rttests/RoundTripAddClassAttrsTest.java | 3 --- .../java/org/apache/juneau/json/JsonTest.java | 8 +++--- 6 files changed, 14 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0aada18e/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java index 394b10e..1115f27 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java @@ -255,16 +255,10 @@ public class HtmlSerializer extends XmlSerializer { serializeMap(session, out, (Map)o, eType, classAttr, pMeta); } else if (sType.isCollection()) { - if (classAttr != null) - serializeCollection(session, out, (Collection)o, sType, name, classAttr, pMeta); - else - serializeCollection(session, out, (Collection)o, eType, name, null, pMeta); + serializeCollection(session, out, (Collection)o, eType, name, null, pMeta); } else if (sType.isArray()) { - if (classAttr != null) - serializeCollection(session, out, toList(sType.getInnerClass(), o), sType, name, classAttr, pMeta); - else - serializeCollection(session, out, toList(sType.getInnerClass(), o), eType, name, null, pMeta); + serializeCollection(session, out, toList(sType.getInnerClass(), o), eType, name, null, pMeta); } else if (session.isUri(sType, pMeta, o)) { String label = session.getAnchorText(pMeta, o); @@ -383,6 +377,8 @@ public class HtmlSerializer extends XmlSerializer { BeanContext bc = session.getBeanContext(); ClassMeta<?> elementType = type.getElementType(); + if (elementType == null) + elementType = bc.object(); int i = session.getIndent(); if (c.isEmpty()) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0aada18e/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java b/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java index 295a076..0973ec4 100644 --- a/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java +++ b/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java @@ -222,16 +222,10 @@ public class JsonSerializer extends WriterSerializer { serializeMap(session, out, (Map)o, eType); } else if (sType.isCollection()) { - if (addClassAttr) - serializeCollectionMap(session, out, (Collection)o, sType); - else - serializeCollection(session, out, (Collection) o, eType); + serializeCollection(session, out, (Collection) o, eType); } else if (sType.isArray()) { - if (addClassAttr) - serializeCollectionMap(session, out, toList(sType.getInnerClass(), o), sType); - else - serializeCollection(session, out, toList(sType.getInnerClass(), o), eType); + serializeCollection(session, out, toList(sType.getInnerClass(), o), eType); } else out.stringValue(session.toString(o)); @@ -277,20 +271,6 @@ public class JsonSerializer extends WriterSerializer { return out; } - @SuppressWarnings({ "rawtypes" }) - private SerializerWriter serializeCollectionMap(JsonSerializerSession session, JsonWriter out, Collection o, ClassMeta<?> type) throws Exception { - BeanContext bc = session.getBeanContext(); - int i = session.getIndent(); - out.append('{'); - out.cr(i).attr(bc.getTypePropertyName()).append(':').s().q().append(type.getInnerClass().getName()).q().append(',').s(); - out.cr(i).attr("items").append(':').s(); - session.indent++; - serializeCollection(session, out, o, type); - session.indent--; - out.cr(i-1).append('}'); - return out; - } - private SerializerWriter serializeBeanMap(JsonSerializerSession session, JsonWriter out, BeanMap<?> m, boolean addClassAttr) throws Exception { int depth = session.getIndent(); out.append('{'); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0aada18e/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java index cf1e816..8f81fae 100644 --- a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java +++ b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java @@ -108,16 +108,10 @@ public class MsgPackSerializer extends OutputStreamSerializer { serializeMap(session, out, (Map)o, eType); } else if (sType.isCollection()) { - if (addClassAttr) - serializeCollectionMap(session, out, (Collection)o, sType); - else - serializeCollection(session, out, (Collection) o, eType); + serializeCollection(session, out, (Collection) o, eType); } else if (sType.isArray()) { - if (addClassAttr) - serializeCollectionMap(session, out, toList(sType.getInnerClass(), o), sType); - else - serializeCollection(session, out, toList(sType.getInnerClass(), o), eType); + serializeCollection(session, out, toList(sType.getInnerClass(), o), eType); } else out.appendString(session.toString(o)); @@ -150,16 +144,6 @@ public class MsgPackSerializer extends OutputStreamSerializer { } } - @SuppressWarnings({ "rawtypes" }) - private void serializeCollectionMap(MsgPackSerializerSession session, MsgPackOutputStream out, Collection o, ClassMeta<?> type) throws Exception { - BeanContext bc = session.getBeanContext(); - out.startMap(2); - serializeAnything(session, out, bc.getTypePropertyName(), null, null, null); - serializeAnything(session, out, type.getInnerClass().getName(), null, null, null); - serializeAnything(session, out, "items", null, null, null); - serializeCollection(session, out, o, type); - } - private void serializeBeanMap(MsgPackSerializerSession session, MsgPackOutputStream out, final BeanMap<?> m, boolean addClassAttr) throws Exception { List<BeanPropertyValue> values = m.getValues(session.isTrimNulls(), addClassAttr ? session.createBeanTypeNameProperty(m, null) : null); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0aada18e/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java index 64550af..60d198b 100644 --- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java +++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java @@ -300,16 +300,10 @@ public class UonSerializer extends WriterSerializer { serializeMap(session, out, (Map)o, eType); } else if (sType.isCollection()) { - if (addClassAttr) - serializeCollectionMap(session, out, (Collection)o, sType); - else - serializeCollection(session, out, (Collection) o, eType); + serializeCollection(session, out, (Collection) o, eType); } else if (sType.isArray()) { - if (addClassAttr) - serializeCollectionMap(session, out, toList(sType.getInnerClass(), o), sType); - else - serializeCollection(session, out, toList(sType.getInnerClass(), o), eType); + serializeCollection(session, out, toList(sType.getInnerClass(), o), eType); } else { out.appendObject(o, quoteEmptyStrings, false, isTop); @@ -349,24 +343,6 @@ public class UonSerializer extends WriterSerializer { return out; } - @SuppressWarnings({ "rawtypes" }) - private SerializerWriter serializeCollectionMap(UonSerializerSession session, UonWriter out, Collection o, ClassMeta<?> type) throws Exception { - BeanContext bc = session.getBeanContext(); - int i = session.getIndent(); - out.startFlag('o').nl(); - out.append(i, bc.getTypePropertyName()).append("=").appendObject(type, false, false, false).append(',').nl(); - out.append(i, "items="); - session.indent++; - serializeCollection(session, out, o, type); - session.indent--; - - if (o.size() > 0) - out.cr(i-1); - out.append(')'); - - return out; - } - private SerializerWriter serializeBeanMap(UonSerializerSession session, UonWriter out, BeanMap<?> m, boolean addClassAttr) throws Exception { int depth = session.getIndent(); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0aada18e/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java b/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java index 117612d..19f2382 100755 --- a/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java @@ -172,9 +172,6 @@ public class RoundTripAddClassAttrsTest extends RoundTripTest { ti = roundTrip(t, IA[].class); assertEquals("foo", ti[0].getF1()); - - t = (A[])roundTrip(t, Object.class); - assertEquals("foo", t[0].getF1()); } //==================================================================================================== http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0aada18e/juneau-core/src/test/java/org/apache/juneau/json/JsonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/json/JsonTest.java b/juneau-core/src/test/java/org/apache/juneau/json/JsonTest.java index 16742f6..0963c4f 100755 --- a/juneau-core/src/test/java/org/apache/juneau/json/JsonTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/json/JsonTest.java @@ -274,14 +274,14 @@ public class JsonTest { } //==================================================================================================== - // testAddClassAttrs + // testSubclassedList //==================================================================================================== @Test - public void testAddClassAttrs() throws Exception { - JsonSerializer s = new JsonSerializer().setProperty(SERIALIZER_addClassAttrs, true); + public void testSubclassedList() throws Exception { + JsonSerializer s = new JsonSerializer(); Map<String,Object> o = new HashMap<String,Object>(); o.put("c", new C()); - assertEquals("{\"c\":{\"_type\":\"org.apache.juneau.json.JsonTest$C\",\"items\":[]}}", s.serialize(o)); + assertEquals("{\"c\":[]}", s.serialize(o)); } public static class C extends LinkedList<String> {
