From ee57e381b04037e961b1b7a3b7956c5a252b5da8 Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 10 Mar 2023 13:19:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BXmlUtil.xmlToBean=EF=BC=8C?= =?UTF-8?q?=E6=94=AF=E6=8C=81xml=E8=BD=ACbean=E6=97=B6=E7=88=B6=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=BF=BD=E7=95=A5=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +- .../java/cn/hutool/core/util/XmlUtil.java | 5 +- .../java/cn/hutool/core/util/XmlUtilTest.java | 103 +++++++++++------- 3 files changed, 66 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 528e5efe8..bc7f05d11 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,11 @@ # 🚀Changelog ------------------------------------------------------------------------------------------------------------- -# 5.8.16.M1 (2023-03-09) +# 5.8.16.M1 (2023-03-10) ### 🐣新特性 * 【core 】 改进Calculator.conversion，兼容乘法符号省略写法（issue#2964@Github） +* 【core 】 改进XmlUtil.xmlToBean，支持xml转bean时父节点忽略大小写 ### 🐞Bug修复 * 【crypto】 修复NoSuchMethodError未捕获问题（issue#2966@Github） diff --git a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java index 692274005..0d1d04bfd 100755 --- a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java @@ -982,9 +982,10 @@ public class XmlUtil { final Map map = xmlToMap(node); if (null != map && map.size() == 1) { final String simpleName = bean.getSimpleName(); - if (map.containsKey(simpleName)) { + final String nodeName = CollUtil.getFirst(map.keySet()); + if (simpleName.equalsIgnoreCase(nodeName)) { // 只有key和bean的名称匹配时才做单一对象转换 - return BeanUtil.toBean(map.get(simpleName), bean); + return BeanUtil.toBean(map.get(nodeName), bean); } } return BeanUtil.toBean(map, bean); diff --git a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java index c0609fcf6..294897097 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java @@ -30,7 +30,7 @@ public class XmlUtilTest { @Test public void parseTest() { - String result = ""// + final String result = ""// + ""// + "Success"// + "ok"// @@ -38,15 +38,15 @@ public class XmlUtilTest { + "885"// + "1"// + ""; - Document docResult = XmlUtil.parseXml(result); - String elementText = XmlUtil.elementText(docResult.getDocumentElement(), "returnstatus"); + final Document docResult = XmlUtil.parseXml(result); + final String elementText = XmlUtil.elementText(docResult.getDocumentElement(), "returnstatus"); Assert.assertEquals("Success", elementText); } @Test @Ignore public void writeTest() { - String result = ""// + final String result = ""// + ""// + "Success（成功）"// + "ok"// @@ -54,13 +54,13 @@ public class XmlUtilTest { + "885"// + "1"// + ""; - Document docResult = XmlUtil.parseXml(result); + final Document docResult = XmlUtil.parseXml(result); XmlUtil.toFile(docResult, "e:/aaa.xml", "utf-8"); } @Test public void xpathTest() { - String result = ""// + final String result = ""// + ""// + "Success（成功）"// + "ok"// @@ -68,22 +68,22 @@ public class XmlUtilTest { + "885"// + "1"// + ""; - Document docResult = XmlUtil.parseXml(result); - Object value = XmlUtil.getByXPath("//returnsms/message", docResult, XPathConstants.STRING); + final Document docResult = XmlUtil.parseXml(result); + final Object value = XmlUtil.getByXPath("//returnsms/message", docResult, XPathConstants.STRING); Assert.assertEquals("ok", value); } @Test public void xpathTest2() { - String result = ResourceUtil.readUtf8Str("test.xml"); - Document docResult = XmlUtil.parseXml(result); - Object value = XmlUtil.getByXPath("//returnsms/message", docResult, XPathConstants.STRING); + final String result = ResourceUtil.readUtf8Str("test.xml"); + final Document docResult = XmlUtil.parseXml(result); + final Object value = XmlUtil.getByXPath("//returnsms/message", docResult, XPathConstants.STRING); Assert.assertEquals("ok", value); } @Test public void xmlToMapTest() { - String xml = ""// + final String xml = ""// + ""// + "Success"// + "ok"// @@ -92,7 +92,7 @@ public class XmlUtilTest { + "1"// + "subText"// + ""; - Map map = XmlUtil.xmlToMap(xml); + final Map map = XmlUtil.xmlToMap(xml); Assert.assertEquals(6, map.size()); Assert.assertEquals("Success", map.get("returnstatus")); @@ -105,8 +105,8 @@ public class XmlUtilTest { @Test public void xmlToMapTest2() { - String xml = "张三李四"; - Map map = XmlUtil.xmlToMap(xml); + final String xml = "张三李四"; + final Map map = XmlUtil.xmlToMap(xml); Assert.assertEquals(1, map.size()); Assert.assertEquals(CollUtil.newArrayList("张三", "李四"), map.get("name")); @@ -114,12 +114,12 @@ public class XmlUtilTest { @Test public void mapToXmlTest() { - Map map = MapBuilder.create(new LinkedHashMap())// + final Map map = MapBuilder.create(new LinkedHashMap())// .put("name", "张三")// .put("age", 12)// .put("game", MapUtil.builder(new LinkedHashMap()).put("昵称", "Looly").put("level", 14).build())// .build(); - Document doc = XmlUtil.mapToXml(map, "user"); + final Document doc = XmlUtil.mapToXml(map, "user"); // Console.log(XmlUtil.toStr(doc, false)); Assert.assertEquals(""// + ""// @@ -136,11 +136,11 @@ public class XmlUtilTest { @Test public void mapToXmlTest2() { // 测试List - Map map = MapBuilder.create(new LinkedHashMap()) + final Map map = MapBuilder.create(new LinkedHashMap()) .put("Town", CollUtil.newArrayList("town1", "town2")) .build(); - Document doc = XmlUtil.mapToXml(map, "City"); + final Document doc = XmlUtil.mapToXml(map, "City"); Assert.assertEquals("" + "" + "town1" + @@ -151,7 +151,7 @@ public class XmlUtilTest { @Test public void readTest() { - Document doc = XmlUtil.readXML("test.xml"); + final Document doc = XmlUtil.readXML("test.xml"); Assert.assertNotNull(doc); } @@ -161,7 +161,7 @@ public class XmlUtilTest { "returnsms", "returnstatus", "message", "remainpoint", "taskID", "successCounts"); XmlUtil.readBySax(ResourceUtil.getStream("test.xml"), new DefaultHandler(){ @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) { + public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) { Assert.assertTrue(eles.contains(localName)); } }); @@ -170,16 +170,16 @@ public class XmlUtilTest { @Test public void mapToXmlTestWithOmitXmlDeclaration() { - Map map = MapBuilder.create(new LinkedHashMap()) + final Map map = MapBuilder.create(new LinkedHashMap()) .put("name", "ddatsh") .build(); - String xml = XmlUtil.mapToXmlStr(map, true); + final String xml = XmlUtil.mapToXmlStr(map, true); Assert.assertEquals("ddatsh", xml); } @Test public void getByPathTest() { - String xmlStr = "\n" + + final String xmlStr = "\n" + "\n" + " \n" + " \n" + @@ -188,8 +188,8 @@ public class XmlUtilTest { " \n" + "\n"; - Document document = XmlUtil.readXML(xmlStr); - Object value = XmlUtil.getByXPath( + final Document document = XmlUtil.readXML(xmlStr); + final Object value = XmlUtil.getByXPath( "//soap:Envelope/soap:Body/ns2:testResponse/return", document, XPathConstants.STRING);// Assert.assertEquals("2020/04/15 21:01:21", value); @@ -259,17 +259,17 @@ public class XmlUtilTest { } //issue#1663@Github - String xmlStr = "02"; + final String xmlStr = "02"; - Document doc = XmlUtil.parseXml(xmlStr); + final Document doc = XmlUtil.parseXml(xmlStr); // 标准方式 - Map map = XmlUtil.xmlToMap(doc.getFirstChild()); - SmsRes res = new SmsRes(); + final Map map = XmlUtil.xmlToMap(doc.getFirstChild()); + final SmsRes res = new SmsRes(); BeanUtil.fillBeanWithMap(map, res, true); // toBean方式 - SmsRes res1 = XmlUtil.xmlToBean(doc.getFirstChild(), SmsRes.class); + final SmsRes res1 = XmlUtil.xmlToBean(doc.getFirstChild(), SmsRes.class); Assert.assertEquals(res.toString(), res1.toString()); } @@ -285,22 +285,22 @@ public class XmlUtilTest { @Ignore public void formatTest(){ // https://github.com/looly/hutool/pull/1234 - Document xml = XmlUtil.createXml("NODES"); + final Document xml = XmlUtil.createXml("NODES"); xml.setXmlStandalone(true); - NodeList parentNode = xml.getElementsByTagName("NODES"); + final NodeList parentNode = xml.getElementsByTagName("NODES"); - Element parent1Node = xml.createElement("NODE"); + final Element parent1Node = xml.createElement("NODE"); - Element node1 = xml.createElement("NODENAME"); + final Element node1 = xml.createElement("NODENAME"); node1.setTextContent("走位"); - Element node2 = xml.createElement("STEP"); + final Element node2 = xml.createElement("STEP"); node2.setTextContent("1"); - Element node3 = xml.createElement("STATE"); + final Element node3 = xml.createElement("STATE"); node3.setTextContent("2"); - Element node4 = xml.createElement("TIMELIMIT"); + final Element node4 = xml.createElement("TIMELIMIT"); node4.setTextContent(""); - Element node5 = xml.createElement("STARTTIME"); + final Element node5 = xml.createElement("STARTTIME"); parent1Node.appendChild(node1); parent1Node.appendChild(node2); @@ -310,20 +310,20 @@ public class XmlUtilTest { parentNode.item(0).appendChild(parent1Node); - String format = XmlUtil.toStr(xml,"GBK",true); + final String format = XmlUtil.toStr(xml,"GBK",true); Console.log(format); } @Test public void escapeTest(){ - String a = "<>"; + final String a = "<>"; final String escape = XmlUtil.escape(a); Console.log(escape); } @Test public void getParamTest(){ - String xml = "\n" + + final String xml = "\n" + " 222222\n" + ""; @@ -331,4 +331,23 @@ public class XmlUtilTest { final String name = doc.getDocumentElement().getAttribute("name"); Assert.assertEquals("aaaa", name); } + + @Test + public void xmlStrToBeanTest(){ + final String xml = "张三20zhangsan@example.com"; + final Document document = XmlUtil.readXML(xml); + final UserInfo userInfo = XmlUtil.xmlToBean(document, UserInfo.class); + Assert.assertEquals("张三", userInfo.getName()); + Assert.assertEquals("20", userInfo.getAge()); + Assert.assertEquals("zhangsan@example.com", userInfo.getEmail()); + } + + @Data + static class UserInfo { + + private String id; + private String name; + private String age; + private String email; + } }