Repository: incubator-juneau Updated Branches: refs/heads/master 7c785c3e1 -> 8879750c6
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8879750c/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/CharsetEncodingsResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/CharsetEncodingsResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/CharsetEncodingsResource.java index 2abb53a..e9cf51e 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/CharsetEncodingsResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/CharsetEncodingsResource.java @@ -54,8 +54,8 @@ public class CharsetEncodingsResource extends RestServlet { } @Override /* Serializer */ - protected void doSerialize(SerializerSession session, Object o) throws Exception { - session.getWriter().write(o.toString()); + protected void doSerialize(SerializerSession session, SerializerOutput out, Object o) throws Exception { + out.getWriter().write(o.toString()); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8879750c/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.java index 73544e7..2634056 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.java @@ -129,8 +129,8 @@ public class DefaultContentTypesResource extends RestServlet { } @Override /* Serializer */ - protected void doSerialize(SerializerSession session, Object output) throws Exception { - session.getWriter().write(name + "/" + output); + protected void doSerialize(SerializerSession session, SerializerOutput out, Object output) throws Exception { + out.getWriter().write(name + "/" + output); } } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8879750c/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/GroupsResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/GroupsResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/GroupsResource.java index a7a8d57..493136d 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/GroupsResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/GroupsResource.java @@ -44,8 +44,8 @@ public class GroupsResource extends RestServlet { } @Override /* Serializer */ - protected void doSerialize(SerializerSession session, Object output) throws Exception { - session.getWriter().write("text/s," + output); + protected void doSerialize(SerializerSession session, SerializerOutput out, Object output) throws Exception { + out.getWriter().write("text/s," + output); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8879750c/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InheritanceResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InheritanceResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InheritanceResource.java index 204860b..7d5af0d 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InheritanceResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InheritanceResource.java @@ -241,8 +241,8 @@ public class InheritanceResource extends RestServlet { } @Override /* Serializer */ - protected void doSerialize(SerializerSession session, Object o) throws Exception { - session.getWriter().write(o.toString()); + protected void doSerialize(SerializerSession session, SerializerOutput out, Object o) throws Exception { + out.getWriter().write(o.toString()); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8879750c/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java index 6785872..62de96b 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java @@ -60,8 +60,8 @@ public class NlsPropertyResource extends RestServlet { } @Override /* Serializer */ - protected void doSerialize(SerializerSession session, Object o) throws Exception { - session.getWriter().write(session.getProperty("TestProperty")); + protected void doSerialize(SerializerSession session, SerializerOutput out, Object o) throws Exception { + out.getWriter().write(session.getProperty("TestProperty")); } } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8879750c/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java index b5a3981..c509fc5 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java @@ -43,8 +43,8 @@ public class OnPostCallResource extends RestServlet { } @Override /* Serializer */ - protected void doSerialize(SerializerSession session, Object o) throws Exception { - session.getWriter().write("p1="+session.getProperty("p1")+",p2="+session.getProperty("p2")+",p3="+session.getProperty("p3")+",p4="+session.getProperty("p4")+",p5="+session.getProperty("p5")+",contentType="+session.getProperty("mediaType")); + protected void doSerialize(SerializerSession session, SerializerOutput out, Object o) throws Exception { + out.getWriter().write("p1="+session.getProperty("p1")+",p2="+session.getProperty("p2")+",p3="+session.getProperty("p3")+",p4="+session.getProperty("p4")+",p5="+session.getProperty("p5")+",contentType="+session.getProperty("mediaType")); } @Override /* Serializer */ public ObjectMap getResponseHeaders(ObjectMap properties) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8879750c/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java index 9ea92b6..dcb0873 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java @@ -67,8 +67,8 @@ public class PropertiesResource extends RestServletDefault { } @Override /* Serializer */ - protected void doSerialize(SerializerSession session, Object output) throws Exception { - session.getWriter().write(format("A1=%s,A2=%s,B1=%s,B2=%s,C=%s,R1a=%s,R1b=%s,R2=%s,R3=%s,R4=%s,R5=%s,R6=%s", + protected void doSerialize(SerializerSession session, SerializerOutput out, Object output) throws Exception { + out.getWriter().write(format("A1=%s,A2=%s,B1=%s,B2=%s,C=%s,R1a=%s,R1b=%s,R2=%s,R3=%s,R4=%s,R5=%s,R6=%s", session.getProperty("A1"), session.getProperty("A2"), session.getProperty("B1"), session.getProperty("B2"), session.getProperty("C"), session.getProperty("R1a"), session.getProperty("R1b"), session.getProperty("R2"), session.getProperty("R3"), session.getProperty("R4"), session.getProperty("R5"), session.getProperty("R6"))); } @@ -90,8 +90,8 @@ public class PropertiesResource extends RestServletDefault { } @Override /* Serializer */ - protected void doSerialize(SerializerSession session, Object output) throws Exception { - session.getWriter().write(format("A=%s,P=%s,H=%s", session.getProperty("A"), session.getProperty("P"), session.getProperty("h"))); + protected void doSerialize(SerializerSession session, SerializerOutput out, Object output) throws Exception { + out.getWriter().write(format("A=%s,P=%s,H=%s", session.getProperty("A"), session.getProperty("P"), session.getProperty("h"))); } } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8879750c/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java index 793c337..092c9af 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java @@ -38,8 +38,8 @@ public class SerializersResource extends RestServletDefault { } @Override /* Serializer */ - protected void doSerialize(SerializerSession session, Object o) throws Exception { - session.getWriter().write("text/a - " + o); + protected void doSerialize(SerializerSession session, SerializerOutput out, Object o) throws Exception { + out.getWriter().write("text/a - " + o); } } @@ -51,8 +51,8 @@ public class SerializersResource extends RestServletDefault { } @Override /* Serializer */ - protected void doSerialize(SerializerSession session, Object o) throws Exception { - session.getWriter().write("text/b - " + o); + protected void doSerialize(SerializerSession session, SerializerOutput out, Object o) throws Exception { + out.getWriter().write("text/b - " + o); } } @@ -88,8 +88,8 @@ public class SerializersResource extends RestServletDefault { } @Override /* Serializer */ - protected void doSerialize(SerializerSession session, Object o) throws Exception { - session.getWriter().write("text/c - " + o); + protected void doSerialize(SerializerSession session, SerializerOutput out, Object o) throws Exception { + out.getWriter().write("text/c - " + o); } } @@ -109,8 +109,8 @@ public class SerializersResource extends RestServletDefault { } @Override /* Serializer */ - protected void doSerialize(SerializerSession session, Object o) throws Exception { - session.getWriter().write("text/d - " + o); + protected void doSerialize(SerializerSession session, SerializerOutput out, Object o) throws Exception { + out.getWriter().write("text/d - " + o); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8879750c/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java b/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java index d5362e7..42e9b70 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java @@ -66,22 +66,25 @@ public class DefaultHandler implements ResponseHandler { OutputStreamSerializer s2 = (OutputStreamSerializer)s; Writer w = res.getNegotiatedWriter(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); - SerializerSession session = s.createSession(baos, p, req.getJavaMethod(), req.getLocale(), req.getHeaders().getTimeZone(), mediaType, req.getUriContext()); - s2.serialize(session, output); + SerializerOutput sout = new SerializerOutput(baos); + SerializerSession session = s.createSession(p, req.getJavaMethod(), req.getLocale(), req.getHeaders().getTimeZone(), mediaType, req.getUriContext()); + s2.serialize(session, sout, output); w.write(StringUtils.toHex(baos.toByteArray())); w.close(); } else { OutputStreamSerializer s2 = (OutputStreamSerializer)s; OutputStream os = res.getNegotiatedOutputStream(); - SerializerSession session = s.createSession(os, p, req.getJavaMethod(), req.getLocale(), req.getHeaders().getTimeZone(), mediaType, req.getUriContext()); - s2.serialize(session, output); + SerializerOutput sout = new SerializerOutput(os); + SerializerSession session = s.createSession(p, req.getJavaMethod(), req.getLocale(), req.getHeaders().getTimeZone(), mediaType, req.getUriContext()); + s2.serialize(session, sout, output); os.close(); } } else { WriterSerializer s2 = (WriterSerializer)s; Writer w = res.getNegotiatedWriter(); - SerializerSession session = s.createSession(w, p, req.getJavaMethod(), req.getLocale(), req.getHeaders().getTimeZone(), mediaType, req.getUriContext()); - s2.serialize(session, output); + SerializerOutput sout = new SerializerOutput(w); + SerializerSession session = s.createSession(p, req.getJavaMethod(), req.getLocale(), req.getHeaders().getTimeZone(), mediaType, req.getUriContext()); + s2.serialize(session, sout, output); w.close(); } } catch (SerializeException e) {
