#1298 implemented suggested changes

Author: Pascal Romanens

docs/utilities/validation.md

@@ -156,9 +156,10 @@ We support JSON schema version 4, 6, 7 and 201909 (from [jmespath-jackson librar
 
 `@Validation` annotation is used to validate either inbound events or functions' response.
 
-It will fail fast if an event or response doesn't conform with given JSON Schema. For most type of events a `ValidationException` will be thrown. But for 
-specific `APIGatewayProxyRequestEvent` and `APIGatewayV2HTTPEvent`, instead, the `@Validation` annotation will build and return a custom
-400 (BAD_REQUEST) response. Its body will contain the validation error(s) message(s).
+It will fail fast if an event or response doesn't conform with given JSON Schema. For most type of events a `ValidationException` will be thrown.
+For API gateway events associated with REST APIs and HTTP APIs -  `APIGatewayProxyRequestEvent` and `APIGatewayV2HTTPEvent` - the `@Validation` 
+annotation will build and return a custom 400 / "Bad Request" response, with a body containing the validation errors. This saves you from having
+to catch the validation exception and map it back to a meaningful user error yourself.
 
 While it is easier to specify a json schema file in the classpath (using the notation `"classpath:/path/to/schema.json"`), you can also provide a JSON String containing the schema.
 

powertools-e2e-tests/pom.xml

@@ -172,13 +172,6 @@
             <artifactId>powertools-serialization</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-lambda-java-tests</artifactId>
-            <version>1.1.1</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

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

@@ -19,16 +19,17 @@
 import static software.amazon.lambda.powertools.testutils.lambda.LambdaInvoker.invokeFunction;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
-import org.junit.jupiter.params.ParameterizedTest;
 
-import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
-import com.amazonaws.services.lambda.runtime.tests.annotations.Event;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -58,42 +59,49 @@ public static void tearDown() {
 		}
 	}
 
-	@ParameterizedTest
-	@Event(value = "/validation/valid_api_gw_in_out_event.json", type = APIGatewayProxyRequestEvent.class)
-	void test_validInboundApiGWEvent(APIGatewayProxyRequestEvent validEvent) throws IOException {
+	@Test
+	void test_validInboundApiGWEvent() throws IOException {
+		InputStream inputStream = this.getClass().getResourceAsStream("/validation/valid_api_gw_in_out_event.json");
+		String validEvent = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
+
 		// WHEN
-		InvocationResult invocationResult = invokeFunction(functionName, objectMapper.writeValueAsString(validEvent));
+		InvocationResult invocationResult = invokeFunction(functionName, validEvent);
 
 		// THEN
 		// invocation should pass validation and return 200
 		JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
 		assertThat(validJsonNode.get("statusCode").asInt()).isEqualTo(200);
 		assertThat(validJsonNode.get("body").asText()).isEqualTo("{\"price\": 150}");
 	}
-	
-	@ParameterizedTest
-	@Event(value = "/validation/invalid_api_gw_in_event.json", type = APIGatewayProxyRequestEvent.class)
-	void test_invalidInboundApiGWEvent(APIGatewayProxyRequestEvent validEvent) throws IOException {
+
+	@Test
+	void test_invalidInboundApiGWEvent() throws IOException {
+		InputStream inputStream = this.getClass().getResourceAsStream("/validation/invalid_api_gw_in_event.json");
+		String invalidEvent = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
+
 		// WHEN
-		InvocationResult invocationResult = invokeFunction(functionName, objectMapper.writeValueAsString(validEvent));
+		InvocationResult invocationResult = invokeFunction(functionName, invalidEvent);
 
 		// THEN
 		// invocation should fail inbound validation and return 400
 		JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
 		assertThat(validJsonNode.get("statusCode").asInt()).isEqualTo(400);
 		assertThat(validJsonNode.get("body").asText()).contains("$.price: is missing but it is required");
 	}
-	
-	@ParameterizedTest
-	@Event(value = "/validation/invalid_api_gw_out_event.json", type = APIGatewayProxyRequestEvent.class)
-	void test_invalidOutboundApiGWEvent(APIGatewayProxyRequestEvent validEvent) throws IOException {
+
+	@Test
+	void test_invalidOutboundApiGWEvent() throws IOException {
+		InputStream inputStream = this.getClass().getResourceAsStream("/validation/invalid_api_gw_out_event.json");
+		String invalidEvent = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
+
 		// WHEN
-		InvocationResult invocationResult = invokeFunction(functionName, objectMapper.writeValueAsString(validEvent));
+		InvocationResult invocationResult = invokeFunction(functionName, invalidEvent);
 
 		// THEN
 		// invocation should fail outbound validation and return 400
 		JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
 		assertThat(validJsonNode.get("statusCode").asInt()).isEqualTo(400);
-		assertThat(validJsonNode.get("body").asText()).contains("$.price: must have an exclusive maximum value of 1000");
+		assertThat(validJsonNode.get("body").asText())
+				.contains("$.price: must have an exclusive maximum value of 1000");
 	}
 }