mirror of
https://gitee.com/chinabugotech/hutool.git
synced 2025-07-21 15:09:48 +08:00
修复xml转json再转bean失败问题
This commit is contained in:
@@ -39,7 +39,7 @@ public class BeanUtilTest {
|
||||
public void isBeanTest() {
|
||||
|
||||
// HashMap不包含setXXX方法,不是bean
|
||||
final boolean isBean = BeanUtil.isBean(HashMap.class);
|
||||
final boolean isBean = BeanUtil.isWritableBean(HashMap.class);
|
||||
Assertions.assertFalse(isBean);
|
||||
}
|
||||
|
||||
|
@@ -24,15 +24,16 @@ import java.util.List;
|
||||
public class FileUtilTest {
|
||||
|
||||
@Test
|
||||
public void fileTest() {
|
||||
void fileTest1() {
|
||||
final File file = FileUtil.file("d:/aaa", "bbb");
|
||||
Assertions.assertNotNull(file);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void fileTest2() {
|
||||
Assertions.assertThrows(IllegalArgumentException.class, ()->{
|
||||
final File file = FileUtil.file("d:/aaa", "bbb");
|
||||
Assertions.assertNotNull(file);
|
||||
|
||||
// 构建目录中出现非子目录抛出异常
|
||||
FileUtil.file(file, "../ccc");
|
||||
|
||||
FileUtil.file("E:/");
|
||||
FileUtil.file("d:/aaa/bbb", "../ccc");
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -32,6 +32,7 @@ import org.xml.sax.helpers.DefaultHandler;
|
||||
|
||||
import javax.xml.xpath.XPathConstants;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
@@ -380,4 +381,29 @@ public class XmlUtilTest {
|
||||
private String age;
|
||||
private String email;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void issue3139Test() {
|
||||
final String xml = "<r>\n" +
|
||||
" <c>\n" +
|
||||
" <s>1</s>\n" +
|
||||
" <p>str</p>\n" +
|
||||
" </c>\n" +
|
||||
"</r>";
|
||||
|
||||
final R r = XmlUtil.xmlToBean(XmlUtil.parseXml(xml), R.class);
|
||||
Assertions.assertEquals("1", r.getC().get(0).getS());
|
||||
Assertions.assertEquals("str", r.getC().get(0).getP());
|
||||
}
|
||||
|
||||
@Data
|
||||
static class C {
|
||||
String s;
|
||||
String p;
|
||||
}
|
||||
|
||||
@Data
|
||||
static class R {
|
||||
List<C> c;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user