This is an automated email from the ASF dual-hosted git repository.
yasserzamani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/master by this push:
new 85812fb [WW-4989] Uses JacksonXML handler a default handler for XML
in the REST plugin (#288)
85812fb is described below
commit 85812fb9bbf1dc8358d0352157142ec3131e015b
Author: Lukasz Lenart <[email protected]>
AuthorDate: Fri Dec 14 14:58:48 2018 +0100
[WW-4989] Uses JacksonXML handler a default handler for XML in the REST
plugin (#288)
* WW-4989 Uses Jackson XML handler as a default for XML serialisation
* WW-4989 Renames class to match the same pattern for XML handler
---
.../{JacksonLibHandler.java => JacksonJsonHandler.java} | 2 +-
plugins/rest/src/main/resources/struts-plugin.xml | 4 ++--
...ksonLibHandlerTest.java => JacksonJsonHandlerTest.java} | 14 +++++++-------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JacksonLibHandler.java
b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JacksonJsonHandler.java
similarity index 97%
rename from
plugins/rest/src/main/java/org/apache/struts2/rest/handler/JacksonLibHandler.java
rename to
plugins/rest/src/main/java/org/apache/struts2/rest/handler/JacksonJsonHandler.java
index a1bcf8e..9a3c0c5 100644
---
a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JacksonLibHandler.java
+++
b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JacksonJsonHandler.java
@@ -32,7 +32,7 @@ import java.io.Writer;
/**
* Handles JSON content using jackson-lib
*/
-public class JacksonLibHandler extends AbstractContentTypeHandler {
+public class JacksonJsonHandler extends AbstractContentTypeHandler {
private static final String DEFAULT_CONTENT_TYPE = "application/json";
private String defaultEncoding = "ISO-8859-1";
diff --git a/plugins/rest/src/main/resources/struts-plugin.xml
b/plugins/rest/src/main/resources/struts-plugin.xml
index 62be4e4..1dd8d9d 100644
--- a/plugins/rest/src/main/resources/struts-plugin.xml
+++ b/plugins/rest/src/main/resources/struts-plugin.xml
@@ -30,8 +30,8 @@
<bean type="org.apache.struts2.rest.ContentTypeHandlerManager"
class="org.apache.struts2.rest.DefaultContentTypeHandlerManager" />
- <bean type="org.apache.struts2.rest.handler.ContentTypeHandler" name="xml"
class="org.apache.struts2.rest.handler.XStreamHandler" />
- <bean type="org.apache.struts2.rest.handler.ContentTypeHandler"
name="json" class="org.apache.struts2.rest.handler.JacksonLibHandler" />
+ <bean type="org.apache.struts2.rest.handler.ContentTypeHandler" name="xml"
class="org.apache.struts2.rest.handler.JacksonXmlHandler" />
+ <bean type="org.apache.struts2.rest.handler.ContentTypeHandler"
name="json" class="org.apache.struts2.rest.handler.JacksonJsonHandler" />
<bean type="org.apache.struts2.rest.handler.ContentTypeHandler"
name="html" class="org.apache.struts2.rest.handler.HtmlHandler" />
<bean type="org.apache.struts2.rest.handler.ContentTypeHandler"
name="x-www-form-urlencoded"
class="org.apache.struts2.rest.handler.FormUrlEncodedHandler" />
<bean type="org.apache.struts2.rest.handler.ContentTypeHandler"
name="multipart/form-data"
class="org.apache.struts2.rest.handler.MultipartFormDataHandler" />
diff --git
a/plugins/rest/src/test/java/org/apache/struts2/rest/handler/JacksonLibHandlerTest.java
b/plugins/rest/src/test/java/org/apache/struts2/rest/handler/JacksonJsonHandlerTest.java
similarity index 88%
rename from
plugins/rest/src/test/java/org/apache/struts2/rest/handler/JacksonLibHandlerTest.java
rename to
plugins/rest/src/test/java/org/apache/struts2/rest/handler/JacksonJsonHandlerTest.java
index 979b094..537e088 100644
---
a/plugins/rest/src/test/java/org/apache/struts2/rest/handler/JacksonLibHandlerTest.java
+++
b/plugins/rest/src/test/java/org/apache/struts2/rest/handler/JacksonJsonHandlerTest.java
@@ -28,13 +28,13 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-public class JacksonLibHandlerTest extends TestCase {
+public class JacksonJsonHandlerTest extends TestCase {
public void testFromObject() throws IOException {
Contact contact = new Contact("bob", true, 44);
StringWriter writer = new StringWriter();
- JacksonLibHandler handler = new JacksonLibHandler();
+ JacksonJsonHandler handler = new JacksonJsonHandler();
handler.fromObject(new MockActionInvocation(), contact, "success",
writer);
String data = writer.toString();
assertTrue(data.startsWith("{"));
@@ -47,7 +47,7 @@ public class JacksonLibHandlerTest extends TestCase {
Contact contact = new Contact("bob", true, 44);
StringWriter writer = new StringWriter();
- JacksonLibHandler handler = new JacksonLibHandler();
+ JacksonJsonHandler handler = new JacksonJsonHandler();
handler.fromObject(new MockActionInvocation(), Arrays.asList(contact),
"success", writer);
String data = writer.toString();
@@ -62,7 +62,7 @@ public class JacksonLibHandlerTest extends TestCase {
Contact target = new Contact();
StringReader reader = new
StringReader("{\"age\":44,\"important\":true,\"name\":\"bob\"}");
- JacksonLibHandler handler = new JacksonLibHandler();
+ JacksonJsonHandler handler = new JacksonJsonHandler();
handler.toObject(new MockActionInvocation(), reader, target);
assertEquals(contact, target);
}
@@ -75,18 +75,18 @@ public class JacksonLibHandlerTest extends TestCase {
List<Contact> target = new ArrayList<Contact>();
StringReader reader = new
StringReader("[{\"age\":44,\"important\":true,\"name\":\"bob\"},{\"age\":33,\"important\":false,\"name\":\"john\"}]");
- JacksonLibHandler handler = new JacksonLibHandler();
+ JacksonJsonHandler handler = new JacksonJsonHandler();
handler.toObject(new MockActionInvocation(), reader, target);
assertEquals(source.size(), target.size());
}
public void testContentType() throws IOException {
- JacksonLibHandler handler = new JacksonLibHandler();
+ JacksonJsonHandler handler = new JacksonJsonHandler();
assertEquals(handler.getContentType(),
"application/json;charset=ISO-8859-1");
}
public void testDefaultEncoding() throws IOException {
- JacksonLibHandler handler = new JacksonLibHandler();
+ JacksonJsonHandler handler = new JacksonJsonHandler();
handler.setDefaultEncoding("UTF-8");
assertEquals(handler.getContentType(),
"application/json;charset=UTF-8");
}
