2 files changed, 61 insertions, 26 deletions
diff --git a/src/main/java/org/onap/dcae/restapi/EventValidator.java b/src/main/java/org/onap/dcae/restapi/EventValidator.java
index f119b507..009247c0 100644
--- a/src/main/java/org/onap/dcae/restapi/EventValidator.java
+++ b/src/main/java/org/onap/dcae/restapi/EventValidator.java
@@ -20,23 +20,15 @@
  */
 package org.onap.dcae.restapi;
 
-import static java.util.stream.StreamSupport.stream;
-
-import com.github.fge.jackson.JsonLoader;
-import com.github.fge.jsonschema.core.report.ProcessingReport;
-import com.github.fge.jsonschema.main.JsonSchema;
-import java.util.Optional;
 import org.json.JSONObject;
-import org.onap.dcae.ApplicationException;
 import org.onap.dcae.ApplicationSettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
-
+import java.util.Optional;
 public class EventValidator {
 
-  private static final Logger log = LoggerFactory.getLogger(EventValidator.class);
-
+  private final SchemaValidator schemaValidator = new SchemaValidator();
   private ApplicationSettings applicationSettings;
 
   public EventValidator(ApplicationSettings applicationSettings) {
@@ -46,7 +38,7 @@ public class EventValidator {
   public Optional<ResponseEntity<String>> validate(JSONObject jsonObject, String type, String version){
     if (applicationSettings.jsonSchemaValidationEnabled()) {
       if (jsonObject.has(type)) {
-        if (!conformsToSchema(jsonObject, version)) {
+        if (!schemaValidator.conformsToSchema(jsonObject, applicationSettings.jsonSchema(version))) {
           return errorResponse(ApiException.SCHEMA_VALIDATION_FAILED);
         }
       } else {
@@ -56,21 +48,6 @@ public class EventValidator {
     return Optional.empty();
   }
 
-  private boolean conformsToSchema(JSONObject payload, String version) {
-    try {
-      JsonSchema schema = applicationSettings.jsonSchema(version);
-      ProcessingReport report = schema.validate(JsonLoader.fromString(payload.toString()));
-      if (report.isSuccess()) {
-        return true;
-      }
-      log.warn("Schema validation failed for event: " + payload);
-      stream(report.spliterator(), false).forEach(e -> log.warn(e.getMessage()));
-      return false;
-    } catch (Exception e) {
-      throw new ApplicationException("Unable to validate against schema", e);
-    }
-  }
-
   private Optional<ResponseEntity<String>> errorResponse(ApiException noServerResources) {
     return Optional.of(ResponseEntity.status(noServerResources.httpStatusCode)
         .body(noServerResources.toJSON().toString()));
diff --git a/src/main/java/org/onap/dcae/restapi/SchemaValidator.java b/src/main/java/org/onap/dcae/restapi/SchemaValidator.java
new file mode 100644
index 00000000..94638071
--- /dev/null
+++ b/src/main/java/org/onap/dcae/restapi/SchemaValidator.java
@@ -0,0 +1,58 @@
+/*
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019 Nokia. All rights reserved.s
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcae.restapi;
+
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.networknt.schema.JsonSchema;
+import com.networknt.schema.ValidationMessage;
+import org.json.JSONObject;
+import org.onap.dcae.ApplicationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Set;
+
+class SchemaValidator {
+    public static final Logger log = LoggerFactory.getLogger(SchemaValidator.class);
+
+    public boolean conformsToSchema(JSONObject payload, JsonSchema schema) {
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+
+            String content = payload.toString();
+            JsonNode node = mapper.readTree(content);
+            Set<ValidationMessage> messageSet = schema.validate(node);
+
+            if (messageSet.isEmpty()) {
+                return true;
+            }
+
+            log.warn("Schema validation failed for event: " + payload);
+            messageSet.stream().forEach(it->log.warn(it.getMessage()) );
+
+            return false;
+        } catch (Exception e) {
+            throw new ApplicationException("Unable to validate against schema", e);
+        }
+    }
+}