X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fmodel%2Fprop%2FAbstractModelElement.java;h=9ced01998fff69c3ffe09155f671f75a7720d805;hb=bc25b72025a7b92c2b1bb7a3f0cfcd9ddedba001;hp=a7dd5cbf03d91a2882c51a93129c597fdc444fe3;hpb=02847bc3889fe3c3a419612ea7a94eca8794bdc6;p=clamp.git

diff --git a/src/main/java/org/onap/clamp/clds/model/prop/AbstractModelElement.java b/src/main/java/org/onap/clamp/clds/model/prop/AbstractModelElement.java
index a7dd5cbf..9ced0199 100644
--- a/src/main/java/org/onap/clamp/clds/model/prop/AbstractModelElement.java
+++ b/src/main/java/org/onap/clamp/clds/model/prop/AbstractModelElement.java
@@ -33,12 +33,12 @@ import java.util.List;
 
 /**
  * Provide base ModelElement functionality. Perform base parsing of properties
- * for a ModelElement (such as, Collector, StringMatch, Policy, Tca, Holmes,
+ * for a ModelElement (such as, VesCollector, Policy, Tca, Holmes,
  * ...)
  */
 public abstract class AbstractModelElement {
-    protected static final EELFLogger logger      = EELFManager.getInstance().getLogger(AbstractModelElement.class);
-    protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
+    protected static final EELFLogger logger        = EELFManager.getInstance().getLogger(AbstractModelElement.class);
+    protected static final EELFLogger auditLogger   = EELFManager.getInstance().getAuditLogger();
 
     private final String              type;
     private final ModelBpmn           modelBpmn;
@@ -49,9 +49,12 @@ public abstract class AbstractModelElement {
 
     private final ModelProperties     modelProp;
 
+    private static final String       LOG_ELEMENT   = "Value '";
+    private static final String       LOG_NOT_FOUND = "' for key 'name' not found in JSON";
+
     /**
      * Perform base parsing of properties for a ModelElement (such as,
-     * Collector, StringMatch, Policy and Tca)
+     * VesCollector, Policy and Tca)
      *
      * @param type
      * @param modelProp
@@ -116,9 +119,9 @@ public abstract class AbstractModelElement {
             }
         }
         if (value == null || value.length() == 0) {
-            logger.warn(name + "=" + value);
+            logger.warn(LOG_ELEMENT + name + LOG_NOT_FOUND);
         } else {
-            logger.debug(name + "=" + value);
+            logger.debug(LOG_ELEMENT + name + LOG_NOT_FOUND + nodeIn.toString());
         }
         return value;
     }
@@ -137,9 +140,9 @@ public abstract class AbstractModelElement {
             value = nodeIn.path(name).asText();
         }
         if (value == null || value.length() == 0) {
-            logger.warn(name + "=" + value);
+            logger.warn(LOG_ELEMENT + name + LOG_NOT_FOUND);
         } else {
-            logger.debug(name + "=" + value);
+            logger.debug(LOG_ELEMENT + name + LOG_NOT_FOUND + nodeIn.toString());
         }
         return value;
     }
@@ -206,9 +209,9 @@ public abstract class AbstractModelElement {
             }
         }
         if (values == null || values.isEmpty()) {
-            logger.warn(name + "=" + values);
+            logger.warn(LOG_ELEMENT + name + LOG_NOT_FOUND);
         } else {
-            logger.debug(name + "=" + values);
+            logger.debug(LOG_ELEMENT + name + LOG_NOT_FOUND + nodeIn.toString());
         }
         return values;
     }