Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Naturalize's suggestions #468

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Naturalize's suggestions #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb05fb4
Renamed "inputList" (1,53%) to "list" (44,22%).
condda Jul 2, 2015
518626f
Renamed "writer" (3,15%) to "result" (66,34%).
condda Jul 2, 2015
a48eee8
Renamed "binder" (2,26%) to "mapper" (86,57%).
condda Jul 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...n/java/org/springside/examples/showcase/demos/utilities/string/ApacheStringUtilsDemo.java
View file
Open in desktop
Expand Up @@ -56,8 +56,8 @@ public void substring() {
@Test
public void joinSplit() {
// join
List<String> inputList = Lists.newArrayList("a", "b", "c");
String result = StringUtils.join(inputList, ",");
List<String> list = Lists.newArrayList("a", "b", "c");
String result = StringUtils.join(list, ",");
assertThat(result).isEqualTo("a,b,c");

// split
Expand Down
12 changes: 6 additions & 6 deletions modules/core/src/main/java/org/springside/modules/mapper/JaxbMapper.java
View file
Open in desktop
Expand Up @@ -57,9 +57,9 @@ public static String toXml(Object root, String encoding) {
*/
public static String toXml(Object root, Class clazz, String encoding) {
try {
StringWriter writer = new StringWriter();
createMarshaller(clazz, encoding).marshal(root, writer);
return writer.toString();
StringWriter result = new StringWriter();
createMarshaller(clazz, encoding).marshal(root, result);
return result.toString();
} catch (JAXBException e) {
throw Exceptions.unchecked(e);
}
Expand All @@ -83,10 +83,10 @@ public static String toXml(Collection<?> root, String rootName, Class clazz, Str
JAXBElement<CollectionWrapper> wrapperElement = new JAXBElement<CollectionWrapper>(new QName(rootName),
CollectionWrapper.class, wrapper);

StringWriter writer = new StringWriter();
createMarshaller(clazz, encoding).marshal(wrapperElement, writer);
StringWriter result = new StringWriter();
createMarshaller(clazz, encoding).marshal(wrapperElement, result);

return writer.toString();
return result.toString();
} catch (JAXBException e) {
throw Exceptions.unchecked(e);
}
Expand Down
34 changes: 17 additions & 17 deletions modules/core/src/test/java/org/springside/modules/mapper/JsonMapperTest.java
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@
*/
public class JsonMapperTest {

private static JsonMapper binder = JsonMapper.nonDefaultMapper();
private static JsonMapper mapper = JsonMapper.nonDefaultMapper();

/**
* 序列化对象/集合到Json字符串.
Expand All @@ -35,33 +35,33 @@ public class JsonMapperTest {
public void toJson() throws Exception {
// Bean
TestBean bean = new TestBean("A");
String beanString = binder.toJson(bean);
String beanString = mapper.toJson(bean);
System.out.println("Bean:" + beanString);
assertThat(beanString).isEqualTo("{\"name\":\"A\"}");

// Map
Map<String, Object> map = Maps.newLinkedHashMap();
map.put("name", "A");
map.put("age", 2);
String mapString = binder.toJson(map);
String mapString = mapper.toJson(map);
System.out.println("Map:" + mapString);
assertThat(mapString).isEqualTo("{\"name\":\"A\",\"age\":2}");

// List<String>
List<String> stringList = Lists.newArrayList("A", "B", "C");
String listString = binder.toJson(stringList);
String listString = mapper.toJson(stringList);
System.out.println("String List:" + listString);
assertThat(listString).isEqualTo("[\"A\",\"B\",\"C\"]");

// List<Bean>
List<TestBean> beanList = Lists.newArrayList(new TestBean("A"), new TestBean("B"));
String beanListString = binder.toJson(beanList);
String beanListString = mapper.toJson(beanList);
System.out.println("Bean List:" + beanListString);
assertThat(beanListString).isEqualTo("[{\"name\":\"A\"},{\"name\":\"B\"}]");

// Bean[]
TestBean[] beanArray = new TestBean[] { new TestBean("A"), new TestBean("B") };
String beanArrayString = binder.toJson(beanArray);
String beanArrayString = mapper.toJson(beanArray);
System.out.println("Array List:" + beanArrayString);
assertThat(beanArrayString).isEqualTo("[{\"name\":\"A\"},{\"name\":\"B\"}]");
}
Expand All @@ -73,28 +73,28 @@ public void toJson() throws Exception {
public void fromJson() throws Exception {
// Bean
String beanString = "{\"name\":\"A\"}";
TestBean bean = binder.fromJson(beanString, TestBean.class);
TestBean bean = mapper.fromJson(beanString, TestBean.class);
System.out.println("Bean:" + bean);

// Map
String mapString = "{\"name\":\"A\",\"age\":2}";
Map<String, Object> map = binder.fromJson(mapString, HashMap.class);
Map<String, Object> map = mapper.fromJson(mapString, HashMap.class);
System.out.println("Map:");
for (Entry<String, Object> entry : map.entrySet()) {
System.out.println(entry.getKey() + " " + entry.getValue());
}

// List<String>
String listString = "[\"A\",\"B\",\"C\"]";
List<String> stringList = binder.getMapper().readValue(listString, List.class);
List<String> stringList = mapper.getMapper().readValue(listString, List.class);
System.out.println("String List:");
for (String element : stringList) {
System.out.println(element);
}

// List<Bean>
String beanListString = "[{\"name\":\"A\"},{\"name\":\"B\"}]";
List<TestBean> beanList = binder.getMapper().readValue(beanListString, new TypeReference<List<TestBean>>() {
List<TestBean> beanList = mapper.getMapper().readValue(beanListString, new TypeReference<List<TestBean>>() {
});
System.out.println("Bean List:");
for (TestBean element : beanList) {
Expand All @@ -111,31 +111,31 @@ public void nullAndEmpty() {

// Null Bean
TestBean nullBean = null;
String nullBeanString = binder.toJson(nullBean);
String nullBeanString = mapper.toJson(nullBean);
assertThat(nullBeanString).isEqualTo("null");

// Empty List
List<String> emptyList = Lists.newArrayList();
String emptyListString = binder.toJson(emptyList);
String emptyListString = mapper.toJson(emptyList);
assertThat(emptyListString).isEqualTo("[]");

// fromJson测试 //

// Null String for Bean
TestBean nullBeanResult = binder.fromJson(null, TestBean.class);
TestBean nullBeanResult = mapper.fromJson(null, TestBean.class);
assertThat(nullBeanResult).isNull();

nullBeanResult = binder.fromJson("null", TestBean.class);
nullBeanResult = mapper.fromJson("null", TestBean.class);
assertThat(nullBeanResult).isNull();

// Null/Empty String for List
List nullListResult = binder.fromJson(null, List.class);
List nullListResult = mapper.fromJson(null, List.class);
assertThat(nullListResult).isNull();

nullListResult = binder.fromJson("null", List.class);
nullListResult = mapper.fromJson("null", List.class);
assertThat(nullListResult).isNull();

nullListResult = binder.fromJson("[]", List.class);
nullListResult = mapper.fromJson("[]", List.class);
assertThat(nullListResult).isEmpty();
}

Expand Down