Repository: incubator-juneau Updated Branches: refs/heads/master 926b7cf9a -> 87f505b38
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/87f505b3/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerContext.java index afdad46..0a5b26c 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerContext.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerContext.java @@ -40,6 +40,8 @@ import org.apache.juneau.serializer.*; */ public class XmlSerializerContext extends SerializerContext { + static final String PREFIX = "XmlSerializer."; + /** * <b>Configuration property:</b> Enable support for XML namespaces. * @@ -53,7 +55,7 @@ public class XmlSerializerContext extends SerializerContext { * <p> * If not enabled, XML output will not contain any namespaces regardless of any other settings. */ - public static final String XML_enableNamespaces = "XmlSerializer.enableNamespaces"; + public static final String XML_enableNamespaces = PREFIX + "enableNamespaces"; /** * <b>Configuration property:</b> Auto-detect namespace usage. @@ -86,7 +88,7 @@ public class XmlSerializerContext extends SerializerContext { * disabled, and that namespaces be manually defined through the {@link #XML_namespaces} property. * </ul> */ - public static final String XML_autoDetectNamespaces = "XmlSerializer.autoDetectNamespaces"; + public static final String XML_autoDetectNamespaces = PREFIX + "autoDetectNamespaces"; /** * <b>Configuration property:</b> Add namespace URLs to the root element. @@ -104,7 +106,7 @@ public class XmlSerializerContext extends SerializerContext { * <p> * This setting is ignored if {@link #XML_enableNamespaces} is not enabled. */ - public static final String XML_addNamespaceUrisToRoot = "XmlSerializer.addNamespaceUrisToRoot"; + public static final String XML_addNamespaceUrisToRoot = PREFIX + "addNamespaceUrisToRoot"; /** * <b>Configuration property:</b> Default namespace. @@ -119,7 +121,7 @@ public class XmlSerializerContext extends SerializerContext { * <p> * Specifies the default namespace URI for this document. */ - public static final String XML_defaultNamespace = "XmlSerializer.defaultNamespace"; + public static final String XML_defaultNamespace = PREFIX + "defaultNamespace"; /** * <b>Configuration property:</b> XMLSchema namespace. @@ -135,7 +137,7 @@ public class XmlSerializerContext extends SerializerContext { * Specifies the namespace for the <code>XMLSchema</code> namespace, used by the schema generated by the * {@link XmlSchemaSerializer} class. */ - public static final String XML_xsNamespace = "XmlSerializer.xsNamespace"; + public static final String XML_xsNamespace = PREFIX + "xsNamespace"; /** * <b>Configuration property:</b> Default namespaces. @@ -150,7 +152,7 @@ public class XmlSerializerContext extends SerializerContext { * <p> * The default list of namespaces associated with this serializer. */ - public static final String XML_namespaces = "XmlSerializer.namespaces.list"; + public static final String XML_namespaces = PREFIX + "namespaces.list"; /** * <b>Configuration property:</b> Add <js>"_type"</js> properties when needed. @@ -173,7 +175,7 @@ public class XmlSerializerContext extends SerializerContext { * When present, this value overrides the {@link SerializerContext#SERIALIZER_addBeanTypeProperties} setting and is * provided to customize the behavior of specific serializers in a {@link SerializerGroup}. */ - public static final String XML_addBeanTypeProperties = "XmlSerializer.addBeanTypeProperties"; + public static final String XML_addBeanTypeProperties = PREFIX + "addBeanTypeProperties"; final boolean http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/87f505b3/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlParserContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlParserContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlParserContext.java index 48b589d..c7a0c20 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlParserContext.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlParserContext.java @@ -55,7 +55,7 @@ public final class YamlParserContext extends ParserContext { @Override /* Context */ public ObjectMap asMap() { return super.asMap() - .append("JsonParserContext", new ObjectMap() + .append("YamlParserContext", new ObjectMap() ); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/87f505b3/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerContext.java index 5714d42..f847575 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerContext.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/YamlSerializerContext.java @@ -40,6 +40,8 @@ import org.apache.juneau.serializer.*; */ public final class YamlSerializerContext extends SerializerContext { + static final String PREFIX = "YamlSerializer."; + /** * <b>Configuration property:</b> Simple JSON mode. * @@ -54,7 +56,7 @@ public final class YamlSerializerContext extends SerializerContext { * If <jk>true</jk>, JSON attribute names will only be quoted when necessary. * Otherwise, they are always quoted. */ - public static final String JSON_simpleMode = "JsonSerializer.simpleMode"; + public static final String JSON_simpleMode = PREFIX + "simpleMode"; /** * <b>Configuration property:</b> Prefix solidus <js>'/'</js> characters with escapes. @@ -72,7 +74,7 @@ public final class YamlSerializerContext extends SerializerContext { * However, if you're embedding JSON in an HTML script tag, this setting prevents confusion when trying to serialize * <xt><\/script></xt>. */ - public static final String JSON_escapeSolidus = "JsonSerializer.escapeSolidus"; + public static final String JSON_escapeSolidus = PREFIX + "escapeSolidus"; /** * <b>Configuration property:</b> Add <js>"_type"</js> properties when needed. @@ -95,7 +97,7 @@ public final class YamlSerializerContext extends SerializerContext { * When present, this value overrides the {@link SerializerContext#SERIALIZER_addBeanTypeProperties} setting and is * provided to customize the behavior of specific serializers in a {@link SerializerGroup}. */ - public static final String JSON_addBeanTypeProperties = "JsonSerializer.addBeanTypeProperties"; + public static final String JSON_addBeanTypeProperties = PREFIX + "addBeanTypeProperties"; final boolean simpleMode, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/87f505b3/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParamsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParamsResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParamsResource.java index f5a11d7..794e75e 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParamsResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/ParamsResource.java @@ -12,8 +12,8 @@ // *************************************************************************************************************************** package org.apache.juneau.rest.test; -import static org.apache.juneau.internal.IOUtils.*; import static org.apache.juneau.http.HttpMethodName.*; +import static org.apache.juneau.internal.IOUtils.*; import java.io.*; import java.util.*; @@ -285,7 +285,8 @@ public class ParamsResource extends RestServletDefault { //==================================================================================================== @RestMethod(name=POST, path="/testFormPostsWithMultiParamsUsingProperty", properties={ - @Property(name=UrlEncodingContext.URLENC_expandedParams, value="true") + @Property(name=UrlEncodingSerializerContext.URLENC_expandedParams, value="true"), + @Property(name=UrlEncodingParserContext.URLENC_expandedParams, value="true") } ) public DTO2s.B testFormPostsWithMultiParamsViaProperty(@Body DTO2s.B content) throws Exception {
