Skip to content

Commit 7d26901

Browse files
phipagphipag
committed
Fix more pmd_analyze issues.
1 parent 420e161 commit 7d26901

File tree

3 files changed

+53
-48
lines changed

3 files changed

+53
-48
lines changed

‎powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/BatchE2ET.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void cleanUpTest() {
131131
.build());
132132

133133
for (Map<String, AttributeValue> item : items.items()) {
134-
Map<String, AttributeValue> key = new HashMap<String, AttributeValue>() {
134+
Map<String, AttributeValue> key = new HashMap<>() {
135135
{
136136
put("functionName", AttributeValue.builder()
137137
.s(item.get("functionName").s())

‎powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/ValidationALBE2ET.java‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -76,30 +76,32 @@ void test_validInboundSQSEvent() throws IOException {
7676

7777
@Test
7878
void test_invalidInboundSQSEvent() throws IOException {
79-
InputStream inputStream = this.getClass().getResourceAsStream("/validation/invalid_alb_in_event.json");
80-
String invalidEvent = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
79+
try (InputStream is = this.getClass().getResourceAsStream("/validation/invalid_alb_in_event.json")) {
80+
String invalidEvent = IOUtils.toString(is, StandardCharsets.UTF_8);
8181

82-
// WHEN
83-
InvocationResult invocationResult = invokeFunction(functionName, invalidEvent);
82+
// WHEN
83+
InvocationResult invocationResult = invokeFunction(functionName, invalidEvent);
8484

85-
// THEN
86-
// invocation should fail inbound validation and return an error message
87-
JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
88-
assertThat(validJsonNode.get("errorMessage").asText()).contains(": required property 'price' not found");
85+
// THEN
86+
// invocation should fail inbound validation and return an error message
87+
JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
88+
assertThat(validJsonNode.get("errorMessage").asText()).contains(": required property 'price' not found");
89+
}
8990
}
9091

9192
@Test
9293
void test_invalidOutboundSQSEvent() throws IOException {
93-
InputStream inputStream = this.getClass().getResourceAsStream("/validation/invalid_alb_out_event.json");
94-
String invalidEvent = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
94+
try (InputStream is = this.getClass().getResourceAsStream("/validation/invalid_alb_out_event.json")) {
95+
String invalidEvent = IOUtils.toString(is, StandardCharsets.UTF_8);
9596

96-
// WHEN
97-
InvocationResult invocationResult = invokeFunction(functionName, invalidEvent);
97+
// WHEN
98+
InvocationResult invocationResult = invokeFunction(functionName, invalidEvent);
9899

99-
// THEN
100-
// invocation should fail outbound validation and return 400
101-
JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
102-
assertThat(validJsonNode.get("errorMessage").asText())
103-
.contains("/price: must have an exclusive maximum value of 1000");
100+
// THEN
101+
// invocation should fail outbound validation and return 400
102+
JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
103+
assertThat(validJsonNode.get("errorMessage").asText())
104+
.contains("/price: must have an exclusive maximum value of 1000");
105+
}
104106
}
105107
}

‎powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/ValidationApiGWE2ET.java‎

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -61,47 +61,50 @@ static void tearDown() {
6161

6262
@Test
6363
void test_validInboundApiGWEvent() throws IOException {
64-
InputStream inputStream = this.getClass().getResourceAsStream("/validation/valid_api_gw_in_out_event.json");
65-
String validEvent = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
64+
try (InputStream is = this.getClass().getResourceAsStream("/validation/valid_api_gw_in_out_event.json")) {
65+
String validEvent = IOUtils.toString(is, StandardCharsets.UTF_8);
6666

67-
// WHEN
68-
InvocationResult invocationResult = invokeFunction(functionName, validEvent);
67+
// WHEN
68+
InvocationResult invocationResult = invokeFunction(functionName, validEvent);
6969

70-
// THEN
71-
// invocation should pass validation and return 200
72-
JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
73-
assertThat(validJsonNode.get("statusCode").asInt()).isEqualTo(200);
74-
assertThat(validJsonNode.get("body").asText()).isEqualTo("{\"price\": 150}");
70+
// THEN
71+
// invocation should pass validation and return 200
72+
JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
73+
assertThat(validJsonNode.get("statusCode").asInt()).isEqualTo(200);
74+
assertThat(validJsonNode.get("body").asText()).isEqualTo("{\"price\": 150}");
75+
}
7576
}
7677

7778
@Test
7879
void test_invalidInboundApiGWEvent() throws IOException {
79-
InputStream inputStream = this.getClass().getResourceAsStream("/validation/invalid_api_gw_in_event.json");
80-
String invalidEvent = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
80+
try (InputStream is = this.getClass().getResourceAsStream("/validation/invalid_api_gw_in_event.json")) {
81+
String invalidEvent = IOUtils.toString(is, StandardCharsets.UTF_8);
8182

82-
// WHEN
83-
InvocationResult invocationResult = invokeFunction(functionName, invalidEvent);
83+
// WHEN
84+
InvocationResult invocationResult = invokeFunction(functionName, invalidEvent);
8485

85-
// THEN
86-
// invocation should fail inbound validation and return 400
87-
JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
88-
assertThat(validJsonNode.get("statusCode").asInt()).isEqualTo(400);
89-
assertThat(validJsonNode.get("body").asText()).contains(": required property 'price' not found");
86+
// THEN
87+
// invocation should fail inbound validation and return 400
88+
JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
89+
assertThat(validJsonNode.get("statusCode").asInt()).isEqualTo(400);
90+
assertThat(validJsonNode.get("body").asText()).contains(": required property 'price' not found");
91+
}
9092
}
9193

9294
@Test
9395
void test_invalidOutboundApiGWEvent() throws IOException {
94-
InputStream inputStream = this.getClass().getResourceAsStream("/validation/invalid_api_gw_out_event.json");
95-
String invalidEvent = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
96-
97-
// WHEN
98-
InvocationResult invocationResult = invokeFunction(functionName, invalidEvent);
99-
100-
// THEN
101-
// invocation should fail outbound validation and return 400
102-
JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
103-
assertThat(validJsonNode.get("statusCode").asInt()).isEqualTo(400);
104-
assertThat(validJsonNode.get("body").asText())
105-
.contains("/price: must have an exclusive maximum value of 1000");
96+
try (InputStream is = this.getClass().getResourceAsStream("/validation/invalid_api_gw_out_event.json")) {
97+
String invalidEvent = IOUtils.toString(is, StandardCharsets.UTF_8);
98+
99+
// WHEN
100+
InvocationResult invocationResult = invokeFunction(functionName, invalidEvent);
101+
102+
// THEN
103+
// invocation should fail outbound validation and return 400
104+
JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
105+
assertThat(validJsonNode.get("statusCode").asInt()).isEqualTo(400);
106+
assertThat(validJsonNode.get("body").asText())
107+
.contains("/price: must have an exclusive maximum value of 1000");
108+
}
106109
}
107110
}

0 commit comments

Comments
 (0)