Merge pull request #3 from mservicetech/develop

Develop

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.0</version>
+    <version>1.0.1</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

@@ -194,8 +194,10 @@ private ValidationResult validateDeserializedValues(final RequestEntity requestE
                 .filter(p -> ParameterType.is(p.getIn(), type))
                 .forEach(p->{
                     Object deserializedValue = getDeserializedValue(requestEntity, p.getName(), type);
-                    if (null==deserializedValue) {
-                        validationResult.addSkipped(p);
+                    if (null==deserializedValue ) {
+                        if (p.getRequired()) {
+                            validationResult.addSkipped(p);
+                        }
                     }else {
                         Status s = schemaValidator.validate(deserializedValue, Overlay.toJson((SchemaImpl)(p.getSchema())), p.getName());
                         validationResult.addStatus(s);

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

@@ -117,4 +117,51 @@ public void testRequestPath3() {
         Assert.assertEquals( status.getCode(), "ERR11001");
         //{"statusCode":400,"code":"ERR11001","message":"VALIDATOR_REQUEST_PARAMETER_MISSING","description":"Parameter get is required but is missing.","severity":"ERROR"}
     }
+
+    @Test
+    public void testRequestPath4() {
+
+        RequestEntity requestEntity = new RequestEntity();
+        Map<String, Object> pathMap = new HashMap<>();
+        pathMap.put("petId", "112245");
+        requestEntity.setPathParameters(pathMap);
+        Status status = openApiValidator.validateRequestPath("/pets/{petId}", "get", requestEntity);
+        Assert.assertNotNull(status);
+        Assert.assertEquals( status.getCode(), "ERR11004");
+        //{"statusCode":400,"code":"ERR11004","message":"VALIDATOR_SCHEMA","description":"Schema Validation Error - petId: must have a maximum value of 5","severity":"ERROR"}
+    }
+
+    @Test
+    public void testRequestQueryMissNotRequired() {
+
+        RequestEntity requestEntity = new RequestEntity();
+        Map<String, Object> queryMap = new HashMap<>();
+        requestEntity.setQueryParameters(queryMap);
+        Status status = openApiValidator.validateRequestPath("/pets", "get", requestEntity);
+        Assert.assertNull(status);
+    }
+
+    @Test
+    public void testRequestQueryWithQuery() {
+
+        RequestEntity requestEntity = new RequestEntity();
+        Map<String, Object> queryMap = new HashMap<>();
+        queryMap.put("limit", 12);
+        requestEntity.setQueryParameters(queryMap);
+        Status status = openApiValidator.validateRequestPath("/pets", "get", requestEntity);
+        Assert.assertNull(status);
+    }
+
+    @Test
+    public void testRequestQuery2() {
+
+        RequestEntity requestEntity = new RequestEntity();
+        Map<String, Object> queryMap = new HashMap<>();
+        queryMap.put("limit", "abbb");
+        requestEntity.setQueryParameters(queryMap);
+        Status status = openApiValidator.validateRequestPath("/pets", "get", requestEntity);
+        Assert.assertNotNull(status);
+        Assert.assertEquals( status.getCode(), "ERR11004");
+        //{"statusCode":400,"code":"ERR11004","message":"VALIDATOR_SCHEMA","description":"Schema Validation Error - limit: string found, integer expected","severity":"ERROR"}
+    }
 }

src/test/resources/openapi.yaml

@@ -89,6 +89,7 @@ paths:
           description: The id of the pet to retrieve
           schema:
             type: string
+            maxLength: 5
       security:
         - petstore_auth:
             - 'read:pets'