ResultBeanResponseProcessor: throw UnexpectedResultException when response body without expected code; fix an infinite loop bug when the ResultBean object has super class;

Author: dadiyang

README-en.md

@@ -31,7 +31,7 @@ The only thing we need to do is defining the interface.
  <dependency>
     <groupId>com.github.dadiyang</groupId>
     <artifactId>http-api-invoker</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
  </dependency>
 ```
 

README.md

@@ -16,7 +16,7 @@
 4. 若使用 Spring ，则可以使用 Autowired 自动注入接口的实现
 5. 完善的文档用例和单元测试
 6. 支持 Mock
-7. JDK6+（注：1.2.0版本之前JDK8）
+7. JDK6+（注：1.2.0版本后支持JDK6，之前的版本必须JDK8）
 
 # 技术栈
 
@@ -33,7 +33,7 @@
  <dependency>
     <groupId>com.github.dadiyang</groupId>
     <artifactId>http-api-invoker</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
  </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.dadiyang</groupId>
     <artifactId>http-api-invoker</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <packaging>jar</packaging>
     <parent>
         <groupId>org.sonatype.oss</groupId>
@@ -34,8 +34,8 @@
     </developers>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.version>4.3.5.RELEASE</spring.version>
-        <fastjson.version>1.2.54</fastjson.version>
+        <spring.version>4.3.24.RELEASE</spring.version>
+        <fastjson.version>1.2.58</fastjson.version>
         <slf4j.version>1.7.21</slf4j.version>
         <jsoup.version>1.11.2</jsoup.version>
         <jacoco.version>0.7.5.201505241946</jacoco.version>

src/main/java/com/github/dadiyang/httpinvoker/exception/UnexpectedResultException.java

@@ -0,0 +1,24 @@
+package com.github.dadiyang.httpinvoker.exception;
+
+/**
+ * Signals that a request has received an unexpected result.
+ *
+ * @author dadiyang
+ * @since 2019-07-09
+ */
+public class UnexpectedResultException extends IllegalStateException {
+    public UnexpectedResultException() {
+    }
+
+    public UnexpectedResultException(String s) {
+        super(s);
+    }
+
+    public UnexpectedResultException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public UnexpectedResultException(Throwable cause) {
+        super(cause);
+    }
+}

src/main/java/com/github/dadiyang/httpinvoker/requestor/ResultBeanResponseProcessor.java

@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.github.dadiyang.httpinvoker.annotation.ExpectedCode;
 import com.github.dadiyang.httpinvoker.annotation.HttpReq;
+import com.github.dadiyang.httpinvoker.exception.UnexpectedResultException;
 import com.github.dadiyang.httpinvoker.util.ObjectUtils;
 import com.github.dadiyang.httpinvoker.util.ParamUtils;
 import org.slf4j.Logger;
@@ -34,7 +35,7 @@ public class ResultBeanResponseProcessor implements ResponseProcessor {
     private Map<Class<?>, Boolean> isResultBeanCache = new ConcurrentHashMap<Class<?>, Boolean>();
 
     @Override
-    public Object process(HttpResponse response, Method method) {
+    public Object process(HttpResponse response, Method method) throws UnexpectedResultException {
         // 对返回值进行解析，code 为 0，则返回反序列化 data 的值，否则抛出异常
         String rs = response.getBody();
         // 以下几种情况下，无需解析响应
@@ -72,9 +73,8 @@ public Object process(HttpResponse response, Method method) {
             String uri = req != null ? req.value() : method.getName();
             // 兼容两种错误信息的写法
             String errMsg = obj.containsKey(MESSAGE) ? obj.getString(MESSAGE) : obj.getString(MSG);
-            String msg = "请求api失败, uri: " + uri + ", 错误信息: " + errMsg;
-            log.warn(msg);
-            throw new IllegalStateException(msg);
+            log.warn("请求api失败, uri: " + uri + ", 错误信息: " + errMsg);
+            throw new UnexpectedResultException(errMsg);
         }
     }
 
@@ -149,9 +149,9 @@ private Field[] getDeclaredFields(Class<?> returnType) {
         } else {
             List<Field> fields = new ArrayList<Field>();
             Class<?> type = returnType;
-            while (type != Object.class && !type.isInterface()) {
+            while (type != null && type != Object.class && !type.isInterface()) {
                 fields.addAll(Arrays.asList(type.getDeclaredFields()));
-                type = returnType.getSuperclass();
+                type = type.getSuperclass();
             }
             return fields.toArray(new Field[]{});
         }

src/main/java/com/github/dadiyang/httpinvoker/util/ParamUtils.java

@@ -27,7 +27,11 @@ public class ParamUtils {
     private static final String FORM_KEY = "formKey";
     private static final List<Class<?>> BASIC_TYPE = Arrays.asList(Byte.class, Short.class,
             Integer.class, Long.class, Float.class, Double.class, Character.class,
-            Boolean.class, String.class, Void.class);
+            Boolean.class, String.class, Void.class, Date.class);
+    /**
+     * for JDK6/7 compatibility
+     */
+    private static final List<String> BASIC_TYPE_NAME = Arrays.asList("java.time.LocalDate", "java.time.LocalDateTime");
 
     private ParamUtils() {
         throw new UnsupportedOperationException("utils should not be initialized!");
@@ -43,6 +47,10 @@ public static boolean isBasicType(Class<?> clz) {
         if (clz == null) {
             return false;
         }
+        // for JDK6/7 compatibility
+        if (BASIC_TYPE_NAME.contains(clz.getName())) {
+            return true;
+        }
         return clz.isPrimitive() || BASIC_TYPE.contains(clz);
     }
 

src/test/java/com/github/dadiyang/httpinvoker/interfaces/CityService.java

@@ -11,6 +11,7 @@
 import com.github.dadiyang.httpinvoker.requestor.Status;
 
 import java.io.InputStream;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -197,4 +198,10 @@ String upload(@Param("fileName") String fileName,
 
     @HttpReq(value = "/invalid", method = "xxx")
     void invalidMethod();
+
+    /**
+     * 测试 date 类型参数及返回值
+     */
+    @HttpReq(value = "/date", method = ReqMethod.POST)
+    Date getDate(@Param("date") Date date);
 }

src/test/java/com/github/dadiyang/httpinvoker/interfaces/CityServiceTest.java

@@ -553,4 +553,24 @@ public void getCityByComplicatedInfo() throws UnsupportedEncodingException {
         City rs = cityService.getCityByComplicatedInfo(info);
         assertEquals(city, rs);
     }
+
+    @Test
+    public void getDate() throws UnsupportedEncodingException {
+        String uri = "/city/date";
+        Map<String, Object> param = new HashMap<String, Object>();
+        Date now = new Date();
+        param.put("date", now);
+        wireMockRule.stubFor(post(urlPathEqualTo(uri))
+                .withRequestBody(equalToJson(JSON.toJSONString(param)))
+                .willReturn(aResponse().withBody(JSON.toJSONString(now))));
+        Date date = cityService.getDate(now);
+        assertEquals(date.getTime(), now.getTime());
+
+        ResultBean<Date> resultBean = new ResultBean<Date>(0, now);
+        wireMockRule.stubFor(post(urlPathEqualTo(uri))
+                .withRequestBody(equalToJson(JSON.toJSONString(param)))
+                .willReturn(aResponse().withBody(JSON.toJSONString(resultBean))));
+        date = cityServiceWithResultBeanResponseProcessor.getDate(now);
+        assertEquals(date.getTime(), now.getTime());
+    }
 }