Skip to content

Commit ae84261

Browse files
committed
fix jackson exception import issues
1 parent df4a108 commit ae84261

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringAwsProxyTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.amazonaws.serverless.proxy.spring.echoapp.model.MapResponseModel;
1616
import com.amazonaws.serverless.proxy.spring.echoapp.model.SingleValueModel;
1717
import com.amazonaws.services.lambda.runtime.Context;
18-
import tools.jackson.core.JsonProcessingException;
18+
import tools.jackson.core.JacksonException;
1919
import tools.jackson.databind.ObjectMapper;
2020
import org.apache.commons.codec.binary.Base64;
2121
import org.junit.jupiter.api.BeforeEach;
@@ -294,7 +294,7 @@ void error_unauthenticatedCall_filterStepsRequest(String reqType) {
294294

295295
@MethodSource("data")
296296
@ParameterizedTest
297-
void responseBody_responseWriter_validBody(String reqType) throws JsonProcessingException {
297+
void responseBody_responseWriter_validBody(String reqType) throws JacksonException {
298298
initSpringAwsProxyTest(reqType);
299299
SingleValueModel singleValueModel = new SingleValueModel();
300300
singleValueModel.setValue(CUSTOM_HEADER_VALUE);
@@ -311,7 +311,7 @@ void responseBody_responseWriter_validBody(String reqType) throws JsonProcessing
311311

312312
@MethodSource("data")
313313
@ParameterizedTest
314-
void responseBody_responseWriter_validBody_UTF(String reqType) throws JsonProcessingException {
314+
void responseBody_responseWriter_validBody_UTF(String reqType) throws JacksonException {
315315
initSpringAwsProxyTest(reqType);
316316
SingleValueModel singleValueModel = new SingleValueModel();
317317
singleValueModel.setValue(UNICODE_VALUE);
@@ -363,7 +363,7 @@ void injectBody_populatedResponse_noException(String reqType) {
363363
try {
364364
SingleValueModel output = objectMapper.readValue(response.getBody(), SingleValueModel.class);
365365
assertEquals("true", output.getValue());
366-
} catch (IOException e) {
366+
} catch (JacksonException e) {
367367
e.printStackTrace();
368368
fail();
369369
}
@@ -373,7 +373,7 @@ void injectBody_populatedResponse_noException(String reqType) {
373373
try {
374374
SingleValueModel output = objectMapper.readValue(emptyResp.getBody(), SingleValueModel.class);
375375
assertNull(output.getValue());
376-
} catch (IOException e) {
376+
} catch (JacksonException e) {
377377
e.printStackTrace();
378378
fail();
379379
}
@@ -392,7 +392,7 @@ void servletRequestEncoding_acceptEncoding_okStatusCode(String reqType) {
392392
.header(HttpHeaders.ACCEPT_ENCODING, "gzip, deflate")
393393
.queryString("status", "200")
394394
.body(objectMapper.writeValueAsString(singleValueModel));
395-
} catch (JsonProcessingException e) {
395+
} catch (JacksonException e) {
396396
fail("Could not serialize object to JSON");
397397
}
398398

@@ -484,7 +484,7 @@ private void validateMapResponseModel(AwsProxyResponse output) {
484484
MapResponseModel response = objectMapper.readValue(output.getBody(), MapResponseModel.class);
485485
assertNotNull(response.getValues().get(CUSTOM_HEADER_KEY));
486486
assertEquals(CUSTOM_HEADER_VALUE, response.getValues().get(CUSTOM_HEADER_KEY));
487-
} catch (IOException e) {
487+
} catch (JacksonException e) {
488488
e.printStackTrace();
489489
fail("Exception while parsing response body: " + e.getMessage());
490490
}
@@ -495,7 +495,7 @@ private void validateSingleValueModel(AwsProxyResponse output, String value) {
495495
SingleValueModel response = objectMapper.readValue(output.getBody(), SingleValueModel.class);
496496
assertNotNull(response.getValue());
497497
assertEquals(value, response.getValue());
498-
} catch (IOException e) {
498+
} catch (JacksonException e) {
499499
e.printStackTrace();
500500
fail("Exception while parsing response body: " + e.getMessage());
501501
}

aws-serverless-java-container-springboot4/src/test/java/com/amazonaws/serverless/proxy/spring/ServletAppTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
77
import com.amazonaws.serverless.proxy.model.ContainerConfig;
88
import com.amazonaws.serverless.proxy.spring.servletapp.*;
9-
import tools.jackson.core.JsonProcessingException;
9+
import tools.jackson.core.JacksonException;
1010
import org.junit.jupiter.params.ParameterizedTest;
1111
import org.junit.jupiter.params.provider.MethodSource;
1212

@@ -70,7 +70,7 @@ void validateRequest_invalidData_respondsWith400(String reqType) {
7070
AwsProxyResponse resp = handler.handleRequest(req, lambdaContext);
7171
try {
7272
System.out.println(LambdaContainerHandler.getObjectMapper().writeValueAsString(resp));
73-
} catch (JsonProcessingException e) {
73+
} catch (JacksonException e) {
7474
e.printStackTrace();
7575
}
7676
assertEquals("3", resp.getBody());

aws-serverless-java-container-springboot4/src/test/java/com/amazonaws/serverless/proxy/spring/WebFluxAppTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.amazonaws.serverless.proxy.spring.webfluxapp.LambdaHandler;
1616
import com.amazonaws.serverless.proxy.spring.webfluxapp.MessageController;
1717
import com.amazonaws.serverless.proxy.spring.webfluxapp.MessageData;
18-
import tools.jackson.core.JsonProcessingException;
18+
import tools.jackson.core.JacksonException;
1919

2020
public class WebFluxAppTest {
2121

@@ -55,7 +55,7 @@ void helloDoubleRequest_respondsWithDoubleMessage(String reqType) {
5555

5656
@MethodSource("data")
5757
@ParameterizedTest
58-
void messageObject_parsesObject_returnsCorrectMessage(String reqType) throws JsonProcessingException {
58+
void messageObject_parsesObject_returnsCorrectMessage(String reqType) throws JacksonException {
5959
initWebFluxAppTest(reqType);
6060
AwsProxyRequestBuilder req = new AwsProxyRequestBuilder("/message", "POST")
6161
.json()

0 commit comments

Comments
 (0)