Merge pull request #8 from reeyur/bugfix/adjust-README-and-Response

Update the README and adjust the return type of getData in the Response.
Meituan-Dianping · Sep 23, 2019 · b816e8c · b816e8c
2 parents faca723 + 25ff509
commit b816e8c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -136,7 +136,7 @@ public class DemoCase {
 ```xml
 <suite name="TestNGSample">
 <listeners>
-    <listener class-name="com.meituan.lyrebird.client.events.TestNGListener" />
+    <listener class-name="com.meituan.lyrebird.client.listeners.TestNGListener" />
 </listeners>
 <test name="Test Demo">
     <classes>
@@ -149,7 +149,7 @@ public class DemoCase {
 - 方法二：源码中直接添加
 
 ```java
-import com.meituan.lyrebird.client.events.TestNGListener;
+import com.meituan.lyrebird.client.listeners.TestNGListener;
 import com.meituan.lyrebird.client.MockData;
 ...
 

diff --git a/src/main/java/com/meituan/lyrebird/client/api/Response.java b/src/main/java/com/meituan/lyrebird/client/api/Response.java
@@ -40,21 +40,23 @@ public void setHeaders(Map<String, String> headers) {
     /**
      * 传入 jsonPath 查询服务端返回数据中的对应内容
      * 
-     * @param jsonPath refer: https://github.com/json-path/JsonPath/edit/master/README.md
-     * @return 根据 jsonPath 查询得到的返回数据
+     * @param <T>
+     * @param jsonPath   refer: https://github.com/json-path/JsonPath/edit/master/README.md
+     * @return           根据 jsonPath 查询得到的返回数据
      */
-    public Object getData(String jsonPath) {
+    public <T> T getData(String jsonPath) {
         return JsonPath.parse(data).read(jsonPath);
     }
 
     /**
      * 传入 jsonPath, type 限制查询服务端返回数据的内容类型
      * 
-     * @param jsonPath refer: https://github.com/json-path/JsonPath/edit/master/README.md
-     * @param type 限制返回数据的类型 如：Integer.class 即限制返回的数据内容要求是整型
-     * @return 根据 jsonPath 和 type类型限制 查询得到的返回数据
+     * @param <T>
+     * @param jsonPath   refer: https://github.com/json-path/JsonPath/edit/master/README.md
+     * @param type       expected return type (will try to map)
+     * @return           根据 jsonPath 查询得到的返回数据
      */
-    public Object getData(String jsonPath, Class<?> type) {
+    public <T> T getData(String jsonPath, Class<T> type) {
         return JsonPath.parse(data).read(jsonPath, type);
     }
 

diff --git a/src/test/java/com/meituan/lyrebird/test/TestFunctional.java b/src/test/java/com/meituan/lyrebird/test/TestFunctional.java
@@ -125,7 +125,7 @@ public void testFlowResponse() throws LyrebirdClientException {
 
         assertEquals(200, flow.getResponse().getCode());
         assertEquals("tester", flow.getResponse().getHeaders().get("name"));
-        assertEquals(18, flow.getResponse().getData("$.age"));
+        assertEquals(Integer.valueOf(18), flow.getResponse().getData("$.age"));
         assertEquals("15.58", flow.getResponse().getData("$.price", String.class));
     }