From 8e4077e06162ca23ddfcd20205dedd178ddbd3a4 Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Thu, 27 Nov 2014 07:43:34 +0800 Subject: [PATCH] =?UTF-8?q?issue=20#45=20=E7=94=9F=E6=88=90=E7=9A=84xml?= =?UTF-8?q?=E5=8E=BB=E6=8E=89<=3Fxml...=E7=9A=84=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/chanjar/weixin/cp/util/xml/XmlTransformer.java | 1 + .../chanjar/weixin/cp/bean/WxCpXmlOutImageMessageTest.java | 6 ++---- .../chanjar/weixin/cp/bean/WxCpXmlOutNewsMessageTest.java | 6 ++---- .../chanjar/weixin/cp/bean/WxCpXmlOutTextMessageTest.java | 6 ++---- .../chanjar/weixin/cp/bean/WxCpXmlOutVideoMessageTest.java | 6 ++---- .../chanjar/weixin/cp/bean/WxCpXmlOutVoiceMessageTest.java | 6 ++---- .../java/me/chanjar/weixin/mp/util/xml/XmlTransformer.java | 1 + .../chanjar/weixin/mp/bean/WxMpXmlOutImageMessageTest.java | 6 ++---- .../me/chanjar/weixin/mp/bean/WxXmlOutMusicMessageTest.java | 6 ++---- .../me/chanjar/weixin/mp/bean/WxXmlOutNewsMessageTest.java | 6 ++---- .../me/chanjar/weixin/mp/bean/WxXmlOutTextMessageTest.java | 6 ++---- .../me/chanjar/weixin/mp/bean/WxXmlOutVideoMessageTest.java | 6 ++---- .../me/chanjar/weixin/mp/bean/WxXmlOutVoiceMessageTest.java | 6 ++---- 13 files changed, 24 insertions(+), 44 deletions(-) diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XmlTransformer.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XmlTransformer.java index a1a60aeb..21bb7a77 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XmlTransformer.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XmlTransformer.java @@ -59,6 +59,7 @@ public class XmlTransformer { Marshaller m = JAXB_CONTEXT.createMarshaller(); m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); m.setProperty(CharacterEscapeHandler.class.getName(), CHAR_ESCAPE_HANDLER); + m.setProperty(Marshaller.JAXB_FRAGMENT, true); m.marshal(object, writer); } diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutImageMessageTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutImageMessageTest.java index 9f97e4b8..aef4ec45 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutImageMessageTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutImageMessageTest.java @@ -13,8 +13,7 @@ public class WxCpXmlOutImageMessageTest { m.setFromUserName("from"); m.setToUserName("to"); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" @@ -27,8 +26,7 @@ public class WxCpXmlOutImageMessageTest { public void testBuild() { WxCpXmlOutImageMessage m = WxCpXmlOutMessage.IMAGE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build(); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessageTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessageTest.java index 1fe5dfb0..7848bfcd 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessageTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessageTest.java @@ -19,8 +19,7 @@ public class WxCpXmlOutNewsMessageTest { item.setUrl("url"); m.addArticle(item); m.addArticle(item); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" @@ -58,8 +57,7 @@ public class WxCpXmlOutNewsMessageTest { .addArticle(item) .addArticle(item) .build(); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutTextMessageTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutTextMessageTest.java index 4dce4f16..75343cb4 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutTextMessageTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutTextMessageTest.java @@ -13,8 +13,7 @@ public class WxCpXmlOutTextMessageTest { m.setFromUserName("from"); m.setToUserName("to"); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" @@ -27,8 +26,7 @@ public class WxCpXmlOutTextMessageTest { public void testBuild() { WxCpXmlOutTextMessage m = WxCpXmlOutMessage.TEXT().content("content").fromUser("from").toUser("to").build(); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVideoMessageTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVideoMessageTest.java index b5ba2456..61e1cbfb 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVideoMessageTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVideoMessageTest.java @@ -15,8 +15,7 @@ public class WxCpXmlOutVideoMessageTest { m.setFromUserName("fromUser"); m.setToUserName("toUser"); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" @@ -39,8 +38,7 @@ public class WxCpXmlOutVideoMessageTest { .title("title") .description("ddfff") .build(); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVoiceMessageTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVoiceMessageTest.java index fa73a329..897f5c37 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVoiceMessageTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVoiceMessageTest.java @@ -13,8 +13,7 @@ public class WxCpXmlOutVoiceMessageTest { m.setFromUserName("from"); m.setToUserName("to"); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" @@ -27,8 +26,7 @@ public class WxCpXmlOutVoiceMessageTest { public void testBuild() { WxCpXmlOutVoiceMessage m = WxCpXmlOutMessage.VOICE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build(); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XmlTransformer.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XmlTransformer.java index 0e8c69cd..bff84eab 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XmlTransformer.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XmlTransformer.java @@ -56,6 +56,7 @@ public class XmlTransformer { Marshaller m = JAXB_CONTEXT.createMarshaller(); m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); m.setProperty(CharacterEscapeHandler.class.getName(), CHAR_ESCAPE_HANDLER); + m.setProperty(Marshaller.JAXB_FRAGMENT, true); m.marshal(object, writer); } diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxMpXmlOutImageMessageTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxMpXmlOutImageMessageTest.java index e0377cb6..f4b50e1d 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxMpXmlOutImageMessageTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxMpXmlOutImageMessageTest.java @@ -13,8 +13,7 @@ public class WxMpXmlOutImageMessageTest { m.setFromUserName("from"); m.setToUserName("to"); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" @@ -27,8 +26,7 @@ public class WxMpXmlOutImageMessageTest { public void testBuild() { WxMpMpXmlOutImageMessage m = WxMpXmlOutMessage.IMAGE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build(); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutMusicMessageTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutMusicMessageTest.java index 0471e2c3..4397a677 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutMusicMessageTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutMusicMessageTest.java @@ -17,8 +17,7 @@ public class WxXmlOutMusicMessageTest { m.setFromUserName("fromUser"); m.setToUserName("toUser"); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" @@ -45,8 +44,7 @@ public class WxXmlOutMusicMessageTest { .musicUrl("musicUrl") .thumbMediaId("thumbMediaId") .build(); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutNewsMessageTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutNewsMessageTest.java index a4a8ac5d..5e2da0b0 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutNewsMessageTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutNewsMessageTest.java @@ -19,8 +19,7 @@ public class WxXmlOutNewsMessageTest { item.setUrl("url"); m.addArticle(item); m.addArticle(item); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" @@ -58,8 +57,7 @@ public class WxXmlOutNewsMessageTest { .addArticle(item) .addArticle(item) .build(); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutTextMessageTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutTextMessageTest.java index a845abcd..2a752051 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutTextMessageTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutTextMessageTest.java @@ -13,8 +13,7 @@ public class WxXmlOutTextMessageTest { m.setFromUserName("from"); m.setToUserName("to"); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" @@ -27,8 +26,7 @@ public class WxXmlOutTextMessageTest { public void testBuild() { WxMpXmlOutTextMessage m = WxMpXmlOutMessage.TEXT().content("content").fromUser("from").toUser("to").build(); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutVideoMessageTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutVideoMessageTest.java index b033b040..19fbe62a 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutVideoMessageTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutVideoMessageTest.java @@ -15,8 +15,7 @@ public class WxXmlOutVideoMessageTest { m.setFromUserName("fromUser"); m.setToUserName("toUser"); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" @@ -39,8 +38,7 @@ public class WxXmlOutVideoMessageTest { .title("title") .description("ddfff") .build(); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutVoiceMessageTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutVoiceMessageTest.java index 65644f3d..0eb848cd 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutVoiceMessageTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutVoiceMessageTest.java @@ -13,8 +13,7 @@ public class WxXmlOutVoiceMessageTest { m.setFromUserName("from"); m.setToUserName("to"); - String expected = "" - + "" + String expected = "" + "" + "" + "1122" @@ -27,8 +26,7 @@ public class WxXmlOutVoiceMessageTest { public void testBuild() { WxMpXmlOutVoiceMessage m = WxMpXmlOutMessage.VOICE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build(); - String expected = "" - + "" + String expected = "" + "" + "" + "1122"