Enable dependency injection for some aai-common classes

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

diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/UniqueLabelValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/UniqueLabelValidationModule.java
index bed6cad..162a11c 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/UniqueLabelValidationModule.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/UniqueLabelValidationModule.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,58 +16,54 @@
  * 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;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.jayway.jsonpath.DocumentContext;
+
+import java.util.*;
 
 import org.onap.aai.edges.EdgeRuleQuery;
 import org.onap.aai.edges.EdgeRuleQuery.Builder;
 import org.onap.aai.edges.enums.EdgeField;
-
-import com.jayway.jsonpath.DocumentContext;
+import org.springframework.stereotype.Component;
 
 /**
  * Applies label validation rules
  *
  */
+@Component
 public class UniqueLabelValidationModule {
-       
-       /**
-        * Validates that the given pair of node types have no duplicate labels in
-        * their edge rules
-        * 
-        * @param String nodeTypePair - of the form "typeA|typeB"
-        * @param List<DocumentContext> ctxs - the edge rule json to pull rules from
-        *                      (ie all files for one version)
-        * @return empty string if no errors, else string error message
-        */
-       public String validate(String nodeTypePair, List<DocumentContext> ctxs) {
-               String[] types = nodeTypePair.split("\\|");
-               EdgeRuleQuery lookup = new EdgeRuleQuery.Builder(types[0], types[1]).build();
-               
-               List<Map<String, String>> rules = new ArrayList<>();
-               for (DocumentContext ctx : ctxs) {
-                       rules.addAll(ctx.read("$.rules.[?]", lookup.getFilter()));
-               }
-               
-               Set<String> labelsSeen = new HashSet<>();
-               for (Map<String, String> rule : rules) {
-                       String label = rule.get(EdgeField.LABEL.toString());
-                       if (labelsSeen.contains(label)) {
-                               return "Pair " + nodeTypePair + " has multiple rules using the same label: " + label + 
-                                               ". Every rule between the same node type pair must have a unique label.";
-                       } else {
-                               labelsSeen.add(label);
-                       }
-               }
-               return "";
-       }
+
+    /**
+     * Validates that the given pair of node types have no duplicate labels in
+     * their edge rules
+     * 
+     * @param String nodeTypePair - of the form "typeA|typeB"
+     * @param List<DocumentContext> ctxs - the edge rule json to pull rules from
+     *        (ie all files for one version)
+     * @return empty string if no errors, else string error message
+     */
+    public String validate(String nodeTypePair, List<DocumentContext> ctxs) {
+        String[] types = nodeTypePair.split("\\|");
+        EdgeRuleQuery lookup = new Builder(types[0], types[1]).build();
+
+        List<Map<String, String>> rules = new ArrayList<>();
+        for (DocumentContext ctx : ctxs) {
+            rules.addAll(ctx.read("$.rules.[?]", lookup.getFilter()));
+        }
+
+        Set<String> labelsSeen = new HashSet<>();
+        for (Map<String, String> rule : rules) {
+            String label = rule.get(EdgeField.LABEL.toString());
+            if (labelsSeen.contains(label)) {
+                return "Pair " + nodeTypePair + " has multiple rules using the same label: " + label
+                        + ". Every rule between the same node type pair must have a unique label.";
+            } else {
+                labelsSeen.add(label);
+            }
+        }
+        return "";
+    }
 }