From 3ba128f6566600682fc9826fd756f2d8ff2bac75 Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Mon, 19 Jan 2015 16:46:52 +0800 Subject: [PATCH] issue #71 --- .../chanjar/weixin/common/util/xml/XStreamInitializer.java | 7 +++++++ .../mp/api/{WxBaseAPITest.java => WxMpBaseAPITest.java} | 2 +- weixin-java-mp/src/test/resources/testng.xml | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) rename weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/{WxBaseAPITest.java => WxMpBaseAPITest.java} (96%) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java index c26b64a3..163c6558 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java @@ -8,6 +8,9 @@ import com.thoughtworks.xstream.core.util.QuickWriter; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; import com.thoughtworks.xstream.io.xml.XppDriver; +import com.thoughtworks.xstream.security.NoTypePermission; +import com.thoughtworks.xstream.security.NullPermission; +import com.thoughtworks.xstream.security.PrimitiveTypePermission; import java.io.Writer; @@ -18,6 +21,7 @@ public class XStreamInitializer { public static XStream getInstance() { XStream xstream = new XStream(new XppDriver() { + @Override public HierarchicalStreamWriter createWriter(Writer out) { return new PrettyPrintWriter(out, getNameCoder()) { @@ -39,7 +43,10 @@ public class XStreamInitializer { }; } }); + xstream.ignoreUnknownElements(); xstream.setMode(XStream.NO_REFERENCES); + xstream.addPermission(NullPermission.NULL); + xstream.addPermission(PrimitiveTypePermission.PRIMITIVES); return xstream; } diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxBaseAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java similarity index 96% rename from weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxBaseAPITest.java rename to weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java index 71ca80c0..ef9590e6 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxBaseAPITest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java @@ -14,7 +14,7 @@ import org.testng.annotations.Test; */ @Test(groups = "baseAPI") @Guice(modules = ApiTestModule.class) -public class WxBaseAPITest { +public class WxMpBaseAPITest { @Inject protected WxMpServiceImpl wxService; diff --git a/weixin-java-mp/src/test/resources/testng.xml b/weixin-java-mp/src/test/resources/testng.xml index 8987f762..17308c78 100644 --- a/weixin-java-mp/src/test/resources/testng.xml +++ b/weixin-java-mp/src/test/resources/testng.xml @@ -3,7 +3,7 @@ - +