diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/utilities/json/JsonDemo.java b/examples/showcase/src/main/java/org/springside/examples/showcase/utilities/json/JsonDemo.java
index f7abcfef..709e2e52 100644
--- a/examples/showcase/src/main/java/org/springside/examples/showcase/utilities/json/JsonDemo.java
+++ b/examples/showcase/src/main/java/org/springside/examples/showcase/utilities/json/JsonDemo.java
@@ -9,6 +9,10 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.junit.Test;
@@ -137,8 +141,8 @@ public class JsonDemo {
assertEquals("{\"name\":\"A\",\"defaultValue\":\"hello\",\"nullValue\":null}", normalMapper.toJson(bean));
//不打印nullValue属性
- JsonMapper nonNullMapper = JsonMapper.nonEmptyMapper();
- assertEquals("{\"name\":\"A\",\"defaultValue\":\"hello\"}", nonNullMapper.toJson(bean));
+ JsonMapper nonEmptyMapper = JsonMapper.nonEmptyMapper();
+ assertEquals("{\"name\":\"A\",\"defaultValue\":\"hello\"}", nonEmptyMapper.toJson(bean));
//不打印默认值未改变的nullValue与defaultValue属性
JsonMapper nonDefaultMaper = JsonMapper.nonDefaultMapper();
@@ -149,12 +153,24 @@ public class JsonDemo {
* 测试类似Jaxb的常用annotaion,如properName,ignore,propertyOrder
*/
@Test
- public void jaxbStyleAnnoation() {
+ public void jacksonAnnoation() {
TestBean2 testBean = new TestBean2(1, "foo", 18);
//结果name属性输出在前,且被改名为productName,且age属性被ignore
assertEquals("{\"productName\":\"foo\",\"id\":1}", mapper.toJson(testBean));
}
+ /*
+ * 测试直接使用Jaxb的annotaion
+ */
+ @Test
+ public void jaxbAnnoation() {
+ JsonMapper newMapper = new JsonMapper();
+ newMapper.enableJaxbAnnotation();
+ TestBean3 testBean = new TestBean3(1, "foo", 18);
+ //结果name属性输出在前,且被改名为productName,且age属性被ignore
+ assertEquals("{\"productName\":\"foo\",\"id\":1}", newMapper.toJson(testBean));
+ }
+
//调转顺序
@JsonPropertyOrder({ "name", "id" })
public static class TestBean2 {
@@ -179,6 +195,30 @@ public class JsonDemo {
}
+ //调转顺序
+ @XmlType(propOrder = { "name", "id" })
+ public static class TestBean3 {
+
+ public long id;
+
+ @XmlElement(name = "productName")
+ public String name;
+
+ @XmlTransient
+ public int age;
+
+ public TestBean3() {
+
+ }
+
+ public TestBean3(long id, String name, int age) {
+ this.id = id;
+ this.name = name;
+ this.age = age;
+ }
+
+ }
+
/**
* 更新一個已存在Bean,JSON字符串裡只含有Bean的部分屬性,只覆蓋这部分的屬性.
*/
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index e78d4df9..1f93ad3e 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -13,7 +13,6 @@
Springside :: Module :: Core
-
org.hibernate
@@ -69,6 +68,10 @@
jackson-databind
true
+
+ com.fasterxml.jackson.module
+ jackson-module-jaxb-annotations
+
net.sf.dozer
dozer
@@ -98,7 +101,6 @@
jcl-over-slf4j
true
-
org.slf4j
slf4j-log4j12
diff --git a/modules/core/src/main/java/org/springside/modules/mapper/JsonMapper.java b/modules/core/src/main/java/org/springside/modules/mapper/JsonMapper.java
index cdef7da1..9f7daf7b 100644
--- a/modules/core/src/main/java/org/springside/modules/mapper/JsonMapper.java
+++ b/modules/core/src/main/java/org/springside/modules/mapper/JsonMapper.java
@@ -18,6 +18,7 @@ import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.util.JSONPObject;
+import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
/**
* 简单封装Jackson,实现JSON String<->Java Object的Mapper.
@@ -33,13 +34,15 @@ public class JsonMapper {
private ObjectMapper mapper;
public JsonMapper() {
- this(Include.ALWAYS);
+ this(null);
}
public JsonMapper(Include include) {
mapper = new ObjectMapper();
//设置输出时包含属性的风格
- mapper.setSerializationInclusion(include);
+ if (include != null) {
+ mapper.setSerializationInclusion(include);
+ }
//设置输入时忽略在JSON字符串中存在但Java对象实际没有的属性
mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
}
@@ -152,6 +155,15 @@ public class JsonMapper {
mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
}
+ /**
+ * 支持使用Jaxb的Annotation,使得POJO上的annotation不用与Jackson耦合。
+ * 默认会先查找jaxb的annotation,如果找不到再找jackson的。
+ */
+ public void enableJaxbAnnotation() {
+ JaxbAnnotationModule module = new JaxbAnnotationModule();
+ mapper.registerModule(module);
+ }
+
/**
* 取出Mapper做进一步的设置或使用其他序列化API.
*/
diff --git a/modules/extension/pom.xml b/modules/extension/pom.xml
index 79a1a319..07497ac2 100644
--- a/modules/extension/pom.xml
+++ b/modules/extension/pom.xml
@@ -48,6 +48,11 @@
slf4j-api
true
+
+ org.slf4j
+ jcl-over-slf4j
+ true
+
org.slf4j
slf4j-log4j12
diff --git a/pom.xml b/pom.xml
index d66e28e6..0e6f5a40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -548,6 +548,11 @@
jackson-databind
${jackson.version}
+
+ com.fasterxml.jackson.module
+ jackson-module-jaxb-annotations
+ ${jackson.version}
+
com.fasterxml.jackson.jaxrs
jackson-jaxrs-json-provider