Enable dependency injection for some aai-common classes

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

diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/DefaultEdgeFieldsValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/DefaultEdgeFieldsValidationModule.java
index ff58e7d..5d81c60 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/DefaultEdgeFieldsValidationModule.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/DefaultEdgeFieldsValidationModule.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,60 +16,64 @@
  * 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.EnumSet;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 
 import org.onap.aai.edges.enums.EdgeField;
+import org.springframework.stereotype.Component;
 
 /**
  * Default core A&AI edge field validation
  * All fields in EdgeField enum are required EXCEPT description
  *
  */
+@Component
 public class DefaultEdgeFieldsValidationModule implements EdgeFieldsValidationModule {
 
-       /* (non-Javadoc)
-        * @see org.onap.aai.edges.EdgeFieldsValidator#verifyFields(java.util.Map)
-        */
-       @Override
-       public String verifyFields(Map<String, String> rule) {
-               EnumSet<EdgeField> missingFields = EnumSet.complementOf(EnumSet.allOf(EdgeField.class));
-               
-               for (EdgeField f : EdgeField.values()) {
-                       if (!rule.containsKey(f.toString()) && (f != EdgeField.DESCRIPTION)) { //description is optional
-                               missingFields.add(f);
-                       }
-               }
-               
-               StringBuilder errorMsg = new StringBuilder();
-               if (!missingFields.isEmpty()) {
-                       errorMsg.append("Rule ").append(ruleToString(rule)).append(" missing required fields: ");
-                       for (EdgeField mf : missingFields) {
-                               errorMsg.append(mf.toString()).append(" ");
-                       }
-               }
-               
-               return errorMsg.toString();
-       }
-       
-       private String ruleToString(Map<String, String> rule) {
-               StringBuilder sb = new StringBuilder();
-               for (Entry<String, String> fields : rule.entrySet()) {
-                       sb.append(fields.getKey()).append(":").append(fields.getValue()).append(" ");
-               }
-               
-               return sb.toString();
-       }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.onap.aai.edges.EdgeFieldsValidator#verifyFields(java.util.Map)
+     */
+    @Override
+    public String verifyFields(Map<String, String> rule) {
+        EnumSet<EdgeField> missingFields = EnumSet.complementOf(EnumSet.allOf(EdgeField.class));
+
+        for (EdgeField f : EdgeField.values()) {
+            if (!rule.containsKey(f.toString()) && (f != EdgeField.DESCRIPTION) && (f != EdgeField.PRIVATE)) { // description
+                                                                                                               // is
+                                                                                                               // optional
+                missingFields.add(f);
+            }
+        }
+
+        StringBuilder errorMsg = new StringBuilder();
+        if (!missingFields.isEmpty()) {
+            errorMsg.append("Rule ").append(ruleToString(rule)).append(" missing required fields: ");
+            for (EdgeField mf : missingFields) {
+                errorMsg.append(mf.toString()).append(" ");
+            }
+        }
+
+        return errorMsg.toString();
+    }
+
+    private String ruleToString(Map<String, String> rule) {
+        StringBuilder sb = new StringBuilder();
+        for (Entry<String, String> fields : rule.entrySet()) {
+            sb.append(fields.getKey()).append(":").append(fields.getValue()).append(" ");
+        }
+
+        return sb.toString();
+    }
 
 }