From 7e5a7d1d8cd74e42c8549e02724ec2df589e4117 Mon Sep 17 00:00:00 2001
From: Pawel <pawel.kasperkiewicz@nokia.com>
Date: Fri, 20 Dec 2019 09:56:29 +0100
Subject: updated jackson-databind and changed json schema validator library

Issue-ID: DCAEGEN2-1825
Signed-off-by: Pawel <pawel.kasperkiewicz@nokia.com>
Change-Id: Ia4c9c6286adcf84631a58f9d5bfef124fed1cee6
---
 .../java/org/onap/dcae/restapi/EventValidator.java | 29 +++-------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

(limited to 'src/main/java/org/onap/dcae/restapi/EventValidator.java')

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()));
-- 
cgit 1.2.3-korg