diff --git a/examples/boot-api/src/main/java/org/springside/examples/bootapi/api/BookEndpoint.java b/examples/boot-api/src/main/java/org/springside/examples/bootapi/api/BookEndpoint.java index cfb6bf97..0b94e35f 100644 --- a/examples/boot-api/src/main/java/org/springside/examples/bootapi/api/BookEndpoint.java +++ b/examples/boot-api/src/main/java/org/springside/examples/bootapi/api/BookEndpoint.java @@ -20,7 +20,7 @@ import org.springside.examples.bootapi.service.BookAdminService; import org.springside.examples.bootapi.service.BookBorrowService; import org.springside.examples.bootapi.service.exception.ErrorCode; import org.springside.examples.bootapi.service.exception.ServiceException; -import org.springside.modules.utils.reflect.BeanMapper; +import org.springside.modules.utils.mapper.BeanMapper; import org.springside.modules.web.MediaTypes; // Spring Restful MVC Controller的标识, 直接输出内容，不调用template引擎. diff --git a/examples/boot-api/src/main/java/org/springside/examples/bootapi/api/support/CustomExceptionHandler.java b/examples/boot-api/src/main/java/org/springside/examples/bootapi/api/support/CustomExceptionHandler.java index 829cd874..cdddf8b0 100644 --- a/examples/boot-api/src/main/java/org/springside/examples/bootapi/api/support/CustomExceptionHandler.java +++ b/examples/boot-api/src/main/java/org/springside/examples/bootapi/api/support/CustomExceptionHandler.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.request.WebRequest; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; import org.springside.examples.bootapi.service.exception.ServiceException; -import org.springside.modules.utils.text.JsonMapper; +import org.springside.modules.utils.mapper.JsonMapper; import org.springside.modules.web.MediaTypes; import com.google.common.collect.Maps; diff --git a/examples/boot-api/src/main/java/org/springside/examples/bootapi/api/support/ErrorPageController.java b/examples/boot-api/src/main/java/org/springside/examples/bootapi/api/support/ErrorPageController.java index 7f50e631..97184551 100644 --- a/examples/boot-api/src/main/java/org/springside/examples/bootapi/api/support/ErrorPageController.java +++ b/examples/boot-api/src/main/java/org/springside/examples/bootapi/api/support/ErrorPageController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes; -import org.springside.modules.utils.text.JsonMapper; +import org.springside.modules.utils.mapper.JsonMapper; import org.springside.modules.web.MediaTypes; /** diff --git a/examples/boot-api/src/test/java/org/springside/examples/bootapi/functional/BookEndpointTest.java b/examples/boot-api/src/test/java/org/springside/examples/bootapi/functional/BookEndpointTest.java index aa84e790..fe8fe81f 100644 --- a/examples/boot-api/src/test/java/org/springside/examples/bootapi/functional/BookEndpointTest.java +++ b/examples/boot-api/src/test/java/org/springside/examples/bootapi/functional/BookEndpointTest.java @@ -33,7 +33,7 @@ import org.springside.examples.bootapi.dto.BookDto; import org.springside.examples.bootapi.repository.BookDao; import org.springside.examples.bootapi.service.exception.ErrorCode; import org.springside.modules.test.data.RandomData; -import org.springside.modules.utils.text.JsonMapper; +import org.springside.modules.utils.mapper.JsonMapper; import com.google.common.collect.Maps; diff --git a/modules/core/pom.xml b/modules/core/pom.xml index b5c59329..2b6c5902 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -94,18 +94,6 @@ test - - dom4j - dom4j - 1.6.1 - test - - - jaxen - jaxen - 1.1.6 - test - diff --git a/modules/utils/pom.xml b/modules/utils/pom.xml index 20d31572..d948fdaa 100644 --- a/modules/utils/pom.xml +++ b/modules/utils/pom.xml @@ -118,6 +118,22 @@ ${logback.version} test + + + + dom4j + dom4j + 1.6.1 + test + + + + jaxen + jaxen + 1.1.6 + test + + diff --git a/modules/utils/src/main/java/org/springside/modules/utils/reflect/BeanMapper.java b/modules/utils/src/main/java/org/springside/modules/utils/mapper/BeanMapper.java similarity index 98% rename from modules/utils/src/main/java/org/springside/modules/utils/reflect/BeanMapper.java rename to modules/utils/src/main/java/org/springside/modules/utils/mapper/BeanMapper.java index 44b0db13..20176a14 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/reflect/BeanMapper.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/mapper/BeanMapper.java @@ -3,7 +3,7 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils.reflect; +package org.springside.modules.utils.mapper; import java.util.List; diff --git a/modules/utils/src/main/java/org/springside/modules/utils/text/JsonMapper.java b/modules/utils/src/main/java/org/springside/modules/utils/mapper/JsonMapper.java similarity index 99% rename from modules/utils/src/main/java/org/springside/modules/utils/text/JsonMapper.java rename to modules/utils/src/main/java/org/springside/modules/utils/mapper/JsonMapper.java index 766f0314..6ddd95ce 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/text/JsonMapper.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/mapper/JsonMapper.java @@ -3,7 +3,7 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils.text; +package org.springside.modules.utils.mapper; import java.io.IOException; import java.util.Collection; diff --git a/modules/core/src/main/java/org/springside/modules/web/JaxbMapper.java b/modules/utils/src/main/java/org/springside/modules/utils/mapper/XmlMapper.java similarity index 98% rename from modules/core/src/main/java/org/springside/modules/web/JaxbMapper.java rename to modules/utils/src/main/java/org/springside/modules/utils/mapper/XmlMapper.java index e8085135..b0e3dff5 100644 --- a/modules/core/src/main/java/org/springside/modules/web/JaxbMapper.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/mapper/XmlMapper.java @@ -3,7 +3,7 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.web; +package org.springside.modules.utils.mapper; import java.io.StringReader; import java.io.StringWriter; @@ -32,7 +32,7 @@ import org.springside.modules.utils.reflect.ClassUtil; * * @author calvin */ -public class JaxbMapper { +public class XmlMapper { private static ConcurrentMap jaxbContexts = new ConcurrentHashMap(); diff --git a/modules/utils/src/test/java/org/springside/modules/utils/reflect/BeanMapperTest.java b/modules/utils/src/test/java/org/springside/modules/utils/mapper/BeanMapperTest.java similarity index 98% rename from modules/utils/src/test/java/org/springside/modules/utils/reflect/BeanMapperTest.java rename to modules/utils/src/test/java/org/springside/modules/utils/mapper/BeanMapperTest.java index de72f41a..b3d80ea2 100644 --- a/modules/utils/src/test/java/org/springside/modules/utils/reflect/BeanMapperTest.java +++ b/modules/utils/src/test/java/org/springside/modules/utils/mapper/BeanMapperTest.java @@ -1,4 +1,4 @@ -package org.springside.modules.utils.reflect; +package org.springside.modules.utils.mapper; import static org.assertj.core.api.Assertions.*; @@ -6,6 +6,7 @@ import java.util.List; import org.junit.Test; import org.springside.modules.utils.collection.ListUtil; +import org.springside.modules.utils.mapper.BeanMapper; import ma.glasnost.orika.metadata.Type; diff --git a/modules/utils/src/test/java/org/springside/modules/utils/text/JsonMapperTest.java b/modules/utils/src/test/java/org/springside/modules/utils/mapper/JsonMapperTest.java similarity index 97% rename from modules/utils/src/test/java/org/springside/modules/utils/text/JsonMapperTest.java rename to modules/utils/src/test/java/org/springside/modules/utils/mapper/JsonMapperTest.java index fb008744..c03bc545 100644 --- a/modules/utils/src/test/java/org/springside/modules/utils/text/JsonMapperTest.java +++ b/modules/utils/src/test/java/org/springside/modules/utils/mapper/JsonMapperTest.java @@ -3,7 +3,7 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.utils.text; +package org.springside.modules.utils.mapper; import static org.assertj.core.api.Assertions.*; @@ -14,6 +14,7 @@ import java.util.Map; import java.util.Map.Entry; import org.junit.Test; +import org.springside.modules.utils.mapper.JsonMapper; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -172,7 +173,7 @@ public class JsonMapperTest { public void update() { TestBean bean = new TestBean("A"); bean.setDefaultValue("lalala"); - JsonMapper.INSTANCE.update("{\"name\":\"B\"", bean); + JsonMapper.INSTANCE.update("{\"name\":\"B\"}", bean); assertThat(bean.getName()).isEqualTo("B"); assertThat(bean.getDefaultValue()).isEqualTo("lalala"); } diff --git a/modules/core/src/test/java/org/springside/modules/mapper/JaxbMapperTest.java b/modules/utils/src/test/java/org/springside/modules/utils/mapper/XmlMapperTest.java similarity index 93% rename from modules/core/src/test/java/org/springside/modules/mapper/JaxbMapperTest.java rename to modules/utils/src/test/java/org/springside/modules/utils/mapper/XmlMapperTest.java index f8afbbe0..d64f885a 100644 --- a/modules/core/src/test/java/org/springside/modules/mapper/JaxbMapperTest.java +++ b/modules/utils/src/test/java/org/springside/modules/utils/mapper/XmlMapperTest.java @@ -3,7 +3,7 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); *******************************************************************************/ -package org.springside.modules.mapper; +package org.springside.modules.utils.mapper; import static org.assertj.core.api.Assertions.*; @@ -22,7 +22,7 @@ import org.dom4j.DocumentException; import org.dom4j.DocumentHelper; import org.dom4j.Element; import org.junit.Test; -import org.springside.modules.web.JaxbMapper; +import org.springside.modules.utils.mapper.XmlMapper; import com.google.common.collect.Lists; @@ -42,7 +42,7 @@ import com.google.common.collect.Lists; * * */ -public class JaxbMapperTest { +public class XmlMapperTest { @Test public void objectToXml() { @@ -53,7 +53,7 @@ public class JaxbMapperTest { user.getInterests().add("movie"); user.getInterests().add("sports"); - String xml = JaxbMapper.toXml(user, "UTF-8"); + String xml = XmlMapper.toXml(user, "UTF-8"); System.out.println("Jaxb Object to Xml result:\n" + xml); assertXmlByDom4j(xml); } @@ -61,7 +61,7 @@ public class JaxbMapperTest { @Test public void xmlToObject() { String xml = generateXmlByDom4j(); - User user = JaxbMapper.fromXml(xml, User.class); + User user = XmlMapper.fromXml(xml, User.class); System.out.println("Jaxb Xml to Object result:\n" + user); @@ -84,7 +84,7 @@ public class JaxbMapperTest { List userList = Lists.newArrayList(user1, user2); - String xml = JaxbMapper.toXml(userList, "userList", User.class, "UTF-8"); + String xml = XmlMapper.toXml(userList, "userList", User.class, "UTF-8"); System.out.println("Jaxb Object List to Xml result:\n" + xml); }