vescollector junit addon

Issue-ID:DCAEGEN2-82
Change-Id: I109a01ec7d4927e3fbce723355012d80290f2b48
Signed-off-by: Vijay <vv770d@att.com>

4 files changed, 636 insertions, 553 deletions

diff --git a/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java b/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java
index b4c78f3b..4bcfaab5 100644
--- a/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java
+++ b/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java
@@ -125,7 +125,7 @@ public class CommonStartup extends NsaBaseEndpoint implements Runnable {
     public static String exceptionConfig;
     public static String cambriaConfigFile;
     private boolean listnerstatus;
-    static String streamid;
+    public static String streamid;
 
 
     private CommonStartup(rrNvReadable settings)
diff --git a/src/main/java/org/onap/dcae/commonFunction/ConfigProcessors.java b/src/main/java/org/onap/dcae/commonFunction/ConfigProcessors.java
index 89319072..351d8ade 100644
--- a/src/main/java/org/onap/dcae/commonFunction/ConfigProcessors.java
+++ b/src/main/java/org/onap/dcae/commonFunction/ConfigProcessors.java
@@ -21,6 +21,7 @@
 
 package org.onap.dcae.commonFunction;
 
+import java.text.DecimalFormat;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.slf4j.Logger;
@@ -28,528 +29,637 @@ import org.slf4j.LoggerFactory;
 
 public class ConfigProcessors {
 
-    private static final Logger LOG = LoggerFactory.getLogger(ConfigProcessors.class);
-    private static final String FIELD = "field";
-    private static final String OLD_FIELD = "oldField";
-    private static final String FILTER = "filter";
-    private static final String VALUE = "value";
-    private static final String REGEX = "\\[\\]";
-    private static final String OBJECT_NOT_FOUND = "ObjectNotFound";
-
-
-    public ConfigProcessors(JSONObject eventJson) {
-        event = eventJson;
-    }
-
-    /**
-     *
-     * @param j json object
-     */
-    public void getValue(JSONObject j) {
-        //log.info("addAttribute");
-        final String field = j.getString(FIELD);
-        //final String value = J.getString(VALUE);
-        final JSONObject filter = j.optJSONObject(FILTER);
-        if (filter == null || isFilterMet(filter)) {
-            //log.info("field ==" + field);
-            //log.info("value ==" + value);
-            getEventObjectVal(field);
-        } else {
-            LOG.info("Filter not met");
-        }
-    }
-
-    /**
-     *
-     * @param j json object
-     */
-    public void setValue(JSONObject j) {
-        //log.info("addAttribute");
-        final String field = j.getString(FIELD);
-        final String value = j.getString(VALUE);
-        final JSONObject filter = j.optJSONObject(FILTER);
-        if (filter == null || isFilterMet(filter)) {
-            //log.info("field ==" + field);
-            //log.info("value ==" + value);
-            setEventObjectVal(field, value);
-        } else {
-            LOG.info("Filter not met");
-        }
-    }
-
-    /**
-     *
-     * @param j json object
-     */
-    public void addAttribute(JSONObject j) {
-        //log.info("addAttribute");
-        final String field = j.getString(FIELD);
-        final String value = j.getString(VALUE);
-        final JSONObject filter = j.optJSONObject(FILTER);
-        if (filter == null || isFilterMet(filter)) {
-            //log.info("field ==" + field);
-            //log.info("value ==" + value);
-            setEventObjectVal(field, value);
-        } else {
-            LOG.info("Filter not met");
-        }
-    }
-
-    /**
-     *
-     * @param j json object
-     */
-    public void updateAttribute(JSONObject j) {
-        //log.info("updateAttribute");
-        final String field = j.getString(FIELD);
-        final String value = j.getString(VALUE);
-        final JSONObject filter = j.optJSONObject(FILTER);
-        if (filter == null || isFilterMet(filter)) {
-            //log.info("field ==" + field);
-            //log.info("value ==" + value);
-            setEventObjectVal(field, value);
-        } else {
-            LOG.info("Filter not met");
-        }
-    }
-
-    /**
-     *
-     * @param j json object
-     */
-    public void removeAttribute(JSONObject j) {
-        //log.info("removeAttribute");
-        final String field = j.getString(FIELD);
-        final JSONObject filter = j.optJSONObject(FILTER);
-
-        if (filter == null || isFilterMet(filter)) {
-            removeEventKey(field);
-        } else {
-            LOG.info("Filter not met");
-        }
-    }
-
-    /**
-     *
-     * @param j json object
-     */
-    public void renameArrayInArray(JSONObject j) { //map
-
-        LOG.info("renameArrayInArray");
-        final String field = j.getString(FIELD);
-        final String oldField = j.getString(OLD_FIELD);
-        final JSONObject filter = j.optJSONObject(FILTER);
-        //String value = "";
-        if (filter == null || isFilterMet(filter)) {
-            //log.info("field ==" + field);
-            final String[] fsplit = field.split(REGEX, field.length());
-            final String[] oldfsplit = oldField.split(REGEX, oldField.length());
-                /*for (int i=0; i< oldfsplit.length; i++ )
-                {
+	private static Logger LOG = LoggerFactory.getLogger(ConfigProcessors.class);
+	private static final String FIELD = "field";
+	private static final String OLD_FIELD = "oldField";
+	private static final String FILTER = "filter";
+	private static final String VALUE = "value";
+	private static final String REGEX = "\\[\\]";
+	private static final String OBJECT_NOT_FOUND = "ObjectNotFound";
+	
+	    public ConfigProcessors(JSONObject eventJson) 
+	    {
+	    	event = eventJson;
+	    }
+
+	    /**
+	     * 
+	     */
+	    public void getValue(JSONObject J)
+	    {
+	    	//log.info("addAttribute");
+	    	final String field = J.getString(FIELD);
+	    	//final String value = J.getString(VALUE);
+	    	final JSONObject filter = J.optJSONObject(FILTER);
+	    	if (filter == null || isFilterMet(filter))
+	    	{
+		    	//log.info("field ==" + field);
+		    	//log.info("value ==" + value);
+		    	getEventObjectVal(field);
+	    	}
+	    	else
+	    		LOG.info("Filter not met");
+	    }
+	    
+	    /**
+	     * 
+	     */
+	    public void setValue(JSONObject J)
+	    {
+	    	//log.info("addAttribute");
+	    	final String field = J.getString(FIELD);
+	    	final String value = J.getString(VALUE);
+	    	final JSONObject filter = J.optJSONObject(FILTER);
+	    	if (filter == null || isFilterMet(filter))
+	    	{
+		    	//log.info("field ==" + field);
+		    	//log.info("value ==" + value);
+		    	setEventObjectVal(field, value);
+	    	}
+	    	else
+	    		LOG.info("Filter not met");
+	    }
+	    
+	    /**
+	     * 
+	     */
+	    public String evaluate(String str)
+	    {
+	    	String value = str;
+	    	if (str.startsWith("$"))
+	    	{
+	    		value = (String) getEventObjectVal(str.substring(1));
+	    		
+	    	}
+	    	return value;
+	    }
+	    
+	    /**
+	     * { "functionName":"suppressEvent",
+			  "args":{}
+			}
+	     */
+	    public void suppressEvent(JSONObject J)
+	    {
+	    	//log.info("addAttribute");
+	    	final JSONObject filter = J.optJSONObject(FILTER);
+	    	
+	    	if (filter == null || isFilterMet(filter))
+	    	{
+		    	//log.info("field ==" + field);
+		    	//log.info("value ==" + value);
+	    		setEventObjectVal("suppressEvent", "true");
+	    	}
+	    	else
+	    		LOG.info("Filter not met");
+	    }
+	    
+		/**
+	     * 
+	     */
+	    public void addAttribute(JSONObject J)
+	    {
+	    	//log.info("addAttribute begin");
+	    	final String field = J.getString(FIELD);
+	    	final String value = evaluate(J.getString(VALUE));
+	    	final JSONObject filter = J.optJSONObject(FILTER);
+	    	final String fieldType = J.optString("fieldType", "string").toLowerCase();
+	    	
+	    	if (filter == null || isFilterMet(filter))
+	    	{
+		    	//log.info("field ==" + field);
+		    	//log.info("value ==" + value);
+	    		setEventObjectVal(field, value, fieldType);
+	    	}
+	    	else
+	    		LOG.info("Filter not met");
+	    	//log.info("addAttribute End");
+	    }
+	    
+	    /**
+	     * 
+	     */
+	    public void updateAttribute(JSONObject J)
+	    {
+	    	//log.info("updateAttribute");
+	    	final String field = J.getString(FIELD);
+	    	final String value = evaluate(J.getString(VALUE));
+	    	final JSONObject filter = J.optJSONObject(FILTER);
+	    	if (filter == null || isFilterMet(filter))
+	    	{
+		    	//log.info("field ==" + field);
+		    	//log.info("value ==" + value);
+		    	setEventObjectVal(field, value);
+	    	}
+	    	else
+	    		LOG.info("Filter not met");   	
+	    }
+	    
+	    /**
+	     * 
+	     */
+	    public void removeAttribute(JSONObject J)
+	    {
+	    	//log.info("removeAttribute");
+	    	final String field = J.getString(FIELD);
+	    	final JSONObject filter = J.optJSONObject(FILTER);
+	    	
+	    	if (filter == null || isFilterMet(filter))
+	    	{
+		    	removeEventKey(field);
+	    	}
+	    	else
+	    		LOG.info("Filter not met");
+	    }
+	    
+	    /**
+	     * 
+	     */
+	    public void renameArrayInArray(JSONObject J) //map
+	    {
+	    	LOG.info("renameArrayInArray");
+	    	final String field = J.getString(FIELD);
+	    	final String oldField = J.getString(OLD_FIELD);
+	    	final JSONObject filter = J.optJSONObject(FILTER);
+	    	//String value = "";
+	    	if (filter == null || isFilterMet(filter))
+	    	{
+		    	//log.info("field ==" + field);
+		    	final String[] fsplit = field.split(REGEX, field.length());
+		    	final String[] oldfsplit = oldField.split(REGEX, oldField.length());
+		    	/*for (int i=0; i< oldfsplit.length; i++ )
+		    	{
 		    		log.info( "renameArrayInArray " + i + " ==" + oldfsplit[i]);
 		    	}*/
-
-            final String oldValue = getEventObjectVal(oldfsplit[0]).toString();
-            if (!OBJECT_NOT_FOUND.equals(oldValue)) {
-                final String oldArrayName = oldfsplit[1].substring(1);
-                final String newArrayName = fsplit[1].substring(1);
-                final String value = oldValue.replaceAll(oldArrayName, newArrayName);
-                //log.info("oldArrayName ==" + oldArrayName);
-                //log.info("newArrayName ==" + newArrayName);
-                LOG.info("oldValue ==" + oldValue);
-                LOG.info("value ==" + value);
-                JSONArray ja = new JSONArray(value);
-                removeEventKey(oldfsplit[0]);
-                setEventObjectVal(fsplit[0], ja);
-            }
-        } else {
-            LOG.info("Filter not met");
-        }
-    }
-
-    /**
-     *
-     * @param j json object
-     */
-    public void map(JSONObject j) {
-        //log.info("mapAttribute");
-        final String field = j.getString(FIELD);
-        if (field.contains("[]")) {
-            if (field.matches(".*\\[\\]\\..*\\[\\]")) {
-                renameArrayInArray(j);
-            } else {
-                mapToJArray(j);
-            }
-        } else {
-            mapAttribute(j);
-        }
-    }
-
-    /**
-     *
-     * @param  operation operation
-     * @param value kb value
-     * @return value
-     */
-    public String performOperation(String operation, String value) {
-        LOG.info("performOperation");
-        if (operation != null && "convertMBtoKB".equals(operation)) {
-            float kbValue = Float.parseFloat(value) * 1024;
-            value = String.valueOf(kbValue);
-        }
-        return value;
-    }
-
-    //public void mapAttributeToArrayAttribute(JSONObject J)
-
-    /**
-     *
-     * @param j json object
-     */
-    public void mapAttribute(JSONObject j) {
-        //log.info("mapAttribute");
-        final String field = j.getString(FIELD);
-        final String oldField = j.getString(OLD_FIELD);
-        final JSONObject filter = j.optJSONObject(FILTER);
-        final String operation = j.optString("operation");
-        String value = "";
-        if (filter == null || isFilterMet(filter)) {
-            //log.info("field ==" + field);
-
-            value = getEventObjectVal(oldField).toString();
-            if (!OBJECT_NOT_FOUND.equals(value)) {
-                if (operation != null && !operation.isEmpty()) {
-                    value = performOperation(operation, value);
-                }
-                //log.info("value ==" + value);
-                setEventObjectVal(field, value);
-
-                removeEventKey(oldField);
-            }
-        } else {
-            LOG.info("Filter not met");
-        }
-    }
-
-    /**
-     *
-     * @param j json object
-     */
-    public void mapToJArray(JSONObject j) {
-        LOG.info("mapToJArray");
-        String field = j.getString(FIELD);
-        String oldField = j.getString(OLD_FIELD);
-        final JSONObject filter = j.optJSONObject(FILTER);
-        final JSONObject attrMap = j.optJSONObject("attrMap");
-        oldField = oldField.replaceAll(REGEX, "");
-        field = field.replaceAll(REGEX, "");
-
-        //log.info("oldField ==" + field);
-        if (filter == null || isFilterMet(filter)) {
-            //log.info("oldField ==" + field);
-            String value = getEventObjectVal(oldField).toString();
-            if (!OBJECT_NOT_FOUND.equals(value)) {
-                LOG.info("old value ==" + value);
-                //update old value based on attrMap
-                if (attrMap != null) {
-                    //loop thru attrMap and update attribute name to new name
-                    for (String key : attrMap.keySet()) {
-                        //log.info("attr key==" + key + " value==" + attrMap.getString(key));
-                        value = value.replaceAll(key, attrMap.getString(key));
-                    }
-                }
-
-                LOG.info("new value ==" + value);
-                char c = value.charAt(0);
-                if (c != '[') {
-                    //oldfield is JsonObject
-                    JSONObject valueJO = new JSONObject(value);
-                    // if the array already exists
-
-                    String existingValue = getEventObjectVal(field).toString();
-                    if (!OBJECT_NOT_FOUND.equals(existingValue)) {
-                        JSONArray ja = new JSONArray(existingValue);
-                        JSONObject jo = ja.optJSONObject(0);
-                        if (jo != null) {
-                            for (String key : valueJO.keySet()) {
-                                jo.put(key, valueJO.get(key));
-
-                            }
-                            ja.put(0, jo);
-                            //log.info("jarray== " + ja.toString());
-                            setEventObjectVal(field, ja);
-                        }
-                    } else //if new array
-                    {
-                        setEventObjectVal(field + "[0]", new JSONObject(value));
-                    }
-                } else //oldfield is jsonArray
-                {
-                    setEventObjectVal(field, new JSONArray(value));
-                }
-
-                removeEventKey(oldField);
-            }
-        } else {
-            LOG.info("Filter not met");
-        }
-    }
-
-    /*
-     * example -
-     {
-     "functionName": "concatenateValue",
-     "args":{
-     "filter": {"event.commonEventHeader.event":"heartbeat"},
-     "field":"event.commonEventHeader.eventName",
-     "concatenate": ["event.commonEventHeader.domain","event.commonEventHeader.eventType","event.commonEventHeader.alarmCondition"],
-     "delimiter":"_"
-     }
-     }
-     **/
-
-    /**
-     *
-     * @param j json object
-     */
-    public void concatenateValue(JSONObject j) {
-        //log.info("concatenateValue");
-        final String field = j.getString(FIELD);
-        final String delimiter = j.getString("delimiter");
-        final JSONArray values = j.getJSONArray("concatenate");
-        final JSONObject filter = j.optJSONObject(FILTER);
-        if (filter == null || isFilterMet(filter)) {
-            StringBuilder value = new StringBuilder("");
-            for (int i = 0; i < values.length(); i++) {
-                //log.info(values.getString(i));
-                String tempVal = getEventObjectVal(values.getString(i)).toString();
-                if (!OBJECT_NOT_FOUND.equals(tempVal)) {
-                    if (i == 0) {
-                        value.append(getEventObjectVal(values.getString(i)));
-                    } else {
-                        value.append(delimiter).append(getEventObjectVal(values.getString(i)));
-                    }
-                }
-            }
-            //log.info("value ==" + value);
-            setEventObjectVal(field, value.toString());
-        } else {
-            LOG.info("Filter not met");
-        }
-    }
-
-    /**
-     *
-     */
-    private void removeEventKey(String field) {
-        String[] keySet = field.split("\\.", field.length());
-        JSONObject keySeries = event;
-        for (int i = 0; i < (keySet.length - 1); i++) {
-            //log.info( i + " ==" + keySet[i]);
-            keySeries = keySeries.getJSONObject(keySet[i]);
-        }
-        //log.info(keySet[keySet.length -1]);
-
-        keySeries.remove(keySet[keySet.length - 1]);
-
-    }
-
-    /**
-     *
-     */
-    private boolean checkFilter(JSONObject jo, String key, String logicKey) {
-        String filterValue = jo.getString(key);
-        boolean retVal = true;
-
-        if (filterValue.contains(":")) {
-            String[] splitVal = filterValue.split(":");
-            //log.info(splitVal[0] + " " + splitVal[1]);
-            if ("matches".equals(splitVal[0])) {
-                if ("not".equals(logicKey)) {
-                    //log.info("not");
-                    //log.info(filterValue + "==" + key + "==" + getEventObjectVal(key) + "split1==" + splitVal[1]);
-                    if (getEventObjectVal(key).toString().matches(splitVal[1])) {
-                        loggerForCheckFilter(filterValue, key);
-                        return false;
-                    }
-                } else {
-                    if (!getEventObjectVal(key).toString().matches(splitVal[1])) {
-                        loggerForCheckFilter(filterValue, key);
-                        return false;
-                    }
-                }
-
-            }
-            if ("contains".equals(splitVal[0])) {
-                if ("not".equals(logicKey)) {
-                    //log.info("not");
-                    //log.info(filterValue + "==" + key + "==" + getEventObjectVal(key) + "split1==" + splitVal[1]);
-                    if (getEventObjectVal(key).toString().contains(splitVal[1])) {
-                        loggerForCheckFilter(filterValue, key);
-                        return false;
-                    }
-                } else {
-                    if (!getEventObjectVal(key).toString().contains(splitVal[1])) {
-                        loggerForCheckFilter(filterValue, key);
-                        return false;
-                    }
-                }
-
-            }
-        } else {
-            if ("not".equals(logicKey)) {
-                if (getEventObjectVal(key).toString().equals(filterValue)) {
-                    loggerForCheckFilter(filterValue, key);
-                    return false;
-                }
-            } else {
-                if (!getEventObjectVal(key).toString().equals(filterValue)) {
-                    loggerForCheckFilter(filterValue, key);
-                    return false;
-                }
-            }
-        }
-        return retVal;
-    }
-
-    /**
-     *
-     * @param jo json object
-     * @return true/false
-     */
-    public boolean isFilterMet(JSONObject jo) {
-        boolean retval;
-        //log.info("Filter==" + jo.toString());
-        for (String key : jo.keySet()) {
-            if ("not".equals(key)) {
-                JSONObject njo = jo.getJSONObject(key);
-                for (String njoKey : njo.keySet()) {
-                    //log.info(njoKey);
-                    retval = checkFilter(njo, njoKey, key);
-                    if (!retval) {
-                        return retval;
-                    }
-                }
-            } else {
-                //log.info(key);
-                //final String filterKey = key;
-                retval = checkFilter(jo, key, key);
-                if (!retval) {
-                    return retval;
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * returns a string or JSONObject or JSONArray
-     *
-     * @param keySeriesStr key series string
-     * @return key string updated object
-     **/
-    public Object getEventObjectVal(String keySeriesStr) {
-        keySeriesStr = keySeriesStr.replaceAll("\\[", ".");
-        keySeriesStr = keySeriesStr.replaceAll("\\]", ".");
-        if (keySeriesStr.contains("..")) {
-            keySeriesStr = keySeriesStr.replaceAll("\\.\\.", ".");
-        }
-        //log.info(Integer.toString(keySeriesStr.lastIndexOf(".")));
-        //log.info(Integer.toString(keySeriesStr.length() -1));
-        if (keySeriesStr.lastIndexOf('.') == keySeriesStr.length() - 1) {
-            keySeriesStr = keySeriesStr.substring(0, keySeriesStr.length() - 1);
-        }
-        String[] keySet = keySeriesStr.split("\\.", keySeriesStr.length());
-        Object keySeriesObj = event;
-        for (int i = 0; i < keySet.length; i++) {
-            //log.info( "getEventObject " + i + " ==" + keySet[i]);
-            if (keySeriesObj != null) {
-                if (keySeriesObj instanceof String) {
-                    //keySeriesObj =  keySeriesObj.get(keySet[i]);
-                    LOG.info("STRING==" + keySeriesObj);
-                } else if (keySeriesObj instanceof JSONArray) {
-                    keySeriesObj = ((JSONArray) keySeriesObj)
-                        .optJSONObject(Integer.parseInt(keySet[i]));
-                    //log.info("ARRAY==" + keySeriesObj);
-                } else if (keySeriesObj instanceof JSONObject) {
-                    keySeriesObj = ((JSONObject) keySeriesObj).opt(keySet[i]);
-                    //log.info("JSONObject==" + keySeriesObj);
-                } else {
-                    LOG.info("unknown object==" + keySeriesObj);
-                }
-            }
-        }
-
-        if (keySeriesObj == null) {
-            return "ObjectNotFound";
-        }
-        return keySeriesObj;
-    }
-
-    /**
-     * returns a string or JSONObject or JSONArray
-     *
-     * @param keySeriesStr key series string
-     * @param value value object
-     **/
-    public void setEventObjectVal(String keySeriesStr, Object value) {
-        keySeriesStr = keySeriesStr.replaceAll("\\[", ".");
-        keySeriesStr = keySeriesStr.replaceAll("\\]", ".");
-        if (keySeriesStr.contains("..")) {
-            keySeriesStr = keySeriesStr.replaceAll("\\.\\.", ".");
-        }
-        //log.info(Integer.toString(keySeriesStr.lastIndexOf(".")));
-        //log.info(Integer.toString(keySeriesStr.length() -1));
-        if (keySeriesStr.lastIndexOf('.') == keySeriesStr.length() - 1) {
-            keySeriesStr = keySeriesStr.substring(0, keySeriesStr.length() - 1);
-        }
-        String[] keySet = keySeriesStr.split("\\.", keySeriesStr.length());
-        Object keySeriesObj = event;
-        for (int i = 0; i < (keySet.length - 1); i++) {
-            //log.info( "setEventObject " + i + " ==" + keySet[i]);
-            if (keySeriesObj instanceof JSONArray) {
-                //keySeriesObj =  ((JSONArray) keySeriesObj).optJSONObject(Integer.parseInt(keySet[i]));
-                if (((JSONArray) keySeriesObj).optJSONObject(Integer.parseInt(keySet[i]))
-                    == null) //if the object is not there then add it
-                {
-                    LOG.info("Object is null, must add it");
-                    if (keySet[i + 1].matches("[0-9]*")) // if index then array
-                    {
-                        ((JSONArray) keySeriesObj)
-                            .put(Integer.parseInt(keySet[i]), new JSONArray());
-                    } else {
-                        ((JSONArray) keySeriesObj)
-                            .put(Integer.parseInt(keySet[i]), new JSONObject());
-                    }
-                }
-                keySeriesObj = ((JSONArray) keySeriesObj)
-                    .optJSONObject(Integer.parseInt(keySet[i]));
-                //log.info("ARRAY==" + keySeriesObj);
-            } else if (keySeriesObj instanceof JSONObject) {
-                if (((JSONObject) keySeriesObj).opt(keySet[i])
-                    == null) //if the object is not there then add it
-                {
-                    if (keySet[i + 1].matches("[0-9]*")) // if index then array
-                    {
-                        ((JSONObject) keySeriesObj).put(keySet[i], new JSONArray());
-                    } else {
-                        ((JSONObject) keySeriesObj).put(keySet[i], new JSONObject());
-                    }
-                    LOG.info("Object is null, must add it");
-                }
-                keySeriesObj = ((JSONObject) keySeriesObj).opt(keySet[i]);
-                //log.info("JSONObject==" + keySeriesObj);
-            } else {
-                LOG.info("unknown object==" + keySeriesObj);
-            }
-        }
-
-        ((JSONObject) keySeriesObj).put(keySet[keySet.length - 1], value);
-    }
-
-    private JSONObject event = new JSONObject();
-
-    private void loggerForCheckFilter(String filterValue, String key) {
-        LOG.info(filterValue + "==" + key + "==" + getEventObjectVal(key) + "==false");
-    }
+		    	
+		    	final String oldValue = getEventObjectVal(oldfsplit[0]).toString();
+		    	if (!oldValue.equals(OBJECT_NOT_FOUND)){
+		    		final String oldArrayName = oldfsplit[1].substring(1);
+		    		final String newArrayName = fsplit[1].substring(1);
+		    		final String value = oldValue.replaceAll(oldArrayName, newArrayName);
+		    		//log.info("oldArrayName ==" + oldArrayName);
+		    		//log.info("newArrayName ==" + newArrayName);
+		    		LOG.info("oldValue ==" + oldValue);
+			    	LOG.info("value ==" + value);
+			    	JSONArray ja = new JSONArray(value);
+			    	removeEventKey(oldfsplit[0]);
+			    	setEventObjectVal(fsplit[0], ja);
+		    	}
+	    	}
+	    	else
+	    		LOG.info("Filter not met");
+	    }
+	    
+	    /**
+	     * 
+	     */
+	   public void map(JSONObject J)
+	    {
+	    	//log.info("mapAttribute");
+	    	final String field = J.getString(FIELD);
+	    	if (field.contains("[]"))
+	    	{
+	    		if (field.matches(".*\\[\\]\\..*\\[\\]"))
+	    			renameArrayInArray(J);
+	    		else
+	    			mapToJArray(J);
+	    	}
+	    	else
+	    		mapAttribute(J);
+	    } 
+	    
+	    /**
+	     * 
+	     */
+	    public String performOperation(String operation, String value)
+	    {
+	    	LOG.info("performOperation");
+	    	if (operation != null)
+    		{
+    			if (operation.equals("convertMBtoKB"))
+    			{
+    				float kbValue = Float.parseFloat(value) * 1024;
+    				value = String.valueOf(kbValue);
+    			}
+    		}
+	    	return value;
+	    }
+	    
+	    /**
+	     * 
+	     */
+	    //public void mapAttributeToArrayAttribute(JSONObject J)
+	    public void mapAttribute(JSONObject J)
+	    {
+	    	//log.info("mapAttribute");
+	    	final String field = J.getString(FIELD);
+	    	final String oldField = J.getString(OLD_FIELD);
+	    	final JSONObject filter = J.optJSONObject(FILTER);
+	    	final String operation = J.optString("operation");
+	    	String value = "";
+	    	if (filter == null || isFilterMet(filter))
+	    	{
+		    	//log.info("field ==" + field);
+		    	
+		    	value = getEventObjectVal(oldField).toString();
+		    	if (!value.equals(OBJECT_NOT_FOUND))
+		    	{
+		    		if (operation != null && !operation.equals(""))
+		    			value = performOperation(operation, value);
+		    		//log.info("value ==" + value);
+		    		setEventObjectVal(field, value);
+		    	
+		    		removeEventKey(oldField);
+		    	}
+	    	}
+	    	else
+	    		LOG.info("Filter not met");
+	    }
+	    
+	    /**
+	     * 
+	     */
+	    public void mapToJArray(JSONObject J)
+	    {
+	    	LOG.info("mapToJArray");
+	    	String field = J.getString(FIELD);
+	    	String oldField = J.getString(OLD_FIELD);
+	    	final JSONObject filter = J.optJSONObject(FILTER);
+	    	final JSONObject attrMap = J.optJSONObject("attrMap");
+	    	oldField = oldField.replaceAll(REGEX, "");
+	    	field = field.replaceAll(REGEX, "");
+	  
+	    	//log.info("oldField ==" + field);
+	    	if (filter == null || isFilterMet(filter))
+	    	{
+		    	//log.info("oldField ==" + field);
+		    	String value = getEventObjectVal(oldField).toString();
+		    	if (!value.equals(OBJECT_NOT_FOUND))
+		    	{
+		    		LOG.info("old value ==" + value.toString());
+		    		//update old value based on attrMap
+		    		if (attrMap != null)
+		    		{
+		    			//loop thru attrMap and update attribute name to new name 
+		    			for (String key : attrMap.keySet())
+		    			{
+			    		//log.info("attr key==" + key + " value==" + attrMap.getString(key));
+				    	value = value.replaceAll(key, attrMap.getString(key));
+		    			}
+		    		}
+			    
+		    		LOG.info("new value ==" + value);
+		    		char c = value.charAt(0);
+		    		if (c != '[')
+		    		{
+		    			//oldfield is JsonObject
+		    			JSONObject valueJO = new JSONObject(value);
+		    			// if the array already exists
+			    	
+		    			String existingValue = getEventObjectVal(field).toString();
+		    			if (!existingValue.equals(OBJECT_NOT_FOUND))
+		    			{
+		    				JSONArray ja = new JSONArray(existingValue);
+		    				JSONObject jo = ja.optJSONObject(0);
+		    				if (jo != null)
+		    				{
+		    					for (String key : valueJO.keySet())
+		    					{
+		    						jo.put(key, valueJO.get(key));
+				    			
+		    					}
+		    					ja.put(0, jo);
+		    					//log.info("jarray== " + ja.toString());
+		    					setEventObjectVal(field,ja);
+		    				}
+		    			}
+		    			else //if new array
+		    			setEventObjectVal(field + "[0]", new JSONObject(value));
+		    		}
+		    		else //oldfield is jsonArray
+		    			setEventObjectVal(field, new JSONArray(value));	
+		    	
+		    		removeEventKey(oldField);
+		    	}
+	    	}
+	    	else
+	    		LOG.info("Filter not met");
+	    }
+	    
+	    /**
+	     * example -
+	       {
+	        	"functionName": "concatenateValue",
+	        	"args":{
+	        		"filter": {"event.commonEventHeader.event":"heartbeat"},
+	        		FIELD:"event.commonEventHeader.eventName",
+	        		"concatenate": ["event.commonEventHeader.domain","event.commonEventHeader.eventType","event.commonEventHeader.alarmCondition"],
+	        		"delimiter":"_"
+	        	}
+	    	}
+	    **/
+	    public void concatenateValue(JSONObject J)
+	    {
+	    	//log.info("concatenateValue");
+	    	final String field = J.getString(FIELD);
+	    	final String delimiter = J.getString("delimiter");
+	    	final JSONArray values = J.getJSONArray("concatenate");
+	    	final JSONObject filter = J.optJSONObject(FILTER);
+	    	if (filter == null || isFilterMet(filter))
+	    	{
+		    	String value = "";
+		    	for (int i=0; i < values.length(); i++)
+		    	{
+		    		//log.info(values.getString(i));
+		    		String tempVal = evaluate(values.getString(i));
+		    		if (!tempVal.equals(OBJECT_NOT_FOUND))
+		    		{
+		    			if (i ==0)
+		    			value = value + tempVal;
+		    			else
+		    			value = value + delimiter + tempVal;
+		    		}
+		    	}
+		    	//log.info("value ==" + value);
+		    	setEventObjectVal(field, value);
+	    	}
+	    	else
+	    		LOG.info("Filter not met");
+	    }
+	    
+	    public void subtractValue(JSONObject J)
+	    {
+	    	//log.info("concatenateValue");
+	    	final String field = J.getString(FIELD);
+	    	final JSONArray values = J.getJSONArray("subtract");
+	    	final JSONObject filter = J.optJSONObject(FILTER);
+	    	if (filter == null || isFilterMet(filter))
+	    	{
+		    	float value = 0;
+		    	for (int i=0; i < values.length(); i++)
+		    	{
+		    		LOG.info(values.getString(i));
+		    		String tempVal = evaluate(values.getString(i));
+		    		LOG.info("tempVal==" + tempVal);
+		    		if (!tempVal.equals(OBJECT_NOT_FOUND))
+		    		{
+		    			if (i ==0)
+		    			value = value + Float.valueOf(tempVal);
+		    			else
+		    			value = value - Float.valueOf(tempVal);
+		    		}
+		    	}
+		    	LOG.info("value ==" + value );
+		    	setEventObjectVal(field, value, "number");
+	    	}
+	    	else
+	    		LOG.info("Filter not met");
+	    }
+	    
+	    /**
+	     * 
+	     */
+	    private void removeEventKey(String field)
+	    {
+	    	String[] keySet = field.split("\\.",field.length());
+	    	JSONObject keySeries = event;
+	    	for (int i=0; i<(keySet.length -1); i++ )
+	    	{
+	    		//log.info( i + " ==" + keySet[i]);
+	    		keySeries = keySeries.getJSONObject(keySet[i]);
+	    	}
+	    	//log.info(keySet[keySet.length -1]);
+	    	
+	    	keySeries.remove(keySet[keySet.length -1]);
+	    	
+	    }
+	    
+	    /**
+	     * 
+	     */
+	    private boolean checkFilter(JSONObject jo, String key, String logicKey)
+	    {
+	    	String filterValue = jo.getString(key);
+	    	boolean retVal = true;
+	    	
+			if(filterValue.contains(":"))
+			{
+				String[] splitVal = filterValue.split(":");
+				//log.info(splitVal[0] + " " + splitVal[1]);
+				if (splitVal[0].equals("matches"))
+				{
+					if (logicKey.equals("not"))
+					{
+						//log.info("not");
+						//log.info(filterValue + "==" + key + "==" + getEventObjectVal(key) + "split1==" + splitVal[1]);
+						if (getEventObjectVal(key).toString().matches(splitVal[1]))
+						{
+							LOG.info(filterValue + "==" + key + "==" + getEventObjectVal(key) + "==false");
+							return false;
+						}
+					}
+					else
+					{
+						if (!(getEventObjectVal(key).toString().matches(splitVal[1])))
+						{
+							LOG.info(filterValue + "==" + key + "==" + getEventObjectVal(key) + "==false");
+							return false;
+						}
+					}
+						
+				}
+				if (splitVal[0].equals("contains"))
+				{
+					if (logicKey.equals("not"))
+					{
+						//log.info("not");
+						//log.info(filterValue + "==" + key + "==" + getEventObjectVal(key) + "split1==" + splitVal[1]);
+						if (getEventObjectVal(key).toString().contains(splitVal[1]))
+						{
+							LOG.info(filterValue + "==" + key + "==" + getEventObjectVal(key) + "==false");
+							return false;
+						}
+					}
+					else
+					{
+						if (!(getEventObjectVal(key).toString().contains(splitVal[1])))
+						{
+							LOG.info(filterValue + "==" + key + "==" + getEventObjectVal(key) + "==false");
+							return false;
+						}
+					}
+						
+				}
+			}
+			else 
+			{
+				if (logicKey.equals("not"))
+				{
+					if(getEventObjectVal(key).toString().equals(filterValue))
+					{
+						LOG.info(filterValue + "==" + key + "==" + getEventObjectVal(key) + "==false");
+						return false;
+					}
+				}
+				else
+				{
+					if(!(getEventObjectVal(key).toString().equals(filterValue)))
+	    			{
+	    				LOG.info(filterValue + "==" + key + "==" + getEventObjectVal(key) + "==false");
+	    				return false;
+	    			}
+				}
+			}
+			return retVal;
+	    }
+	    /**
+	     * 
+	     */
+	    public boolean isFilterMet(JSONObject jo)
+	    {
+	    	boolean retval = true;
+	    	//log.info("Filter==" + jo.toString());
+	    	for (String key : jo.keySet())
+	    	{		
+	    		if (key.equals("not"))
+	    		{
+	    			JSONObject njo = jo.getJSONObject(key);
+	    			for (String njoKey : njo.keySet())
+	    			{
+	    				//log.info(njoKey);
+	    				retval = checkFilter(njo, njoKey, key);
+	    				if (retval == false)
+	    					return retval;
+	    			}
+	    		}
+	    		else 
+	    		{
+	    			//log.info(key);
+	    			//final String filterKey = key;
+	    			retval = checkFilter(jo, key, key);
+	    			if (retval == false)
+    					return retval;
+	    		}
+	    	}
+	    	return true;
+	    }
+	    
+	    /**
+		* returns a string or JSONObject or JSONArray
+		**/
+	    public Object getEventObjectVal(String keySeriesStr)
+	    {
+	    	keySeriesStr = keySeriesStr.replaceAll("\\[", ".");
+	    	keySeriesStr = keySeriesStr.replaceAll("\\]", ".");
+	    	if (keySeriesStr.contains(".."))
+	    	{
+	    		keySeriesStr = keySeriesStr.replaceAll("\\.\\.", ".");
+	    	}
+	    	//log.info(Integer.toString(keySeriesStr.lastIndexOf(".")));
+	    	//log.info(Integer.toString(keySeriesStr.length() -1));
+	    	if (keySeriesStr.lastIndexOf(".") == keySeriesStr.length() -1 )
+	    		keySeriesStr = keySeriesStr.substring(0,keySeriesStr.length()-1 );
+	    	String[] keySet = keySeriesStr.split("\\.", keySeriesStr.length());
+	    	Object keySeriesObj = event;
+	    	for (int i=0; i<(keySet.length); i++ )
+	    	{
+	    		//log.info( "getEventObject " + i + " ==" + keySet[i]);
+	    		if (keySeriesObj != null)
+	    		{
+	    			if (keySeriesObj instanceof String)
+	    			{
+	    				//keySeriesObj =  keySeriesObj.get(keySet[i]);
+	    				LOG.info("STRING==" + keySeriesObj);
+	    			}
+	    			else if (keySeriesObj instanceof JSONArray) {
+	    				keySeriesObj =  ((JSONArray) keySeriesObj).optJSONObject(Integer.parseInt(keySet[i]));
+	    				//log.info("ARRAY==" + keySeriesObj);
+	    			}
+	    			else if (keySeriesObj instanceof JSONObject) {
+	    				keySeriesObj =  ( (JSONObject) keySeriesObj).opt(keySet[i]);
+	    				//log.info("JSONObject==" + keySeriesObj);
+	    			}
+	    			else
+	    			{
+	    				LOG.info("unknown object==" + keySeriesObj);
+	    			}
+	    		}
+	    	}
+	    	
+	    	if (keySeriesObj == null)
+	    		return OBJECT_NOT_FOUND;
+	    	return keySeriesObj;
+	    }
+	    
+	    public void setEventObjectVal(String keySeriesStr, Object value)
+	    {
+	    	setEventObjectVal(keySeriesStr, value, "string");
+	    }
+	    
+	    /**
+		* returns a string or JSONObject or JSONArray
+		**/
+	    public void setEventObjectVal(String keySeriesStr, Object value, String fieldType)
+	    {
+	    	keySeriesStr = keySeriesStr.replaceAll("\\[", ".");
+	    	keySeriesStr = keySeriesStr.replaceAll("\\]", ".");
+	    	if (keySeriesStr.contains(".."))
+	    	{
+	    		keySeriesStr = keySeriesStr.replaceAll("\\.\\.", ".");
+	    	}
+	    	LOG.info("fieldType==" + fieldType);
+	    	//log.info(Integer.toString(keySeriesStr.lastIndexOf(".")));
+	    	//log.info(Integer.toString(keySeriesStr.length() -1));
+	    	if (keySeriesStr.lastIndexOf(".") == keySeriesStr.length() -1 )
+	    		keySeriesStr = keySeriesStr.substring(0,keySeriesStr.length()-1 );
+	    	String[] keySet = keySeriesStr.split("\\.", keySeriesStr.length());
+	    	Object keySeriesObj = event;
+	    	for (int i=0; i<(keySet.length -1); i++ )
+	    	{
+	    		//log.info( "setEventObject " + i + " ==" + keySet[i]);	    	
+	    		if (keySeriesObj instanceof JSONArray) {
+	    			//keySeriesObj =  ((JSONArray) keySeriesObj).optJSONObject(Integer.parseInt(keySet[i]));
+	    			if (((JSONArray) keySeriesObj).optJSONObject(Integer.parseInt(keySet[i])) == null) //if the object is not there then add it
+	    			{
+	    				LOG.info("Object is null, must add it");
+	    				if (keySet[i+1].matches("[0-9]*")) // if index then array
+	    					((JSONArray) keySeriesObj).put(Integer.parseInt(keySet[i]), new JSONArray());
+	    				else
+	    				((JSONArray) keySeriesObj).put(Integer.parseInt(keySet[i]), new JSONObject());
+	    			}
+	    			keySeriesObj =  ((JSONArray) keySeriesObj).optJSONObject(Integer.parseInt(keySet[i]));	
+	    			//log.info("ARRAY==" + keySeriesObj);
+	    		}
+	    		else if (keySeriesObj instanceof JSONObject) {
+	    			if (( (JSONObject) keySeriesObj).opt(keySet[i]) == null) //if the object is not there then add it
+	    			{
+	    				if (keySet[i+1].matches("[0-9]*")) // if index then array
+	    					((JSONObject) keySeriesObj).put(keySet[i], new JSONArray());
+	    				else
+	    					((JSONObject) keySeriesObj).put(keySet[i], new JSONObject());
+	    				LOG.info("Object is null, must add it");
+	    			}
+	    			keySeriesObj =  ( (JSONObject) keySeriesObj).opt(keySet[i]);
+	    			//log.info("JSONObject==" + keySeriesObj);
+	    		}
+	    		else
+	    		{
+	    			LOG.info("unknown object==" + keySeriesObj);
+	    		}
+	    	}
+	    	if (fieldType.equals("number") )
+	    	{
+	    		DecimalFormat df = new DecimalFormat("#.0");
+	    		if (value instanceof String)
+	    			((JSONObject)keySeriesObj).put(keySet[keySet.length -1], Float.valueOf(df.format(Float.valueOf((String) value))));
+	    		else
+	    			((JSONObject)keySeriesObj).put(keySet[keySet.length -1], Float.valueOf(df.format(value)));
+	    	}
+	    	else if (fieldType.equals("integer") && value instanceof String)
+	    		((JSONObject)keySeriesObj).put(keySet[keySet.length -1], Integer.valueOf((String) value));
+	    	else
+	    		((JSONObject)keySeriesObj).put(keySet[keySet.length -1], value);
+	    }
+	    private JSONObject event = new JSONObject();
 }
+
diff --git a/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java b/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
index 64af1cb8..2bc5e45b 100644
--- a/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
+++ b/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
@@ -46,7 +46,7 @@ public class EventProcessor implements Runnable {
     private static final String COMMON_EVENT_HEADER = "commonEventHeader";
 
     private static HashMap<String, String[]> streamid_hash = new HashMap<String, String[]>();
-    private JSONObject event;
+    public JSONObject event;
 
     public EventProcessor() {
         log.debug("EventProcessor: Default Constructor");
diff --git a/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java b/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java
index c519d076..7134f3c2 100644
--- a/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java
+++ b/src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java
@@ -39,8 +39,8 @@ public class LoadDynamicConfig {
 
     private static final Logger log = LoggerFactory.getLogger(LoadDynamicConfig.class);
 
-    static String propFile = "collector.properties";
-    static String configFile = "/opt/app/KV-Configuration.json";
+    public static String propFile = "collector.properties";
+    public static String configFile = "/opt/app/KV-Configuration.json";
     static String url;
     static String retString;
 
@@ -103,33 +103,6 @@ public class LoadDynamicConfig {
 
     }
 
-    public static String executecurl(String url) {
-
-        String[] command = {"curl", "-v", url};
-        ProcessBuilder process = new ProcessBuilder(command);
-        Process p;
-        String result = null;
-        try {
-            p = process.start();
-
-            InputStreamReader ipr = new InputStreamReader(p.getInputStream());
-            BufferedReader reader = new BufferedReader(ipr);
-            StringBuilder builder = new StringBuilder();
-            String line = null;
-
-            while ((line = reader.readLine()) != null) {
-                builder.append(line);
-            }
-            result = builder.toString();
-            log.info(result);
-
-        } catch (IOException e) {
-            log.error("error" + e.getLocalizedMessage(), e);
-        }
-        return result;
-
-    }
-
     public static String readFile(String filename) {
         String result = "";
         try (BufferedReader br = new BufferedReader(new FileReader(filename))) {