Mobai
/
magic-Dependency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update jsonpath to 2.2.0 #606

master
yihua.huang 2017-06-24 11:01:23 +08:00
parent 1fd9480496
commit faca38d4ec
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -83,7 +83,7 @@
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>0.8.1</version>
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

16
webmagic-core/src/main/java/us/codecraft/webmagic/selector/JsonPathSelector.java
View File

@ -1,9 +1,11 @@
package us.codecraft.webmagic.selector;
import com.alibaba.fastjson.JSON;
import com.jayway.jsonpath.JsonPath;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* JsonPath selector.<br>
@ -32,12 +34,20 @@ public class JsonPathSelector implements Selector {
if (object instanceof List) {
List list = (List) object;
if (list != null && list.size() > 0) {
return list.iterator().next().toString();
return toString(list.iterator().next());
}
}
return object.toString();
}
private String toString(Object object) {
if (object instanceof Map) {
return JSON.toJSONString(object);
} else {
return String.valueOf(object);
}
}
@Override
public List<String> selectList(String text) {
List<String> list = new ArrayList<String>();
@ -48,10 +58,10 @@ public class JsonPathSelector implements Selector {
if (object instanceof List) {
List<Object> items = (List<Object>) object;
for (Object item : items) {
list.add(String.valueOf(item));
list.add(toString(item));
}
} else {
list.add(String.valueOf(object));
list.add(toString(object));
}
return list;
}

1
webmagic-core/src/test/java/us/codecraft/webmagic/selector/JsonPathSelectorTest.java
View File

@ -52,4 +52,5 @@ public class JsonPathSelectorTest {
JSONObject object2=JSON.parseObject("{\"author\":\"Nigel Rees\",\"title\":\"Sayings of the Century\",\"category\":\"reference\",\"price\":8.95}");
assertThat(object1).isEqualTo(object2);
}
}