Repository: incubator-juneau Updated Branches: refs/heads/master 2ca845c0f -> bde9b1015
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java index a059d46..32bf3d3 100644 --- a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java +++ b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerBuilder.java @@ -17,6 +17,7 @@ import static org.apache.juneau.serializer.SerializerContext.*; import java.util.*; import org.apache.juneau.*; +import org.apache.juneau.annotation.*; /** * Builder class for building instances of serializers. @@ -516,6 +517,31 @@ public class SerializerBuilder extends CoreObjectBuilder { return property(SERIALIZER_sortMaps, value); } + /** + * <b>Configuration property:</b> Abridged output. + * <p> + * <ul> + * <li><b>Name:</b> <js>"Serializer.parserKnowsRootTypes"</js> + * <li><b>Data type:</b> <code>Boolean</code> + * <li><b>Default:</b> <jk>false</jk> + * <li><b>Session-overridable:</b> <jk>true</jk> + * </ul> + * <p> + * When enabled, it is assumed that the parser knows the exact Java POJO type being parsed, + * and therefore top-level type information that might normally be included to determine + * the data type will not be serialized. + * <p> + * For example, when serializing a POJO with a {@link Bean#typeName()} value, a <js>"_type"</js> + * will be added when this setting is disabled, but not added when it is enabled. + * + * @param value The new value for this property. + * @return This object (for method chaining). + * @see SerializerContext#SERIALIZER_sortMaps + */ + public SerializerBuilder abridged(boolean value) { + return property(SERIALIZER_abridged, value); + } + @Override /* CoreObjectBuilder */ public SerializerBuilder beansRequireDefaultConstructor(boolean value) { super.beansRequireDefaultConstructor(value); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/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 fe2bb9a..a89f130 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 @@ -13,6 +13,7 @@ package org.apache.juneau.serializer; import org.apache.juneau.*; +import org.apache.juneau.annotation.*; import org.apache.juneau.internal.*; /** @@ -117,7 +118,7 @@ public class SerializerContext extends BeanContext { * <ul> * <li><b>Name:</b> <js>"Serializer.addBeanTypeProperties"</js> * <li><b>Data type:</b> <code>Boolean</code> - * <li><b>Default:</b> <jk>false</jk> + * <li><b>Default:</b> <jk>true</jk> * <li><b>Session-overridable:</b> <jk>true</jk> * </ul> * <p> @@ -313,6 +314,25 @@ public class SerializerContext extends BeanContext { */ public static final String SERIALIZER_sortMaps = "Serializer.sortMaps"; + /** + * <b>Configuration property:</b> Abridged output. + * <p> + * <ul> + * <li><b>Name:</b> <js>"Serializer.parserKnowsRootType"</js> + * <li><b>Data type:</b> <code>Boolean</code> + * <li><b>Default:</b> <jk>false</jk> + * <li><b>Session-overridable:</b> <jk>true</jk> + * </ul> + * <p> + * When enabled, it is assumed that the parser knows the exact Java POJO type being parsed, + * and therefore top-level type information that might normally be included to determine + * the data type will not be serialized. + * <p> + * For example, when serializing a POJO with a {@link Bean#typeName()} value, a <js>"_type"</js> + * will be added when this setting is disabled, but not added when it is enabled. + */ + public static final String SERIALIZER_abridged = "Serializer.abridged"; + final int maxDepth, initialDepth; final boolean @@ -325,7 +345,8 @@ public class SerializerContext extends BeanContext { trimEmptyMaps, trimStrings, sortCollections, - sortMaps; + sortMaps, + abridged; final char quoteChar; final String relativeUriBase, absolutePathUriBase; @@ -348,6 +369,7 @@ public class SerializerContext extends BeanContext { trimStrings = ps.getProperty(SERIALIZER_trimStrings, boolean.class, false); sortCollections = ps.getProperty(SERIALIZER_sortCollections, boolean.class, false); sortMaps = ps.getProperty(SERIALIZER_sortMaps, boolean.class, false); + abridged = ps.getProperty(SERIALIZER_abridged, boolean.class, false); quoteChar = ps.getProperty(SERIALIZER_quoteChar, String.class, "\"").charAt(0); relativeUriBase = resolveRelativeUriBase(ps.getProperty(SERIALIZER_relativeUriBase, String.class, "")); absolutePathUriBase = resolveAbsolutePathUriBase(ps.getProperty(SERIALIZER_absolutePathUriBase, String.class, "")); @@ -387,6 +409,7 @@ public class SerializerContext extends BeanContext { .append("trimStrings", trimStrings) .append("sortCollections", sortCollections) .append("sortMaps", sortMaps) + .append("parserKnowsRootTypes", abridged) .append("quoteChar", quoteChar) .append("relativeUriBase", relativeUriBase) .append("absolutePathUriBase", absolutePathUriBase) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java index 5521a9d..7c572d2 100644 --- a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java +++ b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java @@ -369,6 +369,17 @@ public class SerializerGroupBuilder { } /** + * Sets the {@link SerializerContext#SERIALIZER_abridged} property on all serializers in this group. + * + * @param value The new value for this property. + * @return This object (for method chaining). + * @see SerializerContext#SERIALIZER_abridged + */ + public SerializerGroupBuilder parserKnowsRootType(boolean value) { + return property(SERIALIZER_abridged, value); + } + + /** * Sets the {@link BeanContext#BEAN_beansRequireDefaultConstructor} property on all serializers in this group. * * @param value The new value for this property. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/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 2fdfd0b..498113b 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,8 @@ public class SerializerSession extends BeanSession { trimEmptyMaps, trimStrings, sortCollections, - sortMaps; + sortMaps, + abridged; private final char quoteChar; private final String relativeUriBase, absolutePathUriBase; @@ -113,6 +114,7 @@ public class SerializerSession extends BeanSession { absolutePathUriBase = ctx.absolutePathUriBase; sortCollections = ctx.sortCollections; sortMaps = ctx.sortMaps; + abridged = ctx.abridged; } else { maxDepth = op.getInt(SERIALIZER_maxDepth, ctx.maxDepth); initialDepth = op.getInt(SERIALIZER_initialDepth, ctx.initialDepth); @@ -129,6 +131,7 @@ public class SerializerSession extends BeanSession { absolutePathUriBase = op.getString(SERIALIZER_absolutePathUriBase, ctx.absolutePathUriBase); sortCollections = op.getBoolean(SERIALIZER_sortCollections, ctx.sortMaps); sortMaps = op.getBoolean(SERIALIZER_sortMaps, ctx.sortMaps); + abridged = op.getBoolean(SERIALIZER_abridged, ctx.abridged); } this.indent = initialDepth; @@ -740,4 +743,18 @@ public class SerializerSession extends BeanSession { return null; } + + /** + * Returns the parser-side expected type for the object. + * <p> + * The return value depends on the {@link SerializerContext#SERIALIZER_abridged} setting. + * When enabled, the parser already knows the Java POJO type being parsed, so there is + * no reason to add <js>"_type"</js> attributes to the root-level object. + * + * @param o The object to get the expected type on. + * @return The expected type. + */ + public ClassMeta<?> getExpectedRootType(Object o) { + return abridged ? getClassMetaForObject(o) : object(); + } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-core/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java b/juneau-core/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java index cbf8e36..5cbbac9 100644 --- a/juneau-core/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java +++ b/juneau-core/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java @@ -210,6 +210,12 @@ public class SoapXmlSerializerBuilder extends XmlSerializerBuilder { return this; } + @Override /* SerializerBuilder */ + public SoapXmlSerializerBuilder abridged(boolean value) { + super.abridged(value); + return this; + } + @Override /* CoreObjectBuilder */ public SoapXmlSerializerBuilder beansRequireDefaultConstructor(boolean value) { super.beansRequireDefaultConstructor(value); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-core/src/main/java/org/apache/juneau/uon/UonSerializer.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/uon/UonSerializer.java b/juneau-core/src/main/java/org/apache/juneau/uon/UonSerializer.java index 6ecb85d..3079ccb 100644 --- a/juneau-core/src/main/java/org/apache/juneau/uon/UonSerializer.java +++ b/juneau-core/src/main/java/org/apache/juneau/uon/UonSerializer.java @@ -381,6 +381,6 @@ public class UonSerializer extends WriterSerializer { @Override /* Serializer */ protected void doSerialize(SerializerSession session, Object o) throws Exception { UonSerializerSession s = (UonSerializerSession)session; - serializeAnything(s, s.getWriter(), o, null, "root", null); + serializeAnything(s, s.getWriter(), o, s.getExpectedRootType(o), "root", null); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-core/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java b/juneau-core/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java index 96bb20b..ae6c748 100644 --- a/juneau-core/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java +++ b/juneau-core/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java @@ -190,6 +190,13 @@ public class UonSerializerBuilder extends SerializerBuilder { super.sortMaps(value); return this; } + + @Override /* SerializerBuilder */ + public UonSerializerBuilder abridged(boolean value) { + super.abridged(value); + return this; + } + @Override /* CoreObjectBuilder */ public UonSerializerBuilder beansRequireDefaultConstructor(boolean value) { super.beansRequireDefaultConstructor(value); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java index 6ea4ed3..fbca471 100644 --- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java +++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java @@ -210,6 +210,13 @@ public class UrlEncodingSerializerBuilder extends UonSerializerBuilder { super.sortMaps(value); return this; } + + @Override /* SerializerBuilder */ + public UrlEncodingSerializerBuilder abridged(boolean value) { + super.abridged(value); + return this; + } + @Override /* CoreObjectBuilder */ public UrlEncodingSerializerBuilder beansRequireDefaultConstructor(boolean value) { super.beansRequireDefaultConstructor(value); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java index 6cdf163..d22e1bd 100644 --- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java +++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializerBuilder.java @@ -190,6 +190,12 @@ public class XmlSchemaSerializerBuilder extends XmlSerializerBuilder { return this; } + @Override /* SerializerBuilder */ + public XmlSchemaSerializerBuilder abridged(boolean value) { + super.abridged(value); + return this; + } + @Override /* CoreObjectBuilder */ public XmlSchemaSerializerBuilder beansRequireDefaultConstructor(boolean value) { super.beansRequireDefaultConstructor(value); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/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 ccb8f2a..ad04449 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 @@ -826,7 +826,7 @@ public class XmlSerializer extends WriterSerializer { XmlSerializerSession s = (XmlSerializerSession)session; if (s.isEnableNamespaces() && s.isAutoDetectNamespaces()) findNsfMappings(s, o); - serializeAnything(s, s.getWriter(), o, null, null, null, s.isEnableNamespaces() && s.isAddNamespaceUrlsToRoot(), XmlFormat.DEFAULT, false, false, null); + serializeAnything(s, s.getWriter(), o, s.getExpectedRootType(o), null, null, s.isEnableNamespaces() && s.isAddNamespaceUrlsToRoot(), XmlFormat.DEFAULT, false, false, null); } @Override /* Serializer */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java index d9f9a53..5203001 100644 --- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java +++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java @@ -337,6 +337,12 @@ public class XmlSerializerBuilder extends SerializerBuilder { return this; } + @Override /* SerializerBuilder */ + public XmlSerializerBuilder abridged(boolean value) { + super.abridged(value); + return this; + } + @Override /* CoreObjectBuilder */ public XmlSerializerBuilder beansRequireDefaultConstructor(boolean value) { super.beansRequireDefaultConstructor(value); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-core/src/main/javadoc/overview.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/overview.html b/juneau-core/src/main/javadoc/overview.html index 171b7c3..afcbb9e 100644 --- a/juneau-core/src/main/javadoc/overview.html +++ b/juneau-core/src/main/javadoc/overview.html @@ -5751,6 +5751,12 @@ </ul> <li>New {@link org.apache.juneau.annotation.Bean#typePropertyName @Bean.typePropertyName()} annotation allows you to specify the name of the <js>"_type"</js> property at the class level. + <li>New methods added to HTML5 container beans: + <ul> + <li>{@link org.apache.juneau.dto.html5.HtmlElementContainer#getChild(int...)} + <li>{@link org.apache.juneau.dto.html5.HtmlElementMixed#getChild(int...)} + </ul> + <li>New common serializer setting: {@link org.apache.juneau.serializer.SerializerContext#SERIALIZER_abridged}. </ul> <h6 class='topic'>org.apache.juneau.rest</h6> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java index 0d0f884..ff453ae 100644 --- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java +++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java @@ -48,7 +48,7 @@ public class AtomFeedResource extends ResourceJena { public void init() { try { - feed = + feed = feed("tag:juneau.sample.com,2013:1", "Juneau ATOM specification", "2013-05-08T12:29:29Z") .subtitle(text("html").text("A <em>lot</em> of effort went into making this effortless")) .links( http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java index 5be1140..a089afc 100644 --- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java +++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java @@ -66,7 +66,7 @@ public class SqlQueryResource extends Resource { public Div doGet(RestRequest req) { return div( script("text/javascript", - "\n // Quick and dirty function to allow tabs in textarea." + "\n // Quick and dirty function to allow tabs in textarea." +"\n function checkTab(e) {" +"\n if (e.keyCode == 9) {" +"\n var t = e.target;" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java index 8cb843e..d49fd09 100644 --- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java +++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java @@ -80,7 +80,7 @@ public class SystemPropertiesResource extends Resource { } @RestMethod( - name="PUT", path="/{propertyName}", + name="PUT", path="/{propertyName}", summary="Replace system property", description="Sets a new value for the specified system property.", guards=AdminGuard.class, @@ -89,12 +89,12 @@ public class SystemPropertiesResource extends Resource { @Parameter(in="body", description="The new system property value."), }, responses={ - @Response(value=302, + @Response(value=302, headers={ @Parameter(name="Location", description="The root URL of this resource.") } ), - @Response(value=403, description="User is not an admin.") + @Response(value=403, description="User is not an admin.") } ) public Redirect setSystemProperty(@Path String propertyName, @Body String value) { @@ -103,7 +103,7 @@ public class SystemPropertiesResource extends Resource { } @RestMethod( - name="POST", path="/", + name="POST", path="/", summary="Add an entire set of system properties", description="Takes in a map of key/value pairs and creates a set of new system properties.", guards=AdminGuard.class, @@ -112,12 +112,12 @@ public class SystemPropertiesResource extends Resource { @Parameter(in="body", description="The new system property values.", schema="{example:{key1:'val1',key2:123}}"), }, responses={ - @Response(value=302, + @Response(value=302, headers={ @Parameter(name="Location", description="The root URL of this resource.") } ), - @Response(value=403, description="Unauthorized: User is not an admin.") + @Response(value=403, description="Unauthorized: User is not an admin.") } ) public Redirect setSystemProperties(@Body java.util.Properties newProperties) { @@ -126,7 +126,7 @@ public class SystemPropertiesResource extends Resource { } @RestMethod( - name="DELETE", path="/{propertyName}", + name="DELETE", path="/{propertyName}", summary="Delete system property", description="Deletes the specified system property.", guards=AdminGuard.class, @@ -134,12 +134,12 @@ public class SystemPropertiesResource extends Resource { @Parameter(in="path", name="propertyName", description="The system property name."), }, responses={ - @Response(value=302, + @Response(value=302, headers={ @Parameter(name="Location", description="The root URL of this resource.") } ), - @Response(value=403, description="Unauthorized: User is not an admin") + @Response(value=403, description="Unauthorized: User is not an admin") } ) public Redirect deleteSystemProperty(@Path String propertyName) { @@ -173,7 +173,7 @@ public class SystemPropertiesResource extends Resource { } @RestMethod( - name="POST", path="/formPagePost", + name="POST", path="/formPagePost", description="Accepts a simple form post of a system property name/value pair.", guards=AdminGuard.class ) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java index b92f3c3..7c6a448 100644 --- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java +++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java @@ -47,7 +47,7 @@ public class TempDirResource extends DirectoryResource { */ @RestMethod(name="GET", path="/upload") public Form getUploadForm(RestRequest req) { - return + return form().id("form").action(req.getServletURI() + "/upload").method("POST").enctype("multipart/form-data") .children( input().name("contents").type("file"), http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/AddressBookResourceTest.java ---------------------------------------------------------------------- diff --git a/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/AddressBookResourceTest.java b/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/AddressBookResourceTest.java index 8dfa7fd..b37a4ed 100644 --- a/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/AddressBookResourceTest.java +++ b/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/AddressBookResourceTest.java @@ -77,21 +77,21 @@ public class AddressBookResourceTest extends RestTestcase { //==================================================================================================== @Test public void testBasic() throws Exception { - String in = "" - +"{" - +"\n name: \"Bill Clinton\", " - +"\n age: 66, " - +"\n birthDate: \"Aug 19, 1946\", " - +"\n addresses: [" - +"\n {" - +"\n street: \"a3\", " - +"\n city: \"b3\", " - +"\n state: \"c3\", " - +"\n zip: 3, " - +"\n isCurrent: false" - +"\n }" - +"\n ]" - +"\n}"; + String in = "" + +"{" + +"\n name: \"Bill Clinton\", " + +"\n age: 66, " + +"\n birthDate: \"Aug 19, 1946\", " + +"\n addresses: [" + +"\n {" + +"\n street: \"a3\", " + +"\n city: \"b3\", " + +"\n state: \"c3\", " + +"\n zip: 3, " + +"\n isCurrent: false" + +"\n }" + +"\n ]" + +"\n}"; JsonParser p = new JsonParserBuilder().pojoSwaps(CalendarSwap.DateMedium.class).build(); Person person = p.parse(in, Person.class); if (debug) System.err.println(person); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java ---------------------------------------------------------------------- diff --git a/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java b/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java index f7615af..b61fc53 100644 --- a/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java +++ b/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java @@ -259,11 +259,11 @@ public class TestUtils { final protected static char[] hexArray = "0123456789ABCDEF".toCharArray(); public static String toHex(byte b) { - char[] c = new char[2]; - int v = b & 0xFF; - c[0] = hexArray[v >>> 4]; - c[1] = hexArray[v & 0x0F]; - return new String(c); + char[] c = new char[2]; + int v = b & 0xFF; + c[0] = hexArray[v >>> 4]; + c[1] = hexArray[v & 0x0F]; + return new String(c); } public static void debugOut(Object o) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/AllowAllRedirects.java ---------------------------------------------------------------------- diff --git a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/AllowAllRedirects.java b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/AllowAllRedirects.java index 044e3b1..07801b8 100644 --- a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/AllowAllRedirects.java +++ b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/AllowAllRedirects.java @@ -25,8 +25,8 @@ import org.apache.http.impl.client.*; */ public class AllowAllRedirects extends DefaultRedirectStrategy { - @Override /* DefaultRedirectStrategy */ - protected boolean isRedirectable(final String method) { - return true; - } + @Override /* DefaultRedirectStrategy */ + protected boolean isRedirectable(final String method) { + return true; + } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java ---------------------------------------------------------------------- diff --git a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java index a97c540..869b922 100644 --- a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java +++ b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java @@ -973,6 +973,17 @@ public class RestClientBuilder extends CoreObjectBuilder { } /** + * Sets the {@link SerializerContext#SERIALIZER_abridged} property on all serializers in this group. + * + * @param value The new value for this property. + * @return This object (for method chaining). + * @see SerializerContext#SERIALIZER_abridged + */ + public RestClientBuilder abridged(boolean value) { + return property(SERIALIZER_abridged, value); + } + + /** * Sets the {@link ParserContext#PARSER_trimStrings} property on all parsers in this group. * * @param value The new value for this property.
