bugfix: possible NullPointerException (#71)

Author: pboos

spring-boot-starter/spring-boot-starter-web/src/main/java/com/getyourguide/openapi/validation/filter/OpenApiValidationFilter.java

@@ -30,7 +30,6 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
         var requestMetaData = metaDataFactory.buildRequestMetaData(request);
         request.setAttribute(ATTRIBUTE_REQUEST_META_DATA, requestMetaData);
         if (!validator.isReady() || !trafficSelector.shouldRequestBeValidated(requestMetaData)) {
-            request.setAttribute(ATTRIBUTE_SKIP_VALIDATION, true);
             request.setAttribute(ATTRIBUTE_SKIP_VALIDATION, true);
             filterChain.doFilter(request, response);
             return;

spring-boot-starter/spring-boot-starter-web/src/main/java/com/getyourguide/openapi/validation/filter/OpenApiValidationInterceptor.java

@@ -92,7 +92,7 @@ public void afterCompletion(
     }
 
     private boolean shouldSkipValidation(HttpServletRequest request) {
-        return request.getAttribute(OpenApiValidationFilter.ATTRIBUTE_SKIP_VALIDATION) != null;
+        return request == null || request.getAttribute(OpenApiValidationFilter.ATTRIBUTE_SKIP_VALIDATION) != null;
     }
 
     private void validateResponse(HttpServletRequest request, HttpServletResponse response) {
@@ -106,11 +106,10 @@ private void validateResponse(
     ) {
         var requestMetaData = getRequestMetaData(request);
         var responseMetaData = metaDataFactory.buildResponseMetaData(response, exception);
-        var requestToUse = contentCachingWrapperFactory.getCachingRequest(request);
         var responseToUse = contentCachingWrapperFactory.getCachingResponse(response);
         if (responseToUse != null) {
             var violations = validateResponse(
-                requestToUse,
+                request,
                 responseToUse,
                 requestMetaData,
                 responseMetaData,

spring-boot-starter/spring-boot-starter-web/src/test/java/com/getyourguide/openapi/validation/integration/OpenApiValidationIntegrationTest.java

@@ -123,6 +123,18 @@ public void whenTestOptionsCallThenShouldNotValidate() throws Exception {
         assertEquals(0, openApiViolationLogger.getViolations().size());
     }
 
+    @Test
+    public void whenTestNoBodyThenShouldReturnSuccessAndNoViolation() throws Exception {
+        mockMvc.perform(post("/test/no-body"))
+            .andExpectAll(
+                status().isNoContent(),
+                content().string(Matchers.blankOrNullString())
+            );
+        Thread.sleep(100);
+
+        assertEquals(0, openApiViolationLogger.getViolations().size());
+    }
+
     @Nullable
     private OpenApiViolation getViolationByRule(List<OpenApiViolation> violations, String rule) {
         return violations.stream()

spring-boot-starter/spring-boot-starter-web/src/test/java/com/getyourguide/openapi/validation/integration/controller/DefaultRestController.java

@@ -34,4 +34,9 @@ public ResponseEntity<TestResponse> postTest(PostTestRequest postTestRequest) {
         }
         return ResponseEntity.noContent().build();
     }
+
+    @Override
+    public ResponseEntity<TestResponse> postTestNoBody() {
+        return ResponseEntity.noContent().build();
+    }
 }

spring-boot-starter/spring-boot-starter-webflux/src/test/java/com/getyourguide/openapi/validation/integration/OpenApiValidationIntegrationTest.java

@@ -134,6 +134,19 @@ public void whenTestOptionsCallThenShouldNotValidate() throws Exception {
         assertEquals(0, openApiViolationLogger.getViolations().size());
     }
 
+    @Test
+    public void whenTestNoBodyThenShouldReturnSuccessAndNoViolation() throws Exception {
+        webTestClient
+            .post().uri("/test/no-body")
+            .accept(MediaType.APPLICATION_JSON)
+            .exchange()
+            .expectStatus().isNoContent()
+            .expectBody().isEmpty();
+        Thread.sleep(100);
+
+        assertEquals(0, openApiViolationLogger.getViolations().size());
+    }
+
     @Nullable
     private OpenApiViolation getViolationByRule(List<OpenApiViolation> violations, String rule) {
         return violations.stream()

spring-boot-starter/spring-boot-starter-webflux/src/test/java/com/getyourguide/openapi/validation/integration/controller/DefaultRestController.java

@@ -43,4 +43,9 @@ public Mono<ResponseEntity<TestResponse>> postTest(
             return Mono.just(ResponseEntity.noContent().build());
         });
     }
+
+    @Override
+    public Mono<ResponseEntity<TestResponse>> postTestNoBody(ServerWebExchange exchange) {
+        return Mono.just(ResponseEntity.noContent().build());
+    }
 }

test/openapi.yaml

@@ -78,6 +78,19 @@ paths:
                 "$ref": "#/components/schemas/TestResponse"
         '204':
           description: Successful response without content
+  "/test/no-body":
+    post:
+      description: Post test without request/response body
+      operationId: postTestNoBody
+      responses:
+        '200':
+          description: Successful response
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/TestResponse"
+        '204':
+          description: Successful response without content
 components:
   schemas:
     TestResponse: