Integrate aai-schema-ingest library into aai-core

[aai/aai-common.git] / aai-schema-ingest / src / main / java / org / onap / aai / validation / edges / EdgeRuleValidator.java

diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeRuleValidator.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeRuleValidator.java
index 34c603a..309d894 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeRuleValidator.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeRuleValidator.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-18 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 
 package org.onap.aai.validation.edges;
@@ -26,14 +24,13 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 import org.onap.aai.edges.JsonIngestor;
 import org.onap.aai.edges.TypeAlphabetizer;
 import org.onap.aai.edges.enums.EdgeField;
 import org.onap.aai.setup.ConfigTranslator;
-import org.onap.aai.setup.Version;
+import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.validation.SchemaErrorStrategy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -45,7 +42,7 @@ import com.jayway.jsonpath.DocumentContext;
  */
 @Component
 public class EdgeRuleValidator {
-       private Map<Version, List<DocumentContext>> versionJsonFilesMap;
+       private Map<SchemaVersion, List<DocumentContext>> versionJsonFilesMap;
        private final SchemaErrorStrategy strat;
        protected final EdgeFieldsValidationModule fieldValidator;
        protected final UniqueLabelValidationModule labelValidator;
@@ -69,8 +66,8 @@ public class EdgeRuleValidator {
        
        public boolean validate() {
                
-               for (Entry<Version, List<DocumentContext>> verEntry : versionJsonFilesMap.entrySet()) {
-                       Version v = verEntry.getKey();
+               for (Map.Entry<SchemaVersion, List<DocumentContext>> verEntry : versionJsonFilesMap.entrySet()) {
+                       SchemaVersion v = verEntry.getKey();
                        List<DocumentContext> ctxs = verEntry.getValue();
                        List<Map<String, String>> rules = collectRules(ctxs);
                        Set<String> nodeTypePairs = new HashSet<>();
@@ -89,7 +86,7 @@ public class EdgeRuleValidator {
                        
                        handleResult(typeValidator.validate(nodeTypePairs, v));
                }
-               
+
                return strat.isOK();
        }