X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Fruntime%2Forg.argeo.server.json%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjson%2FJsonServerSerializer.java;h=696cdf8b63644b040504c132f29b74d582e87f92;hb=1df1bf64759d35d3d72b9d96b26b71118fdbe031;hp=3d7361396dcb65f5bbebc503060b758407f5bf21;hpb=47fcb2303b878e704fd66f6855b7f3745582eb46;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java
index 3d7361396..696cdf8b6 100644
--- a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java
+++ b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.server.json;
 
 import java.io.IOException;
@@ -43,6 +58,7 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 		objectMapper.setSerializerProvider(serializerProvider);
 	}
 
+	@SuppressWarnings("restriction")
 	public void serialize(Object obj, HttpServletRequest request,
 			HttpServletResponse response) {
 		if (asHtml)
@@ -55,7 +71,7 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 			if (asHtml)
 				response.getWriter().append("<pre>");
 
-			serialize(response.getWriter(), obj);
+			serialize(obj, response.getWriter());
 
 			if (asHtml)
 				response.getWriter().append("</pre>");
@@ -65,7 +81,7 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 		}
 	}
 
-	public void serialize(Writer writer, Object obj) {
+	public void serialize(Object obj, Writer writer) {
 		serializeAndLog(obj);
 
 		JsonGenerator jsonGenerator = null;
@@ -90,6 +106,11 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 		}
 	}
 
+	@Deprecated
+	public void serialize(Writer writer, Object obj) {
+		serialize(obj, writer);
+	}
+
 	protected void serializeAndLog(Object obj) {
 		if (!log.isTraceEnabled())
 			return;