BodyCallAdapterFactory支持非2xx响应体转换

Author: chentianming11

README.md

@@ -42,7 +42,7 @@
 <dependency>
     <groupId>com.github.lianjiatech</groupId>
     <artifactId>retrofit-spring-boot-starter</artifactId>
-    <version>2.1.7</version>
+    <version>2.1.8</version>
 </dependency>
 ```
 

README_CN.md

@@ -41,7 +41,7 @@
 <dependency>
     <groupId>com.github.lianjiatech</groupId>
     <artifactId>retrofit-spring-boot-starter</artifactId>
-    <version>2.1.7</version>
+    <version>2.1.8</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.lianjiatech</groupId>
     <artifactId>retrofit-spring-boot-starter</artifactId>
-    <version>2.1.7</version>
+    <version>2.1.8</version>
 
     <name>retrofit-spring-boot-starter</name>
     <description>retrofit-spring-boot-starter</description>

src/main/java/com/github/lianjiatech/retrofit/spring/boot/core/BodyCallAdapterFactory.java

@@ -17,10 +17,8 @@
 
 import com.github.lianjiatech.retrofit.spring.boot.exception.RetrofitException;
 import okhttp3.Request;
-import retrofit2.Call;
-import retrofit2.CallAdapter;
-import retrofit2.Response;
-import retrofit2.Retrofit;
+import okhttp3.ResponseBody;
+import retrofit2.*;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
@@ -49,15 +47,21 @@ public final class BodyCallAdapterFactory extends CallAdapter.Factory {
         if (Response.class.isAssignableFrom(getRawType(returnType))) {
             return null;
         }
-        return new BodyCallAdapter(returnType);
+        return new BodyCallAdapter(returnType, annotations, retrofit);
     }
 
     final class BodyCallAdapter<R> implements CallAdapter<R, R> {
 
         private Type returnType;
 
-        BodyCallAdapter(Type returnType) {
+        private Retrofit retrofit;
+
+        private Annotation[] annotations;
+
+        BodyCallAdapter(Type returnType, Annotation[] annotations, Retrofit retrofit) {
             this.returnType = returnType;
+            this.retrofit = retrofit;
+            this.annotations = annotations;
         }
 
         @Override
@@ -74,7 +78,21 @@ public R adapt(Call<R> call) {
             } catch (IOException e) {
                 throw Objects.requireNonNull(RetrofitException.errorExecuting(request, e));
             }
-            return response.body();
+
+            if (response.isSuccessful()) {
+                return response.body();
+            }
+
+            ResponseBody errorBody = response.errorBody();
+            if (errorBody == null) {
+                return null;
+            }
+            Converter<ResponseBody, R> converter = retrofit.responseBodyConverter(responseType(), annotations);
+            try {
+                return converter.convert(Objects.requireNonNull(errorBody));
+            } catch (IOException e) {
+                throw Objects.requireNonNull(RetrofitException.errorExecuting(request, e));
+            }
         }
     }
 }

src/test/java/com/github/lianjiatech/retrofit/spring/boot/test/ErrorDecoderTest.java

@@ -0,0 +1,84 @@
+package com.github.lianjiatech.retrofit.spring.boot.test;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.lianjiatech.retrofit.spring.boot.test.entity.Person;
+import com.github.lianjiatech.retrofit.spring.boot.test.entity.Result;
+import com.github.lianjiatech.retrofit.spring.boot.test.http.ErrorDecoderTestApi;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author 陈添明
+ */
+@SpringBootTest(classes = RetrofitTestApplication.class)
+@RunWith(SpringRunner.class)
+public class ErrorDecoderTest {
+
+
+    private static final Logger logger = LoggerFactory.getLogger(RetrofitExceptionTest.class);
+
+    @Autowired
+    private ErrorDecoderTestApi errorDecoderTestApi;
+
+    private MockWebServer server;
+
+    private static final ObjectMapper objectMapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+            .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+
+    @Before
+    public void before() throws IOException {
+        System.out.println("=========开启MockWebServer===========");
+        server = new MockWebServer();
+        server.start(8080);
+
+    }
+
+    @After
+    public void after() throws IOException {
+        System.out.println("=========关闭MockWebServer===========");
+        server.close();
+    }
+
+
+    @Test
+    public void test() throws JsonProcessingException {
+        // mock
+        Person mockPerson = new Person().setId(1L)
+                .setName("test")
+                .setAge(10);
+
+        Result mockResult = new Result<>()
+                .setCode(0)
+                .setMsg("ok")
+                .setData(objectMapper.writeValueAsString(mockPerson));
+        MockResponse response = new MockResponse()
+                .setResponseCode(500)
+                .addHeader("Content-Type", "application/json; charset=utf-8")
+                .addHeader("Cache-Control", "no-cache")
+                .setBody(objectMapper.writeValueAsString(mockResult));
+        server.enqueue(response);
+
+        Person person = new Person().setId(1L).setName("test").setAge(10);
+        Person error = errorDecoderTestApi.error(person);
+        System.out.println(error);
+
+    }
+
+
+}

src/test/java/com/github/lianjiatech/retrofit/spring/boot/test/InvalidRespErrorDecoder.java

@@ -0,0 +1,16 @@
+package com.github.lianjiatech.retrofit.spring.boot.test;
+
+import com.github.lianjiatech.retrofit.spring.boot.core.ErrorDecoder;
+import okhttp3.Request;
+import okhttp3.Response;
+
+/**
+ * @author 陈添明
+ */
+public class InvalidRespErrorDecoder implements ErrorDecoder {
+
+    @Override
+    public RuntimeException invalidRespDecode(Request request, Response response) {
+        return null;
+    }
+}

src/test/java/com/github/lianjiatech/retrofit/spring/boot/test/http/ErrorDecoderTestApi.java

@@ -0,0 +1,24 @@
+package com.github.lianjiatech.retrofit.spring.boot.test.http;
+
+import com.github.lianjiatech.retrofit.spring.boot.annotation.RetrofitClient;
+import com.github.lianjiatech.retrofit.spring.boot.interceptor.LogStrategy;
+import com.github.lianjiatech.retrofit.spring.boot.test.InvalidRespErrorDecoder;
+import com.github.lianjiatech.retrofit.spring.boot.test.entity.Person;
+import retrofit2.http.Body;
+import retrofit2.http.POST;
+
+/**
+ * @author 陈添明
+ */
+@RetrofitClient(baseUrl = "${test.baseUrl}", logStrategy = LogStrategy.BODY, errorDecoder = InvalidRespErrorDecoder.class)
+public interface ErrorDecoderTestApi {
+
+    /**
+     * .
+     *
+     * @param person .
+     * @return .
+     */
+    @POST("error")
+    Person error(@Body Person person);
+}