Code Improvement

[clamp.git] / src / main / java / org / onap / clamp / clds / model / prop / ServiceConfiguration.java

diff --git a/src/main/java/org/onap/clamp/clds/model/prop/ServiceConfiguration.java b/src/main/java/org/onap/clamp/clds/model/prop/ServiceConfiguration.java
index 186cc21..418afbb 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/model/prop/ServiceConfiguration.java
+++ b/src/main/java/org/onap/clamp/clds/model/prop/ServiceConfiguration.java
@@ -33,10 +33,10 @@ import com.att.eelf.configuration.EELFManager;
 import com.fasterxml.jackson.databind.JsonNode;
 
 /**
- * Parse serviceConfigurations from StringMatch json properties.
+ * Parse serviceConfigurations from Tca json properties.
  * <p>
  * Example json:
- * {"StringMatch_0aji7go":{"Group1":[{"name":"rgname","value":"1493749598520"},{
+ * {"Tca_0aji7go":{"Group1":[{"name":"rgname","value":"1493749598520"},{
  * "name":"rgfriendlyname","value":"Group1"},{"name":"policyName","value":
  * "Policy1"},{"name":"policyId","value":"1"},{"serviceConfigurations":[[{"name"
  * :"aaiMatchingFields","value":["complex.city","vserver.vserver-name"]},{"name"
@@ -84,15 +84,15 @@ public class ServiceConfiguration {
      * @param node
      */
     public ServiceConfiguration(JsonNode node) {
-        aaiMatchingFields = ModelElement.getValuesByName(node, "aaiMatchingFields");
-        aaiSendFields = ModelElement.getValuesByName(node, "aaiSendFields");
+        aaiMatchingFields = AbstractModelElement.getValuesByName(node, "aaiMatchingFields");
+        aaiSendFields = AbstractModelElement.getValuesByName(node, "aaiSendFields");
         // groupNumber = ModelElement.getValueByName(node, "groupNumber");
-        resourceVf = ModelElement.getValuesByName(node, "vf");
-        resourceVfc = ModelElement.getValuesByName(node, "vfc");
-        timeWindow = ModelElement.getValueByName(node, "timeWindow");
-        ageLimit = ModelElement.getValueByName(node, "ageLimit");
-        createClosedLoopEventId = ModelElement.getValueByName(node, "createClosedLoopEventId");
-        outputEventName = ModelElement.getValueByName(node, "outputEventName");
+        resourceVf = AbstractModelElement.getValuesByName(node, "vf");
+        resourceVfc = AbstractModelElement.getValuesByName(node, "vfc");
+        timeWindow = AbstractModelElement.getValueByName(node, "timeWindow");
+        ageLimit = AbstractModelElement.getValueByName(node, "ageLimit");
+        createClosedLoopEventId = AbstractModelElement.getValueByName(node, "createClosedLoopEventId");
+        outputEventName = AbstractModelElement.getValueByName(node, "outputEventName");
 
         // process the stringSet fields
         JsonNode ssNodes = node.findPath("stringSet");