Repository: incubator-juneau Updated Branches: refs/heads/master 0aada18ef -> 864893f23
Rename addClassAttrs to addBeanTypeProperties. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/864893f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/864893f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/864893f2 Branch: refs/heads/master Commit: 864893f237ed67e8dc24454f2b9dec165eefdd9e Parents: 0aada18 Author: jamesbognar <[email protected]> Authored: Fri Sep 9 15:53:33 2016 -0400 Committer: jamesbognar <[email protected]> Committed: Fri Sep 9 15:53:33 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/juneau/BeanContext.java | 14 ++++++------- .../java/org/apache/juneau/BeanDictionary.java | 8 +++---- .../main/java/org/apache/juneau/BeanMeta.java | 2 +- .../main/java/org/apache/juneau/ObjectMap.java | 10 ++++----- .../java/org/apache/juneau/html/HtmlParser.java | 6 +++--- .../org/apache/juneau/html/HtmlSerializer.java | 22 ++++++++++---------- .../java/org/apache/juneau/jena/Constants.java | 2 +- .../org/apache/juneau/jena/RdfSerializer.java | 2 +- .../java/org/apache/juneau/json/JsonParser.java | 4 ++-- .../org/apache/juneau/json/JsonSerializer.java | 8 +++---- .../apache/juneau/msgpack/MsgPackParser.java | 4 ++-- .../juneau/msgpack/MsgPackSerializer.java | 8 +++---- .../java/org/apache/juneau/parser/Parser.java | 2 +- .../juneau/serializer/SerializerContext.java | 10 ++++----- .../juneau/serializer/SerializerSession.java | 14 ++++++------- .../apache/juneau/urlencoding/UonParser.java | 10 ++++----- .../juneau/urlencoding/UonSerializer.java | 8 +++---- .../juneau/urlencoding/UrlEncodingParser.java | 6 +++--- .../urlencoding/UrlEncodingSerializer.java | 8 +++---- .../java/org/apache/juneau/xml/XmlParser.java | 2 +- .../apache/juneau/xml/XmlSchemaSerializer.java | 4 ++-- .../org/apache/juneau/xml/XmlSerializer.java | 12 +++++------ .../a/rttests/RoundTripAddClassAttrsTest.java | 20 +++++++++--------- .../apache/juneau/html/CommonParserTest.java | 2 +- .../java/org/apache/juneau/html/CommonTest.java | 2 +- .../apache/juneau/jena/CommonParserTest.java | 2 +- .../java/org/apache/juneau/jena/CommonTest.java | 2 +- .../apache/juneau/json/CommonParserTest.java | 2 +- .../java/org/apache/juneau/json/CommonTest.java | 2 +- .../urlencoding/CommonParser_UonTest.java | 2 +- .../CommonParser_UrlEncodingTest.java | 2 +- .../juneau/urlencoding/Common_UonTest.java | 2 +- .../urlencoding/Common_UrlEncodingTest.java | 2 +- .../org/apache/juneau/utils/PojoRestTest.java | 2 +- .../java/org/apache/juneau/xml/CommonTest.java | 2 +- 35 files changed, 105 insertions(+), 105 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/BeanContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/src/main/java/org/apache/juneau/BeanContext.java index d0e21ce..bfa3d87 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanContext.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanContext.java @@ -469,9 +469,9 @@ public class BeanContext extends Context { public static final String BEAN_beanDictionary_remove = "BeanContext.beanDictionary.list.remove"; /** - * The name to use for the type property used to represent a bean type. ({@link String}, default=<js>"_type"</js>). + * The name to use for the bean type properties used to represent a bean type. ({@link String}, default=<js>"_type"</js>). */ - public static final String BEAN_typePropertyName = "BeanContext.typePropertyName"; + public static final String BEAN_beanTypePropertyName = "BeanContext.beanTypePropertyName"; /** * Specifies the default parser to use when converting <code>Strings</code> to POJOs in the {@link BeanContext#convertToType(Object, Class)} method (<code>Class</code>). @@ -565,7 +565,7 @@ public class BeanContext extends Context { // Optional default parser set by setDefaultParser(). final ReaderParser defaultParser; - final String typePropertyName; + final String beanTypePropertyName; // Holds pending ClassMetas (created, but not yet initialized). final Deque<ClassMeta> pendingClassMetas = new LinkedList<ClassMeta>(); @@ -600,7 +600,7 @@ public class BeanContext extends Context { ignoreInvocationExceptionsOnSetters = pm.get(BEAN_ignoreInvocationExceptionsOnSetters, boolean.class, false); useJavaBeanIntrospector = pm.get(BEAN_useJavaBeanIntrospector, boolean.class, false); sortProperties = pm.get(BEAN_sortProperties, boolean.class, false); - typePropertyName = pm.get(BEAN_typePropertyName, String.class, "_type"); + beanTypePropertyName = pm.get(BEAN_beanTypePropertyName, String.class, "_type"); beanConstructorVisibility = pm.get(BEAN_beanConstructorVisibility, Visibility.class, PUBLIC); beanClassVisibility = pm.get(BEAN_beanClassVisibility, Visibility.class, PUBLIC); @@ -1490,12 +1490,12 @@ public class BeanContext extends Context { } /** - * Returns the type property name as defined by {@link BeanContext#BEAN_typePropertyName}. + * Returns the type property name as defined by {@link BeanContext#BEAN_beanTypePropertyName}. * * @return The type property name. Never <jk>null</jk>. */ - public final String getTypePropertyName() { - return typePropertyName; + public final String getBeanTypePropertyName() { + return beanTypePropertyName; } /** http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/BeanDictionary.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanDictionary.java b/juneau-core/src/main/java/org/apache/juneau/BeanDictionary.java index 750e1d5..3b8ce26 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanDictionary.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanDictionary.java @@ -37,12 +37,12 @@ public class BeanDictionary { private final Map<String,ClassMeta<?>> map; private final Map<Class<?>,String> reverseMap; private final BeanContext beanContext; - private final String typePropertyName; + private final String beanTypePropertyName; private final BeanDictionary parent; BeanDictionary(BeanContext beanContext, BeanDictionary parent, Map<String,Class<?>> map) { this.beanContext = beanContext; - this.typePropertyName = beanContext.getTypePropertyName(); + this.beanTypePropertyName = beanContext.getBeanTypePropertyName(); this.parent = parent == null ? beanContext.getBeanDictionary() : parent; Map<String,ClassMeta<?>> m1 = new HashMap<String,ClassMeta<?>>(); for (Map.Entry<String,Class<?>> e : map.entrySet()) { @@ -75,7 +75,7 @@ public class BeanDictionary { * @return The new bean, or the original <code>ObjectMap</code> if no <js>"_type"</js> entry was found. */ public Object cast(ObjectMap m) { - Object o = m.get(typePropertyName); + Object o = m.get(beanTypePropertyName); if (o == null) return m; String typeName = o.toString(); @@ -86,7 +86,7 @@ public class BeanDictionary { for (Map.Entry<String,Object> e : m.entrySet()) { String k = e.getKey(); Object v = e.getValue(); - if (! k.equals(typePropertyName)) { + if (! k.equals(beanTypePropertyName)) { // Attempt to recursively cast child maps. if (v instanceof ObjectMap) v = cast((ObjectMap)v); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java b/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java index 2e6ae40..d68402d 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java @@ -124,7 +124,7 @@ public class BeanMeta<T> { this.constructorArgs = b.constructorArgs; this.extMeta = b.extMeta; this.subTypeProperty = b.subTypeIdProperty; - this.typeProperty = new BeanPropertyMeta(this, ctx.getTypePropertyName(), ctx.string()); + this.typeProperty = new BeanPropertyMeta(this, ctx.getBeanTypePropertyName(), ctx.string()); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java b/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java index 67649b3..76fa749 100644 --- a/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java +++ b/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java @@ -1162,7 +1162,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> { * same object if entry does not exist. */ public Object cast(BeanDictionary typeDictionary) { - String c = (String)get(beanContext.getTypePropertyName()); + String c = (String)get(beanContext.getBeanTypePropertyName()); if (c == null) { return this; } @@ -1185,7 +1185,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> { */ @SuppressWarnings("unchecked") public <T> T cast(Class<T> type) { - ClassMeta<?> c1 = beanContext.getClassMetaFromString((String)get(beanContext.getTypePropertyName())); + ClassMeta<?> c1 = beanContext.getClassMetaFromString((String)get(beanContext.getBeanTypePropertyName())); ClassMeta<?> c2 = beanContext.getClassMeta(type); ClassMeta<?> c = narrowClassMeta(c1, c2); return (T)cast2(c); @@ -1202,7 +1202,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> { */ @SuppressWarnings({"unchecked"}) public <T> T cast(ClassMeta<T> cm) { - ClassMeta<?> c1 = beanContext.getClassMetaFromString((String)get(beanContext.getTypePropertyName())); + ClassMeta<?> c1 = beanContext.getClassMetaFromString((String)get(beanContext.getBeanTypePropertyName())); ClassMeta<?> c = narrowClassMeta(c1, cm); return (T)cast2(c); } @@ -1255,7 +1255,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> { for (Map.Entry<String,Object> e : entrySet()) { Object k = e.getKey(); Object v = e.getValue(); - if (! k.equals(beanContext.getTypePropertyName())) { + if (! k.equals(beanContext.getBeanTypePropertyName())) { // Attempt to recursively cast child maps. if (v instanceof ObjectMap) @@ -1276,7 +1276,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> { for (Map.Entry<String,Object> e : entrySet()) { String k = e.getKey(); Object v = e.getValue(); - if (! k.equals(beanContext.getTypePropertyName())) { + if (! k.equals(beanContext.getBeanTypePropertyName())) { // Attempt to recursively cast child maps. if (v instanceof ObjectMap) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java index 0611830..52180eb 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java @@ -115,7 +115,7 @@ public final class HtmlParser extends ReaderParser { if (tag == TABLE) { Map<String,String> attrs = getAttributes(event); tableType = attrs.get("type"); - String c = attrs.get(bc.getTypePropertyName()); + String c = attrs.get(bc.getBeanTypePropertyName()); if (c != null) sType = eType = (ClassMeta<T>)bc.getClassMetaFromString(c); } @@ -348,7 +348,7 @@ public final class HtmlParser extends ReaderParser { } l.add(m == null ? null : (E)m.getBean()); } else { - String c = getAttributes(event).get(bc.getTypePropertyName()); + String c = getAttributes(event).get(bc.getBeanTypePropertyName()); Map m = (Map)(elementType.isMap() && elementType.canCreateNewInstance(l) ? elementType.newInstance(l) : new ObjectMap(bc)); for (int i = 0; i < keys.size(); i++) { tag = nextTag(r, TD, NULL); @@ -368,7 +368,7 @@ public final class HtmlParser extends ReaderParser { } if (m != null && c != null) { ObjectMap m2 = (m instanceof ObjectMap ? (ObjectMap)m : new ObjectMap(m).setBeanContext(session.getBeanContext())); - m2.put(bc.getTypePropertyName(), c); + m2.put(bc.getBeanTypePropertyName(), c); l.add((E)m2.cast()); } else { l.add((E)m); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/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 1115f27..0ae595c 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 @@ -217,9 +217,9 @@ public class HtmlSerializer extends XmlSerializer { else { sType = aType.getSerializedClassMeta(); - String classAttr = null; - if (session.isAddClassAttrs() && ! eType.equals(aType)) - classAttr = aType.toString(); + String typeName = null; + if (session.isAddBeanTypeProperties() && ! eType.equals(aType)) + typeName = aType.toString(); // Swap if necessary PojoSwap swap = aType.getPojoSwap(); @@ -241,18 +241,18 @@ public class HtmlSerializer extends XmlSerializer { else if (o == null || (sType.isChar() && ((Character)o).charValue() == 0)) out.tag(i, "null").nl(); else if (sType.hasToObjectMapMethod()) - serializeMap(session, out, sType.toObjectMap(o), eType, classAttr, pMeta); + serializeMap(session, out, sType.toObjectMap(o), eType, typeName, pMeta); else if (sType.isBean()) - serializeBeanMap(session, out, bc.forBean(o), classAttr, pMeta); + serializeBeanMap(session, out, bc.forBean(o), typeName, pMeta); else if (sType.isNumber()) out.sTag(i, "number").append(o).eTag("number").nl(); else if (sType.isBoolean()) out.sTag(i, "boolean").append(o).eTag("boolean").nl(); else if (sType.isMap()) { if (o instanceof BeanMap) - serializeBeanMap(session, out, (BeanMap)o, classAttr, pMeta); + serializeBeanMap(session, out, (BeanMap)o, typeName, pMeta); else - serializeMap(session, out, (Map)o, eType, classAttr, pMeta); + serializeMap(session, out, (Map)o, eType, typeName, pMeta); } else if (sType.isCollection()) { serializeCollection(session, out, (Collection)o, eType, name, null, pMeta); @@ -330,7 +330,7 @@ public class HtmlSerializer extends XmlSerializer { out.oTag(i, "table").attr("type", "object"); if (classAttr != null) - out.attr(bc.getTypePropertyName(), classAttr); + out.attr(bc.getBeanTypePropertyName(), classAttr); out.append('>').nl(); if (! (m.getClassMeta().getExtendedMeta(HtmlClassMeta.class).isNoTableHeaders() || (ppMeta != null && ppMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).isNoTableHeaders()))) { out.sTag(i+1, "tr").nl(); @@ -397,7 +397,7 @@ public class HtmlSerializer extends XmlSerializer { out.oTag(i, "table").attr("type", "array"); if (classAttr != null) - out.attr(bc.getTypePropertyName(), classAttr); + out.attr(bc.getBeanTypePropertyName(), classAttr); out.append('>').nl(); out.sTag(i+1, "tr").nl(); for (String key : th) @@ -413,8 +413,8 @@ public class HtmlSerializer extends XmlSerializer { cm = cm.getSerializedClassMeta(); } - if (cm != null && session.isAddClassAttrs() && elementType.getInnerClass() != o.getClass()) - out.oTag(i+1, "tr").attr(bc.getTypePropertyName(), o.getClass().getName()).append('>').nl(); + if (cm != null && session.isAddBeanTypeProperties() && elementType.getInnerClass() != o.getClass()) + out.oTag(i+1, "tr").attr(bc.getBeanTypePropertyName(), o.getClass().getName()).append('>').nl(); else out.sTag(i+1, "tr").nl(); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/jena/Constants.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/jena/Constants.java b/juneau-core/src/main/java/org/apache/juneau/jena/Constants.java index 625fffe..e27429d 100644 --- a/juneau-core/src/main/java/org/apache/juneau/jena/Constants.java +++ b/juneau-core/src/main/java/org/apache/juneau/jena/Constants.java @@ -67,7 +67,7 @@ public final class Constants { * <p> * Property added to bean resources to identify the class type. * <p> - * Added if {@link SerializerContext#SERIALIZER_addClassAttrs} setting is enabled. + * Added if {@link SerializerContext#SERIALIZER_addBeanTypeProperties} setting is enabled. */ public static final String RDF_juneauNs_CLASS = "class"; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java b/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java index 492c2ed..568716f 100644 --- a/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java +++ b/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java @@ -265,7 +265,7 @@ public class RdfSerializer extends WriterSerializer { n = m.createLiteral(session.encodeTextInvalidChars(session.toString(o))); } - if (session.isAddClassAttrs() && n != null && n.isResource()) { + if (session.isAddBeanTypeProperties() && n != null && n.isResource()) { if (o != null && ! eType.equals(aType)) n.asResource().addProperty(session.getClassProperty(), aType.toString()); else if (o == null) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java b/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java index b4c4570..4ea926f 100644 --- a/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java +++ b/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java @@ -188,7 +188,7 @@ public final class JsonParser extends ReaderParser { } else if (c == '{') { Map m = new ObjectMap(bc); parseIntoMap2(session, r, m, sType.getKeyType(), sType.getValueType()); - if (m.containsKey(bc.getTypePropertyName())) + if (m.containsKey(bc.getBeanTypePropertyName())) o = ((ObjectMap)m).cast(); else throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason()); @@ -461,7 +461,7 @@ public final class JsonParser extends ReaderParser { if (c == '/') { skipCommentsAndSpace(session, r.unread()); } else if (! Character.isWhitespace(c)) { - if (! currAttr.equals(bc.getTypePropertyName())) { + if (! currAttr.equals(bc.getBeanTypePropertyName())) { BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr); session.setCurrentProperty(pMeta); if (pMeta == null) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/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 0973ec4..1b1598f 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 @@ -171,7 +171,7 @@ public class JsonSerializer extends WriterSerializer { if (eType == null) eType = object(); - boolean addClassAttr; // Add "_type" attribute to element? + boolean addTypeProperty; // Add "_type" attribute to element? ClassMeta<?> aType; // The actual type ClassMeta<?> sType; // The serialized type @@ -185,7 +185,7 @@ public class JsonSerializer extends WriterSerializer { } sType = aType.getSerializedClassMeta(); - addClassAttr = (session.isAddClassAttrs() && ! eType.equals(aType)); + addTypeProperty = (session.isAddBeanTypeProperties() && ! eType.equals(aType)); // Swap if necessary PojoSwap swap = aType.getPojoSwap(); @@ -212,12 +212,12 @@ public class JsonSerializer extends WriterSerializer { else if (sType.hasToObjectMapMethod()) serializeMap(session, out, sType.toObjectMap(o), sType); else if (sType.isBean()) - serializeBeanMap(session, out, bc.forBean(o), addClassAttr); + serializeBeanMap(session, out, bc.forBean(o), addTypeProperty); else if (sType.isUri() || (pMeta != null && pMeta.isUri())) out.q().appendUri(o).q(); else if (sType.isMap()) { if (o instanceof BeanMap) - serializeBeanMap(session, out, (BeanMap)o, addClassAttr); + serializeBeanMap(session, out, (BeanMap)o, addTypeProperty); else serializeMap(session, out, (Map)o, eType); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java index e366567..2cd8fb9 100644 --- a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java +++ b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java @@ -121,7 +121,7 @@ public final class MsgPackParser extends InputStreamParser { String pName = parseAnything(session, string(), is, m.getBean(false)); BeanPropertyMeta bpm = m.getPropertyMeta(pName); if (bpm == null) { - if (pName.equals(bc.getTypePropertyName())) + if (pName.equals(bc.getBeanTypePropertyName())) parseAnything(session, bc.string(), is, null); else onUnknownProperty(session, pName, m, 0, is.getPosition()); @@ -172,7 +172,7 @@ public final class MsgPackParser extends InputStreamParser { ObjectMap m = new ObjectMap(bc); for (int i = 0; i < length; i++) m.put(parseAnything(session, string(), is, outer), parseAnything(session, object(), is, m)); - if (m.containsKey(bc.getTypePropertyName())) + if (m.containsKey(bc.getBeanTypePropertyName())) o = m.cast(); else throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason()); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/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 8f81fae..6923ecd 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 @@ -61,7 +61,7 @@ public class MsgPackSerializer extends OutputStreamSerializer { if (eType == null) eType = object(); - boolean addClassAttr; // Add "_type" attribute to element? + boolean addTypeProperty; // Add "_type" attribute to element? ClassMeta<?> aType; // The actual type ClassMeta<?> sType; // The serialized type @@ -75,7 +75,7 @@ public class MsgPackSerializer extends OutputStreamSerializer { } sType = aType.getSerializedClassMeta(); - addClassAttr = (session.isAddClassAttrs() && ! eType.equals(aType)); + addTypeProperty = (session.isAddBeanTypeProperties() && ! eType.equals(aType)); // Swap if necessary PojoSwap swap = aType.getPojoSwap(); @@ -98,12 +98,12 @@ public class MsgPackSerializer extends OutputStreamSerializer { else if (sType.hasToObjectMapMethod()) serializeMap(session, out, sType.toObjectMap(o), sType); else if (sType.isBean()) - serializeBeanMap(session, out, bc.forBean(o), addClassAttr); + serializeBeanMap(session, out, bc.forBean(o), addTypeProperty); else if (sType.isUri() || (pMeta != null && pMeta.isUri())) out.appendString(session.resolveUri(o.toString())); else if (sType.isMap()) { if (o instanceof BeanMap) - serializeBeanMap(session, out, (BeanMap)o, addClassAttr); + serializeBeanMap(session, out, (BeanMap)o, addTypeProperty); else serializeMap(session, out, (Map)o, eType); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java b/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java index 5c5e2f2..ef6e4a1 100644 --- a/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java +++ b/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java @@ -651,7 +651,7 @@ public abstract class Parser extends CoreApi { */ protected <T> void onUnknownProperty(ParserSession session, String propertyName, BeanMap<T> beanMap, int line, int col) throws ParseException { BeanContext bc = session.getBeanContext(); - if (propertyName.equals("uri") || propertyName.equals("type") || propertyName.equals(bc.getTypePropertyName())) + if (propertyName.equals("type") || propertyName.equals(bc.getBeanTypePropertyName())) return; if (! session.getBeanContext().isIgnoreUnknownBeanProperties()) throw new ParseException(session, "Unknown property ''{0}'' encountered while trying to parse into class ''{1}''", propertyName, beanMap.getClassMeta()); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java index 0608d4c..ff3b2cf 100644 --- a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java +++ b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java @@ -88,13 +88,13 @@ public class SerializerContext extends Context { public static final String SERIALIZER_useIndentation = "Serializer.useIndentation"; /** - * Add class attributes to output ({@link Boolean}, default=<jk>false</jk>). + * Add <js>"_type"</js> properties to output when needed.({@link Boolean}, default=<jk>false</jk>). * <p> - * If <jk>true</jk>, then <js>"_type"</js> attributes will be added to beans if their type cannot be inferred through reflection. + * If <jk>true</jk>, then <js>"_type"</js> properties will be added to beans if their type cannot be inferred through reflection. * This is used to recreate the correct objects during parsing if the object types cannot be inferred. * For example, when serializing a {@code Map<String,Object>} field, where the bean class cannot be determined from the value type. */ - public static final String SERIALIZER_addClassAttrs = "Serializer.addClassAttrs"; + public static final String SERIALIZER_addBeanTypeProperties = "Serializer.addBeanTypeProperties"; /** * Quote character ({@link Character}, default=<js>'"'</js>). @@ -234,7 +234,7 @@ public class SerializerContext extends Context { detectRecursions, ignoreRecursions, useIndentation, - addClassAttrs, + addBeanTypeProperties, trimNulls, trimEmptyLists, trimEmptyMaps, @@ -259,7 +259,7 @@ public class SerializerContext extends Context { detectRecursions = cf.getProperty(SERIALIZER_detectRecursions, boolean.class, false); ignoreRecursions = cf.getProperty(SERIALIZER_ignoreRecursions, boolean.class, false); useIndentation = cf.getProperty(SERIALIZER_useIndentation, boolean.class, false); - addClassAttrs = cf.getProperty(SERIALIZER_addClassAttrs, boolean.class, false); + addBeanTypeProperties = cf.getProperty(SERIALIZER_addBeanTypeProperties, boolean.class, false); trimNulls = cf.getProperty(SERIALIZER_trimNullProperties, boolean.class, true); trimEmptyLists = cf.getProperty(SERIALIZER_trimEmptyLists, boolean.class, false); trimEmptyMaps = cf.getProperty(SERIALIZER_trimEmptyMaps, boolean.class, false); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java index aa28abc..052a8de 100644 --- a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java +++ b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java @@ -49,7 +49,7 @@ public class SerializerSession extends Session { detectRecursions, ignoreRecursions, useIndentation, - addClassAttrs, + addBeanTypeProperties, trimNulls, trimEmptyLists, trimEmptyMaps, @@ -113,7 +113,7 @@ public class SerializerSession extends Session { detectRecursions = ctx.detectRecursions; ignoreRecursions = ctx.ignoreRecursions; useIndentation = ctx.useIndentation; - addClassAttrs = ctx.addClassAttrs; + addBeanTypeProperties = ctx.addBeanTypeProperties; trimNulls = ctx.trimNulls; trimEmptyLists = ctx.trimEmptyLists; trimEmptyMaps = ctx.trimEmptyMaps; @@ -131,7 +131,7 @@ public class SerializerSession extends Session { detectRecursions = op.getBoolean(SERIALIZER_detectRecursions, ctx.detectRecursions); ignoreRecursions = op.getBoolean(SERIALIZER_ignoreRecursions, ctx.ignoreRecursions); useIndentation = op.getBoolean(SERIALIZER_useIndentation, ctx.useIndentation); - addClassAttrs = op.getBoolean(SERIALIZER_addClassAttrs, ctx.addClassAttrs); + addBeanTypeProperties = op.getBoolean(SERIALIZER_addBeanTypeProperties, ctx.addBeanTypeProperties); trimNulls = op.getBoolean(SERIALIZER_trimNullProperties, ctx.trimNulls); trimEmptyLists = op.getBoolean(SERIALIZER_trimEmptyLists, ctx.trimEmptyLists); trimEmptyMaps = op.getBoolean(SERIALIZER_trimEmptyMaps, ctx.trimEmptyMaps); @@ -320,12 +320,12 @@ public class SerializerSession extends Session { } /** - * Returns the {@link SerializerContext#SERIALIZER_addClassAttrs} setting value for this session. + * Returns the {@link SerializerContext#SERIALIZER_addBeanTypeProperties} setting value for this session. * - * @return The {@link SerializerContext#SERIALIZER_addClassAttrs} setting value for this session. + * @return The {@link SerializerContext#SERIALIZER_addBeanTypeProperties} setting value for this session. */ - public final boolean isAddClassAttrs() { - return addClassAttrs; + public final boolean isAddBeanTypeProperties() { + return addBeanTypeProperties; } /** http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java index 9552688..3a51c03 100644 --- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java +++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java @@ -146,7 +146,7 @@ public class UonParser extends ReaderParser { ObjectMap m = new ObjectMap(bc); parseIntoMap(session, r, m, string(), object()); // Handle case where it's a collection, but serialized as a map with a _type or _value key. - if (m.containsKey(bc.getTypePropertyName())) + if (m.containsKey(bc.getBeanTypePropertyName())) o = m.cast(); // Handle case where it's a collection, but only a single value was specified. else { @@ -177,7 +177,7 @@ public class UonParser extends ReaderParser { ObjectMap m = new ObjectMap(bc); parseIntoMap(session, r, m, string(), object()); // Handle case where it's an array, but serialized as a map with a _type or _value key. - if (m.containsKey(bc.getTypePropertyName())) + if (m.containsKey(bc.getBeanTypePropertyName())) o = m.cast(); // Handle case where it's an array, but only a single value was specified. else { @@ -193,7 +193,7 @@ public class UonParser extends ReaderParser { // It could be a non-bean with _type attribute. ObjectMap m = new ObjectMap(bc); parseIntoMap(session, r, m, string(), object()); - if (m.containsKey(bc.getTypePropertyName())) + if (m.containsKey(bc.getBeanTypePropertyName())) o = m.cast(); else throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason()); @@ -421,7 +421,7 @@ public class UonParser extends ReaderParser { } } else if (state == S3) { if (c == -1 || c == ',' || c == ')' || c == AMP) { - if (! currAttr.equals(bc.getTypePropertyName())) { + if (! currAttr.equals(bc.getBeanTypePropertyName())) { BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr); if (pMeta == null) { if (m.getMeta().isSubTyped()) { @@ -438,7 +438,7 @@ public class UonParser extends ReaderParser { return m; state = S1; } else { - if (! currAttr.equals(bc.getTypePropertyName())) { + if (! currAttr.equals(bc.getBeanTypePropertyName())) { BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr); if (pMeta == null) { if (m.getMeta().isSubTyped()) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/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 60d198b..948be20 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 @@ -257,7 +257,7 @@ public class UonSerializer extends WriterSerializer { if (eType == null) eType = object(); - boolean addClassAttr; // Add "_type" attribute to element? + boolean addTypeProperty; // Add "_type" attribute to element? ClassMeta<?> aType; // The actual type ClassMeta<?> sType; // The serialized type @@ -271,7 +271,7 @@ public class UonSerializer extends WriterSerializer { } sType = aType.getSerializedClassMeta(); - addClassAttr = (session.isAddClassAttrs() && ! eType.equals(aType)); + addTypeProperty = (session.isAddBeanTypeProperties() && ! eType.equals(aType)); // Swap if necessary PojoSwap swap = aType.getPojoSwap(); @@ -290,12 +290,12 @@ public class UonSerializer extends WriterSerializer { else if (sType.hasToObjectMapMethod()) serializeMap(session, out, sType.toObjectMap(o), eType); else if (sType.isBean()) - serializeBeanMap(session, out, bc.forBean(o), addClassAttr); + serializeBeanMap(session, out, bc.forBean(o), addTypeProperty); else if (sType.isUri() || (pMeta != null && pMeta.isUri())) out.appendUri(o, isTop); else if (sType.isMap()) { if (o instanceof BeanMap) - serializeBeanMap(session, out, (BeanMap)o, addClassAttr); + serializeBeanMap(session, out, (BeanMap)o, addTypeProperty); else serializeMap(session, out, (Map)o, eType); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java index dde9e5b..cda21ba 100644 --- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java +++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java @@ -106,7 +106,7 @@ public class UrlEncodingParser extends UonParser { ObjectMap m = new ObjectMap(bc); ClassMeta<Object> valueType = object(); parseIntoMap(session, r, m, string(), valueType); - if (m.containsKey(bc.getTypePropertyName())) + if (m.containsKey(bc.getBeanTypePropertyName())) o = m.cast(); else if (m.containsKey("_value")) o = session.getBeanContext().convertToType(m.get("_value"), sType); @@ -263,7 +263,7 @@ public class UrlEncodingParser extends UonParser { } } else if (state == S3) { if (c == -1 || c == '\u0001') { - if (! currAttr.equals(bc.getTypePropertyName())) { + if (! currAttr.equals(bc.getBeanTypePropertyName())) { BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr); if (pMeta == null) { if (m.getMeta().isSubTyped()) { @@ -285,7 +285,7 @@ public class UrlEncodingParser extends UonParser { return m; state = S1; } else { - if (! currAttr.equals(bc.getTypePropertyName())) { + if (! currAttr.equals(bc.getBeanTypePropertyName())) { BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr); if (pMeta == null) { if (m.getMeta().isSubTyped()) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java index b6d5b7a..3863386 100644 --- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java +++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java @@ -228,7 +228,7 @@ public class UrlEncodingSerializer extends UonSerializer { private SerializerWriter serializeAnything(UrlEncodingSerializerSession session, UonWriter out, Object o) throws Exception { BeanContext bc = session.getBeanContext(); - boolean addClassAttr; // Add "_type" attribute to element? + boolean addTypeProperty; // Add "_type" attribute to element? ClassMeta<?> aType; // The actual type ClassMeta<?> sType; // The serialized type @@ -238,7 +238,7 @@ public class UrlEncodingSerializer extends UonSerializer { aType = object(); sType = aType.getSerializedClassMeta(); - addClassAttr = (session.isAddClassAttrs()); + addTypeProperty = (session.isAddBeanTypeProperties()); // Swap if necessary PojoSwap swap = aType.getPojoSwap(); @@ -253,13 +253,13 @@ public class UrlEncodingSerializer extends UonSerializer { if (sType.isMap()) { if (o instanceof BeanMap) - serializeBeanMap(session, out, (BeanMap)o, addClassAttr); + serializeBeanMap(session, out, (BeanMap)o, addTypeProperty); else serializeMap(session, out, (Map)o, sType); } else if (sType.hasToObjectMapMethod()) { serializeMap(session, out, sType.toObjectMap(o), sType); } else if (sType.isBean()) { - serializeBeanMap(session, out, bc.forBean(o), addClassAttr); + serializeBeanMap(session, out, bc.forBean(o), addTypeProperty); } else if (sType.isCollection()) { serializeMap(session, out, getCollectionMap((Collection)o), bc.getMapClassMeta(Map.class, Integer.class, sType.getElementType())); } else { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java index 0ecc293..2311a52 100644 --- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java +++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java @@ -86,7 +86,7 @@ public class XmlParser extends ReaderParser { jsonType = getJsonType(elementName); } if (! sType.canCreateNewInstance(outer)) { - String c = r.getAttributeValue(null, bc.getTypePropertyName()); + String c = r.getAttributeValue(null, bc.getBeanTypePropertyName()); if (c != null) { sType = eType = (ClassMeta<T>)bc.getClassMetaFromString(c); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java index 4b176fa..b848532 100644 --- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java +++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java @@ -500,9 +500,9 @@ public class XmlSchemaSerializer extends XmlSerializer { w.eTag(i+1, "sequence").nl(); } - if (session.isAddClassAttrs()) { + if (session.isAddBeanTypeProperties()) { w.oTag(i+1, "attribute") - .attr("name", bc.getTypePropertyName()) + .attr("name", bc.getBeanTypePropertyName()) .attr("type", "string") .ceTag().nl(); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java index bbcc052..cdc7d0e 100644 --- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java +++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java @@ -340,12 +340,12 @@ public class XmlSerializer extends WriterSerializer { sType = eType.getSerializedClassMeta(); } - String classAttr = null; - if (session.isAddClassAttrs()) { + String typeName = null; + if (session.isAddBeanTypeProperties()) { if (o != null && ! eType.equals(aType)) - classAttr = aType.toString(); + typeName = aType.toString(); else if (o == null) - classAttr = eType.toString(); + typeName = eType.toString(); } // char '\0' is interpreted as null. @@ -429,8 +429,8 @@ public class XmlSerializer extends WriterSerializer { } if (elementName != null && session.isAddJsonTypeAttrs() && (session.isAddJsonStringTypeAttrs() || ! ts.equals("string"))) out.attr(dns, "type", ts); - if (classAttr != null) - out.attr(dns, bc.getTypePropertyName(), classAttr); + if (typeName != null) + out.attr(dns, bc.getBeanTypePropertyName(), typeName); if (o == null) { if (! isNullTag) out.attr(xsi, "nil", "true"); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/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 19f2382..1f46926 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 @@ -42,61 +42,61 @@ public class RoundTripAddClassAttrsTest extends RoundTripTest { return Arrays.asList(new Object[][] { { /* 0 */ "JsonSerializer.DEFAULT/JsonParser.DEFAULT", - new JsonSerializer().setProperty(SERIALIZER_addClassAttrs, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), + new JsonSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), new JsonParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), 0 }, { /* 1 */ "JsonSerializer.DEFAULT_LAX/JsonParser.DEFAULT", - new JsonSerializer.Simple().setProperty(SERIALIZER_addClassAttrs, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), + new JsonSerializer.Simple().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), new JsonParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), 0 }, { /* 2 */ "JsonSerializer.DEFAULT_SQ/JsonParser.DEFAULT", - new JsonSerializer.Simple().setProperty(SERIALIZER_addClassAttrs, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), + new JsonSerializer.Simple().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), new JsonParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), 0 }, { /* 3 */ "XmlSerializer.DEFAULT/XmlParser.DEFAULT", - new XmlSerializer.XmlJson().setProperty(SERIALIZER_addClassAttrs, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), + new XmlSerializer.XmlJson().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), new XmlParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), CHECK_XML_WHITESPACE | VALIDATE_XML }, { /* 4 */ "HtmlSerializer.DEFAULT/HtmlParser.DEFAULT", - new HtmlSerializer().setProperty(SERIALIZER_addClassAttrs, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), + new HtmlSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), new HtmlParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), CHECK_XML_WHITESPACE }, { /* 5 */ "UonSerializer.DEFAULT_ENCODING/UonParser.DEFAULT_DECODING", - new UonSerializer.Encoding().setProperty(SERIALIZER_addClassAttrs, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), + new UonSerializer.Encoding().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), new UonParser.Decoding().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), 0 }, { /* 6 */ "UonSerializer.DEFAULT/UonParser.DEFAULT", - new UonSerializer().setProperty(SERIALIZER_addClassAttrs, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), + new UonSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), new UonParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), 0 }, { /* 7 */ "UrlEncodingSerializer.DEFAULT/UrlEncodingParser.DEFAULT", - new UrlEncodingSerializer().setProperty(SERIALIZER_addClassAttrs, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), + new UrlEncodingSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), new UrlEncodingParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), 0 }, { /* 8 */ "RdfSerializer.Xml/RdfParser.Xml", - new RdfSerializer.Xml().setProperty(SERIALIZER_addClassAttrs, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), + new RdfSerializer.Xml().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), new RdfParser.Xml().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), 0 }, { /* 9 */ "MsgPackSerializer.DEFAULT/MsgPackParser.DEFAULT", - new MsgPackSerializer().setProperty(SERIALIZER_addClassAttrs, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), + new MsgPackSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), new MsgPackParser().setProperty(BEAN_useInterfaceProxies, false).setClassLoader(RoundTripAddClassAttrsTest.class.getClassLoader()), 0 } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/test/java/org/apache/juneau/html/CommonParserTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/html/CommonParserTest.java b/juneau-core/src/test/java/org/apache/juneau/html/CommonParserTest.java index 1cbc5f6..3b8df3e 100755 --- a/juneau-core/src/test/java/org/apache/juneau/html/CommonParserTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/html/CommonParserTest.java @@ -64,7 +64,7 @@ public class CommonParserTest { t2.add(new A3("name0","value0")); t2.add(new A3("name1","value1")); t1.list = t2; - in = new HtmlSerializer().setProperty(SERIALIZER_addClassAttrs, true).serialize(t1); + in = new HtmlSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).serialize(t1); t1 = (A1)p.parse(in, Object.class); assertEquals("value1", t1.list.get(1).value); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/test/java/org/apache/juneau/html/CommonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/html/CommonTest.java b/juneau-core/src/test/java/org/apache/juneau/html/CommonTest.java index e9bb96f..401a6ca 100755 --- a/juneau-core/src/test/java/org/apache/juneau/html/CommonTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/html/CommonTest.java @@ -446,7 +446,7 @@ public class CommonTest { fail("Locked exception not thrown"); } catch (LockedException e) {} try { - s.setProperty(SerializerContext.SERIALIZER_addClassAttrs, true); + s.setProperty(SerializerContext.SERIALIZER_addBeanTypeProperties, true); fail("Locked exception not thrown"); } catch (LockedException e) {} try { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/test/java/org/apache/juneau/jena/CommonParserTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/jena/CommonParserTest.java b/juneau-core/src/test/java/org/apache/juneau/jena/CommonParserTest.java index 2a364c0..2a4fc15 100755 --- a/juneau-core/src/test/java/org/apache/juneau/jena/CommonParserTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/jena/CommonParserTest.java @@ -110,7 +110,7 @@ public class CommonParserTest { t2.add(new A3("name1","value1")); t1.list = t2; - s.setProperty(SERIALIZER_addClassAttrs, true); + s.setProperty(SERIALIZER_addBeanTypeProperties, true); in = strip(s.serialize(t1)); assertEquals("<rdf:Description><j:class>"+A1.class.getName()+"</j:class><jp:list><rdf:Seq><rdf:li rdf:parseType='Resource'><jp:name>name0</jp:name><jp:value>value0</jp:value></rdf:li><rdf:li rdf:parseType='Resource'><jp:name>name1</jp:name><jp:value>value1</jp:value></rdf:li></rdf:Seq></jp:list></rdf:Description>", in); in = wrap(in); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/test/java/org/apache/juneau/jena/CommonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/jena/CommonTest.java b/juneau-core/src/test/java/org/apache/juneau/jena/CommonTest.java index 2417d45..e648ac1 100755 --- a/juneau-core/src/test/java/org/apache/juneau/jena/CommonTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/jena/CommonTest.java @@ -433,7 +433,7 @@ public class CommonTest { fail("Locked exception not thrown"); } catch (LockedException e) {} try { - s.setProperty(SerializerContext.SERIALIZER_addClassAttrs, true); + s.setProperty(SerializerContext.SERIALIZER_addBeanTypeProperties, true); fail("Locked exception not thrown"); } catch (LockedException e) {} try { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/test/java/org/apache/juneau/json/CommonParserTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/json/CommonParserTest.java b/juneau-core/src/test/java/org/apache/juneau/json/CommonParserTest.java index 6bad521..f9fe1f0 100755 --- a/juneau-core/src/test/java/org/apache/juneau/json/CommonParserTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/json/CommonParserTest.java @@ -84,7 +84,7 @@ public class CommonParserTest { tl.add(new A3("name0","value0")); tl.add(new A3("name1","value1")); b.list = tl; - String json = new JsonSerializer().setProperty(SERIALIZER_addClassAttrs, true).serialize(b); + String json = new JsonSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).serialize(b); b = (A1)p.parse(json, Object.class); assertEquals("value1", b.list.get(1).value); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/test/java/org/apache/juneau/json/CommonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/json/CommonTest.java b/juneau-core/src/test/java/org/apache/juneau/json/CommonTest.java index 7553747..9a7c4ae 100755 --- a/juneau-core/src/test/java/org/apache/juneau/json/CommonTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/json/CommonTest.java @@ -385,7 +385,7 @@ public class CommonTest { fail("Locked exception not thrown"); } catch (LockedException e) {} try { - s.setProperty(SerializerContext.SERIALIZER_addClassAttrs, true); + s.setProperty(SerializerContext.SERIALIZER_addBeanTypeProperties, true); fail("Locked exception not thrown"); } catch (LockedException e) {} try { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java b/juneau-core/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java index 6e26255..bac9a2c 100755 --- a/juneau-core/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java @@ -70,7 +70,7 @@ public class CommonParser_UonTest { tl.add(new A3("name1","value1")); b.list = tl; - in = new UonSerializer().setProperty(SERIALIZER_addClassAttrs, true).serialize(b); + in = new UonSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).serialize(b); b = (A1)p.parse(in, Object.class); assertEquals("value1", b.list.get(1).value); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java b/juneau-core/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java index 5e5f992..d33854a 100755 --- a/juneau-core/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java @@ -72,7 +72,7 @@ public class CommonParser_UrlEncodingTest { tl.add(new A3("name1","value1")); b.list = tl; - in = new UrlEncodingSerializer().setProperty(SERIALIZER_addClassAttrs, true).serialize(b); + in = new UrlEncodingSerializer().setProperty(SERIALIZER_addBeanTypeProperties, true).serialize(b); b = (A1)p.parse(in, Object.class); assertEquals("value1", b.list.get(1).value); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java b/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java index 24606e1..a3cb6dd 100755 --- a/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java @@ -386,7 +386,7 @@ public class Common_UonTest { fail("Locked exception not thrown"); } catch (LockedException e) {} try { - s.setProperty(SerializerContext.SERIALIZER_addClassAttrs, true); + s.setProperty(SerializerContext.SERIALIZER_addBeanTypeProperties, true); fail("Locked exception not thrown"); } catch (LockedException e) {} try { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java b/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java index 088bc15..c276c53 100755 --- a/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java @@ -378,7 +378,7 @@ public class Common_UrlEncodingTest { fail("Locked exception not thrown"); } catch (LockedException e) {} try { - s.setProperty(SerializerContext.SERIALIZER_addClassAttrs, true); + s.setProperty(SerializerContext.SERIALIZER_addBeanTypeProperties, true); fail("Locked exception not thrown"); } catch (LockedException e) {} try { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/test/java/org/apache/juneau/utils/PojoRestTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/utils/PojoRestTest.java b/juneau-core/src/test/java/org/apache/juneau/utils/PojoRestTest.java index 24e891c..5addefc 100755 --- a/juneau-core/src/test/java/org/apache/juneau/utils/PojoRestTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/utils/PojoRestTest.java @@ -82,7 +82,7 @@ public class PojoRestTest { Address a3 = (Address)model.get("/person1/addresses/1"); assertEquals("city B", a3.city); - serializer = new JsonSerializer.Simple().setProperty(SERIALIZER_addClassAttrs, true); + serializer = new JsonSerializer.Simple().setProperty(SERIALIZER_addBeanTypeProperties, true); p = new Person("some name", 123, new Address("street A", "city A", "state A", 12345, true), new Address("street B", "city B", "state B", 12345, false) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/864893f2/juneau-core/src/test/java/org/apache/juneau/xml/CommonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/xml/CommonTest.java b/juneau-core/src/test/java/org/apache/juneau/xml/CommonTest.java index 5553d0f..491d67d 100755 --- a/juneau-core/src/test/java/org/apache/juneau/xml/CommonTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/xml/CommonTest.java @@ -387,7 +387,7 @@ public class CommonTest { fail("Locked exception not thrown"); } catch (LockedException e) {} try { - s.setProperty(SerializerContext.SERIALIZER_addClassAttrs, true); + s.setProperty(SerializerContext.SERIALIZER_addBeanTypeProperties, true); fail("Locked exception not thrown"); } catch (LockedException e) {} try {
