Fixed #64

openapi-validator/src/main/java/com/networknt/openapi/RequestValidator.java

@@ -20,16 +20,17 @@
 import com.networknt.jsonoverlay.Overlay;
 import com.networknt.oas.model.Parameter;
 import com.networknt.oas.model.RequestBody;
-import com.networknt.oas.model.impl.ParameterImpl;
 import com.networknt.oas.model.impl.RequestBodyImpl;
 import com.networknt.oas.model.impl.SchemaImpl;
+import com.networknt.schema.ValidatorConfig;
 import com.networknt.status.Status;
 import io.undertow.server.HttpServerExchange;
 import io.undertow.util.HeaderValues;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
@@ -109,7 +110,9 @@ private Status validateRequestBody(Object requestBody, final OpenApiOperation op
             }
             return null;
         }
-        return schemaValidator.validate(requestBody, Overlay.toJson((SchemaImpl)specBody.getContentMediaType("application/json").getSchema()));
+        ValidatorConfig config = new ValidatorConfig();
+        config.setTypeLoose(false);
+        return schemaValidator.validate(requestBody, Overlay.toJson((SchemaImpl)specBody.getContentMediaType("application/json").getSchema()), config);
     }
 
     private Status validatePathParameters(final NormalisedPath requestPath, final OpenApiOperation openApiOperation) {

openapi-validator/src/main/java/com/networknt/openapi/SchemaValidator.java

@@ -25,10 +25,9 @@
 import com.networknt.schema.JsonSchema;
 import com.networknt.schema.JsonSchemaFactory;
 import com.networknt.schema.ValidationMessage;
+import com.networknt.schema.ValidatorConfig;
 import com.networknt.status.Status;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 
 import static java.util.Objects.requireNonNull;
@@ -74,15 +73,19 @@ public SchemaValidator(final OpenApi3 api) {
      *
      * @param value The value to validate
      * @param schema The property schema to validate the value against
+     * @param config The config model for some validator
      *
      * @return A status containing error code and description
      */
-    public Status validate(final Object value, final JsonNode schema) {
-        return doValidate(value, schema);
+    public Status validate(final Object value, final JsonNode schema, ValidatorConfig config) {
+        return doValidate(value, schema, config);
     }
 
+    public Status validate(final Object value, final JsonNode schema) {
+        return doValidate(value, schema, null);
+    }
 
-    private Status doValidate(final Object value, final JsonNode schema) {
+    private Status doValidate(final Object value, final JsonNode schema, ValidatorConfig config) {
         requireNonNull(schema, "A schema is required");
 
         Status status = null;
@@ -91,7 +94,7 @@ private Status doValidate(final Object value, final JsonNode schema) {
             if(jsonNode != null) {
                 ((ObjectNode)schema).set(COMPONENTS_FIELD, jsonNode);
             }
-            JsonSchema jsonSchema = JsonSchemaFactory.getInstance().getSchema(schema);
+            JsonSchema jsonSchema = JsonSchemaFactory.getInstance().getSchema(schema, config);
             final JsonNode content = Config.getInstance().getMapper().valueToTree(value);
             processingReport = jsonSchema.validate(content);
         } catch (Exception e) {

openapi-validator/src/main/java/com/networknt/openapi/ValidatorHandler.java

@@ -47,11 +47,11 @@ public class ValidatorHandler implements MiddlewareHandler {
 
     static final Logger logger = LoggerFactory.getLogger(ValidatorHandler.class);
 
-    static ValidatorConfig config;
+    static ValidatorHandlerConfig config;
     static {
-        config = (ValidatorConfig)Config.getInstance().getJsonObjectConfig(OPENAPI_CONFIG_NAME, ValidatorConfig.class);
+        config = (ValidatorHandlerConfig)Config.getInstance().getJsonObjectConfig(OPENAPI_CONFIG_NAME, ValidatorHandlerConfig.class);
         if(config == null) {
-            config = (ValidatorConfig)Config.getInstance().getJsonObjectConfig(CONFIG_NAME, ValidatorConfig.class);
+            config = (ValidatorHandlerConfig)Config.getInstance().getJsonObjectConfig(CONFIG_NAME, ValidatorHandlerConfig.class);
         }
     }
 

openapi-validator/src/main/java/com/networknt/openapi/ValidatorConfig.java → openapi-validator/src/main/java/com/networknt/openapi/ValidatorHandlerConfig.java

@@ -21,11 +21,11 @@
  *
  * @author Steve Hu
  */
-public class ValidatorConfig {
+public class ValidatorHandlerConfig {
     boolean enabled;
     boolean logError;
 
-    public ValidatorConfig() {
+    public ValidatorHandlerConfig() {
     }
 
     public boolean isEnabled() {

pom.xml

@@ -81,7 +81,7 @@
         <version.swagger-parser>1.0.34</version.swagger-parser>
         <version.swagger-core>1.5.18</version.swagger-core>
         <version.jsr305>3.0.2</version.jsr305>
-        <version.json-schema-validator>0.1.23</version.json-schema-validator>
+        <version.json-schema-validator>0.1.24</version.json-schema-validator>
         <versions.maven-version>2.4</versions.maven-version>
         <argLine>-Xmx512m -XX:MaxPermSize=256m</argLine>
     </properties>

swagger-validator/src/main/java/com/networknt/validator/RequestValidator.java

@@ -17,6 +17,7 @@
 package com.networknt.validator;
 
 import com.networknt.body.BodyHandler;
+import com.networknt.schema.ValidatorConfig;
 import com.networknt.status.Status;
 import com.networknt.swagger.NormalisedPath;
 import com.networknt.swagger.SwaggerOperation;
@@ -28,7 +29,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
@@ -111,6 +113,8 @@ private Status validateRequestBody(Object requestBody,
             }
             return null;
         }
+        ValidatorConfig config = new ValidatorConfig();
+        config.setTypeLoose(false);
         return schemaValidator.validate(requestBody, ((BodyParameter)bodyParameter.get()).getSchema());
     }
 

swagger-validator/src/main/java/com/networknt/validator/SchemaValidator.java

@@ -19,10 +19,10 @@
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.networknt.config.Config;
 import com.networknt.schema.JsonSchema;
 import com.networknt.schema.JsonSchemaFactory;
 import com.networknt.schema.ValidationMessage;
+import com.networknt.schema.ValidatorConfig;
 import com.networknt.status.Status;
 import com.networknt.utility.Util;
 import io.swagger.models.Model;
@@ -79,22 +79,27 @@ public SchemaValidator(final Swagger api) {
      * @return A status containing error code and description
      */
     public Status validate(final Object value, final Property schema) {
-        return doValidate(value, schema);
+        return doValidate(value, schema, null);
     }
 
     /**
      * Validate the given value against the given model schema.
      *
      * @param value The value to validate
      * @param schema The model schema to validate the value against
+     * @param config The config model for some validator
      *
      * @return A status containing error code and description
      */
+    public Status validate(final Object value, final Model schema, ValidatorConfig config) {
+        return doValidate(value, schema, config);
+    }
+
     public Status validate(final Object value, final Model schema) {
-        return doValidate(value, schema);
+        return doValidate(value, schema, null);
     }
 
-    private Status doValidate(final Object value, final Object schema) {
+    private Status doValidate(final Object value, final Object schema, ValidatorConfig config) {
         requireNonNull(schema, "A schema is required");
 
         Status status = null;
@@ -109,7 +114,7 @@ private Status doValidate(final Object value, final Object schema) {
                 ((ObjectNode)schemaObject).set(DEFINITIONS_FIELD, this.definitions);
             }
 
-            JsonSchema jsonSchema = JsonSchemaFactory.getInstance().getSchema(schemaObject);
+            JsonSchema jsonSchema = JsonSchemaFactory.getInstance().getSchema(schemaObject, config);
 
             final JsonNode content = Json.mapper().valueToTree(value);
             processingReport = jsonSchema.validate(content);

swagger-validator/src/main/java/com/networknt/validator/ValidatorHandler.java

@@ -49,11 +49,11 @@ public class ValidatorHandler implements MiddlewareHandler {
 
     static final Logger logger = LoggerFactory.getLogger(ValidatorHandler.class);
 
-    static ValidatorConfig config;
+    static ValidatorHandlerConfig config;
     static {
-        config = (ValidatorConfig)Config.getInstance().getJsonObjectConfig(SWAGGER_CONFIG_NAME, ValidatorConfig.class);
+        config = (ValidatorHandlerConfig)Config.getInstance().getJsonObjectConfig(SWAGGER_CONFIG_NAME, ValidatorHandlerConfig.class);
         if(config == null) {
-            config = (ValidatorConfig)Config.getInstance().getJsonObjectConfig(CONFIG_NAME, ValidatorConfig.class);
+            config = (ValidatorHandlerConfig)Config.getInstance().getJsonObjectConfig(CONFIG_NAME, ValidatorHandlerConfig.class);
         }
     }
 

swagger-validator/src/main/java/com/networknt/validator/ValidatorConfig.java → swagger-validator/src/main/java/com/networknt/validator/ValidatorHandlerConfig.java

@@ -16,18 +16,16 @@
 
 package com.networknt.validator;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
 /**
  * Validator configuration class that maps to validator.yml properties
  *
  * @author Steve Hu
  */
-public class ValidatorConfig {
+public class ValidatorHandlerConfig {
     boolean enabled;
     boolean logError;
 
-    public ValidatorConfig() {
+    public ValidatorHandlerConfig() {
     }
 
     public boolean isEnabled() {

swagger-validator/src/test/resources/responses/user-invalid-malformedjson.json

@@ -2,3 +2,4 @@
   "name": "Bob",
   "email": "[email protected]",
   "id": 1
+}