Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
<!-- Dependency versions -->
<commons-lang3.version>3.20.0</commons-lang3.version>
<fastjson.version>2.0.62</fastjson.version>
<guava.version>31.0.1-jre</guava.version>
<jackson.version>2.17.2</jackson.version>
<guava.version>33.8.0-jre</guava.version>
<jackson.version>2.18.12</jackson.version>
<junit-jupiter.version>6.1.0</junit-jupiter.version>
<lombok.version>1.18.46</lombok.version>
<okhttp.version>4.9.3</okhttp.version>
Expand Down Expand Up @@ -111,6 +111,7 @@

<!-- 项目依赖(dependencies) -->
<dependencies>
<dependency><groupId>org.junit.jupiter</groupId><artifactId>junit-jupiter</artifactId><version>${junit-jupiter.version}</version><scope>test</scope></dependency>
<!-- For Lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,6 @@ public ObjectMapper getObjectMapper() {
}

private <T> T safeInstantiate(Class<T> cls) {
try { return safeInstantiate(cls); } catch (Exception e) { return null; }
try { return cls.getDeclaredConstructor().newInstance(); } catch (ReflectiveOperationException | SecurityException e) { return null; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,9 @@ void shouldReadValueFromJson() {
}

@Test
void shouldThrowOnInvalidJsonDueToRecursiveSafeInstantiate() {
void shouldReturnDefaultResponseOnInvalidJson() {
String json = "invalid json";
assertThrows(StackOverflowError.class, () -> {
template.readValue(json, FaceppResponse.class);
});
assertNotNull(template.readValue(json, FaceppResponse.class));
}

// Test various doRequest overloads
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package com.faceplusplus.spring.boot;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.faceplusplus.spring.boot.resp.FaceppResponse;
import okhttp3.*;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
class ResponseFallbackTest {
private FaceppOkHttp3Template template(int code, String body) {
OkHttpClient client = new OkHttpClient.Builder().addInterceptor(chain -> new Response.Builder()
.request(chain.request()).protocol(Protocol.HTTP_1_1).code(code).message("test")
.body(ResponseBody.create(MediaType.parse("application/json"), body)).build()).build();
return new FaceppOkHttp3Template(client, new ObjectMapper(), new FaceppProperties());
}
@Test void invalidJsonReturnsDefaultResponse() throws Exception {
FaceppResponse result = template(200,"invalid json").get("http://localhost/test",FaceppResponse.class);
assertNotNull(result); assertEquals(200,result.getCode());
}
@Test void unsuccessfulHttpReturnsStatus() throws Exception {
FaceppResponse result = template(503,"unavailable").get("http://localhost/test",FaceppResponse.class);
assertNotNull(result); assertEquals(503,result.getCode());
}
@Test void successfulResponsePreservesFields() throws Exception {
FaceppResponse result = template(200,"{\"request_id\":\"local-test\"}").get("http://localhost/test",FaceppResponse.class);
assertEquals(200,result.getCode()); assertEquals("local-test",result.getRequestId());
}
public abstract static class AbstractResponse extends FaceppResponse {}
public static class NoDefaultResponse extends FaceppResponse { public NoDefaultResponse(String value) {} }
@Test void unconstructibleResponsesReturnNull() throws Exception {
assertNull(template(503,"bad").get("http://localhost/test",AbstractResponse.class));
assertNull(template(503,"bad").get("http://localhost/test",NoDefaultResponse.class));
assertNull(template(200,"bad").readValue("bad",AbstractResponse.class));
}
}
Loading