Refactor: Pass in responseMetaData when validating request if available (part 2)

Author: pboos

openapi-validation-core/src/main/java/com/getyourguide/openapi/validation/core/ValidationReportHandler.java

@@ -79,7 +79,7 @@ private OpenApiViolation buildOpenApiViolation(
             .instance(pointersInstance)
             .parameter(parameterName)
             .schema(getPointersSchema(message))
-            .responseStatus(getResponseStatus(message))
+            .responseStatus(getResponseStatus(response, message))
             .logMessage(logMessage)
             .message(message.getMessage())
             .build();
@@ -115,7 +115,14 @@ private static Optional<String> getNormalizedPath(ValidationReport.Message messa
             .map(apiOperation -> apiOperation.getApiPath().normalised());
     }
 
-    private static Optional<Integer> getResponseStatus(ValidationReport.Message message) {
+    private static Optional<Integer> getResponseStatus(
+        @Nullable ResponseMetaData response,
+        ValidationReport.Message message
+    ) {
+        if (response != null && response.getStatusCode() != null) {
+            return Optional.of(response.getStatusCode());
+        }
+
         return message.getContext().flatMap(ValidationReport.MessageContext::getResponseStatus);
     }
 

spring-boot-starter/spring-boot-starter-web/src/test/java/com/getyourguide/openapi/validation/filter/OpenApiValidationHttpFilterTest.java

@@ -156,7 +156,7 @@ private void verifyNoValidation() {
     }
 
     private void verifyNoRequestValidation() {
-        verify(validator, never()).validateRequestObjectAsync(any(), anyString());
+        verify(validator, never()).validateRequestObjectAsync(any(), any(), anyString());
         verify(validator, never()).validateRequestObject(any(), anyString());
     }
 
@@ -166,7 +166,7 @@ private void verifyNoResponseValidation() {
     }
 
     private void verifyRequestValidatedAsync(MockSetupData mockData) {
-        verify(validator).validateRequestObjectAsync(eq(mockData.requestMetaData), eq(REQUEST_BODY));
+        verify(validator).validateRequestObjectAsync(eq(mockData.requestMetaData), eq(mockData.responseMetaData), eq(REQUEST_BODY));
     }
 
     private void verifyRequestValidatedSync(MockSetupData mockData) {

spring-boot-starter/spring-boot-starter-webflux-spring2.7/src/main/java/com/getyourguide/openapi/validation/filter/OpenApiValidationWebFilter.java

@@ -165,5 +165,5 @@ private ValidationResult validateResponse(
         }
     }
 
-    private enum RunType {SYNC, ASYNC}
+    private enum RunType { SYNC, ASYNC }
 }

spring-boot-starter/spring-boot-starter-webflux/src/main/java/com/getyourguide/openapi/validation/filter/OpenApiValidationWebFilter.java

@@ -165,5 +165,5 @@ private ValidationResult validateResponse(
         }
     }
 
-    private enum RunType {SYNC, ASYNC}
+    private enum RunType { SYNC, ASYNC }
 }

spring-boot-starter/spring-boot-starter-webflux/src/test/java/com/getyourguide/openapi/validation/filter/OpenApiValidationWebFilterTest.java

@@ -129,7 +129,7 @@ public void testShouldFailOnReResponseViolationWithoutViolation() {
     @Test
     public void testShouldFailOnRequestViolationWithViolation() {
         var mockData = mockSetup(MockConfiguration.builder().shouldFailOnRequestViolation(true).build());
-        when(validator.validateRequestObject(eq(mockData.requestMetaData), eq(REQUEST_BODY)))
+        when(validator.validateRequestObject(eq(mockData.requestMetaData), any(), eq(REQUEST_BODY)))
             .thenReturn(ValidationResult.INVALID);
 
         assertThrows(ResponseStatusException.class, () -> webFilter.filter(mockData.exchange, mockData.chain));
@@ -162,7 +162,7 @@ private void verifyNoValidation() {
     }
 
     private void verifyNoRequestValidation() {
-        verify(validator, never()).validateRequestObjectAsync(any(), anyString());
+        verify(validator, never()).validateRequestObjectAsync(any(), any(), anyString());
         verify(validator, never()).validateRequestObject(any(), anyString());
     }
 
@@ -172,11 +172,11 @@ private void verifyNoResponseValidation() {
     }
 
     private void verifyRequestValidatedAsync(MockSetupData mockData) {
-        verify(validator).validateRequestObjectAsync(eq(mockData.requestMetaData), eq(REQUEST_BODY));
+        verify(validator).validateRequestObjectAsync(eq(mockData.requestMetaData), any(), eq(REQUEST_BODY));
     }
 
     private void verifyRequestValidatedSync(MockSetupData mockData) {
-        verify(validator).validateRequestObject(eq(mockData.requestMetaData), eq(REQUEST_BODY));
+        verify(validator).validateRequestObject(eq(mockData.requestMetaData), any(), eq(REQUEST_BODY));
     }
 
     private void verifyResponseValidatedAsync(MockSetupData mockData) {