Merge pull request #15 from mservicetech/develop

 fixes #13

Author: GavinChenYan

pom.xml

@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.mservicetech</groupId>
     <artifactId>openapi-schema-validation</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <packaging>jar</packaging>
     <description>openapi schema  for openpai 3.*</description>
     <url>https://github.com/mservicetech/openapi-schema-validation</url>

src/main/java/com/mservicetech/openapi/validation/OpenApiValidator.java

@@ -182,7 +182,8 @@ private Status validatePathParameters(final RequestEntity requestEntity, final N
             return result.getStatus();
         }
         if  (result.skippedParameters!=null && !result.skippedParameters.isEmpty()) {
-            return new Status(VALIDATOR_REQUEST_PARAMETER_MISSING,  openApiOperation.getMethod(), openApiOperation.getPathString().original());
+            return result.skippedParameters.stream().map(p-> new Status (VALIDATOR_REQUEST_PARAMETER_MISSING, p.getName(), openApiOperation.getPathString().original()))
+                    .filter(s->s != null).findFirst().get();
         }
         return null;
     }
@@ -231,7 +232,8 @@ private Status validateQueryParameters(final RequestEntity requestEntity, final
             return result.getStatus();
         }
         if  (result.skippedParameters!=null && !result.skippedParameters.isEmpty()) {
-            return new Status(VALIDATOR_REQUEST_PARAMETER_MISSING,  openApiOperation.getMethod(), openApiOperation.getPathString().original());
+            return result.skippedParameters.stream().map(p-> new Status (VALIDATOR_REQUEST_PARAMETER_MISSING, p.getName(), openApiOperation.getPathString().original()))
+                    .filter(s->s != null).findFirst().get();
         }
         return null;
     }
@@ -260,7 +262,8 @@ private Optional<Status> validatePathLevelHeaders(final RequestEntity requestEnt
             return Optional.ofNullable(result.getStatus());
         }
         if  (result.skippedParameters!=null && !result.skippedParameters.isEmpty()) {
-            return Optional.ofNullable(new Status(VALIDATOR_REQUEST_PARAMETER_MISSING,  openApiOperation.getMethod(), openApiOperation.getPathString().original()));
+            return result.skippedParameters.stream().map(p-> new Status (VALIDATOR_REQUEST_PARAMETER_MISSING, p.getName(), openApiOperation.getPathString().original()))
+                    .filter(s->s != null).findFirst();
         }
         return Optional.ofNullable(null);
     }
@@ -274,7 +277,8 @@ private Optional<Status> validateOperationLevelHeaders(final RequestEntity reque
             return Optional.ofNullable(result.getStatus());
         }
         if  (result.skippedParameters!=null && !result.skippedParameters.isEmpty()) {
-            return Optional.ofNullable(new Status(VALIDATOR_REQUEST_PARAMETER_MISSING,  openApiOperation.getMethod(), openApiOperation.getPathString().original()));
+            return result.skippedParameters.stream().map(p-> new Status (VALIDATOR_REQUEST_PARAMETER_MISSING, p.getName(), openApiOperation.getPathString().original()))
+                    .filter(s->s != null).findFirst();
         }
         return Optional.ofNullable(null);
     }
@@ -300,7 +304,8 @@ private Optional<Status> validatePathLevelCookies(final RequestEntity requestEnt
             return Optional.ofNullable(result.getStatus());
         }
         if  (result.skippedParameters!=null && !result.skippedParameters.isEmpty()) {
-            return Optional.ofNullable(new Status(VALIDATOR_REQUEST_PARAMETER_MISSING,  openApiOperation.getMethod(), openApiOperation.getPathString().original()));
+            return result.skippedParameters.stream().map(p-> new Status (VALIDATOR_REQUEST_PARAMETER_MISSING, p.getName(), openApiOperation.getPathString().original()))
+                    .filter(s->s != null).findFirst();
         }
         return Optional.ofNullable(null);
     }
@@ -314,7 +319,8 @@ private Optional<Status> validateOperationLevelCookies(final RequestEntity reque
             return Optional.ofNullable(result.getStatus());
         }
         if  (result.skippedParameters!=null && !result.skippedParameters.isEmpty()) {
-            return Optional.ofNullable(new Status(VALIDATOR_REQUEST_PARAMETER_MISSING,  openApiOperation.getMethod(), openApiOperation.getPathString().original()));
+            return result.skippedParameters.stream().map(p-> new Status (VALIDATOR_REQUEST_PARAMETER_MISSING, p.getName(), openApiOperation.getPathString().original()))
+                    .filter(s->s != null).findFirst();
         }
         return Optional.ofNullable(null);
     }
@@ -367,7 +373,7 @@ public Status getStatus() {
             return statuses.isEmpty()?null:statuses.get(0);
         }
 
-        public List<Status> getAllStatueses(){
+        public List<Status> getAllStatues(){
             return Collections.unmodifiableList(statuses);
         }
     }

src/test/java/com/mservicetech/openapi/validation/OpenApiValidatorTest.java

@@ -132,13 +132,28 @@ public void testRequestPath4() {
     }
 
     @Test
-    public void testRequestQueryMissNotRequired() {
+    public void testRequestQueryMissRequired() {
 
         RequestEntity requestEntity = new RequestEntity();
         Map<String, Object> queryMap = new HashMap<>();
         requestEntity.setQueryParameters(queryMap);
         Status status = openApiValidator.validateRequestPath("/pets", "get", requestEntity);
-        Assert.assertNull(status);
+        Assert.assertNotNull(status);
+        Assert.assertEquals( status.getCode(), "ERR11001");
+       // {"statusCode":400,"code":"ERR11001","message":"VALIDATOR_REQUEST_PARAMETER_MISSING","description":"Parameter limit is required but is missing.","severity":"ERROR"}
+    }
+
+    @Test
+    public void testRequestQueryRequiredWithEmpty() {
+
+        RequestEntity requestEntity = new RequestEntity();
+        Map<String, Object> queryMap = new HashMap<>();
+        requestEntity.setQueryParameters(queryMap);
+        queryMap.put("limit", null);
+        Status status = openApiValidator.validateRequestPath("/pets", "get", requestEntity);
+        Assert.assertEquals( status.getCode(), "ERR11001");
+        //{"statusCode":400,"code":"ERR11001","message":"VALIDATOR_REQUEST_PARAMETER_MISSING","description":"Parameter limit is required but is missing.","severity":"ERROR"}
+        Assert.assertNotNull(status);
     }
 
     @Test
@@ -171,6 +186,7 @@ public void testRequestQueryBooleanType() {
         RequestEntity requestEntity = new RequestEntity();
         Map<String, Object> queryMap = new HashMap<>();
         queryMap.put("includeCode", "true");
+        queryMap.put("limit", 12);
         requestEntity.setQueryParameters(queryMap);
         Status status = openApiValidator.validateRequestPath("/pets", "get", requestEntity);
         Assert.assertNull(status);
@@ -182,6 +198,7 @@ public void testRequestQueryBooleanTypeWithError() {
         RequestEntity requestEntity = new RequestEntity();
         Map<String, Object> queryMap = new HashMap<>();
         queryMap.put("includeCode", "yes");
+        queryMap.put("limit", 12);
         requestEntity.setQueryParameters(queryMap);
         Status status = openApiValidator.validateRequestPath("/pets", "get", requestEntity);
         Assert.assertNotNull(status);

src/test/resources/openapi.yaml

@@ -17,7 +17,7 @@ paths:
         - name: limit
           in: query
           description: How many items to return at one time (max 100)
-          required: false
+          required: true
           schema:
             type: integer
             format: int32