summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/onap/dcae/commonFunction/CommonStartup.java4
-rw-r--r--src/main/java/org/onap/dcae/commonFunction/ConfigProcessors.java1154
-rw-r--r--src/main/java/org/onap/dcae/commonFunction/CustomExceptionLoader.java159
-rw-r--r--src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java16
-rw-r--r--src/main/java/org/onap/dcae/commonFunction/EventProcessor.java2
-rw-r--r--src/main/java/org/onap/dcae/controller/LoadDynamicConfig.java36
-rw-r--r--src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java213
7 files changed, 851 insertions, 733 deletions
diff --git a/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java b/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java
index f66a26de..e782a1aa 100644
--- a/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java
+++ b/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java
@@ -124,7 +124,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)
@@ -331,7 +331,7 @@ public class CommonStartup extends NsaBaseEndpoint implements Runnable {
return result;
}
- static LinkedBlockingQueue<JSONObject> fProcessingInputQueue;
+ public static LinkedBlockingQueue<JSONObject> fProcessingInputQueue;
private static ApiServer fTomcatServer = null;
private static final Logger LOG = LoggerFactory.getLogger(CommonStartup.class);
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/CustomExceptionLoader.java b/src/main/java/org/onap/dcae/commonFunction/CustomExceptionLoader.java
index 0ed39710..c6666d63 100644
--- a/src/main/java/org/onap/dcae/commonFunction/CustomExceptionLoader.java
+++ b/src/main/java/org/onap/dcae/commonFunction/CustomExceptionLoader.java
@@ -20,31 +20,33 @@
package org.onap.dcae.commonFunction;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+
+import java.util.Map.Entry;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonIOException;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonSyntaxException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map.Entry;
public class CustomExceptionLoader {
- public static HashMap<String, JsonArray> map;
- private static final Logger log = LoggerFactory.getLogger(CustomExceptionLoader.class);
-
+ protected static HashMap<String, JsonArray> map = null;
+ private static final Logger log = LoggerFactory.getLogger ( CustomExceptionLoader.class );
+
//For standalone test
//LoadMap Invoked from servletSetup
/*
- public static void main(String[] args) {
+ public static void main(String[] args) {
System.out.println("CustomExceptionLoader.main --> Arguments -- ExceptionConfig file: " + args[0] + "StatusCode:" + args[1]+ " Error Msg:" + args[2]);
CommonStartup.exceptionConfig = args[0];
@@ -60,73 +62,72 @@ public class CustomExceptionLoader {
}
*/
+
+ public static void LoadMap () {
+
+ map = new HashMap<String, JsonArray>();
+ FileReader fr = null;
+ try {
+ JsonElement root = null;
+ fr = new FileReader(CommonStartup.exceptionConfig);
+ root = new JsonParser().parse(fr);
+ JsonObject jsonObject = root.getAsJsonObject().get("code").getAsJsonObject();
+
+ for (Entry<String, JsonElement> entry : jsonObject.entrySet()) {
+ map.put(entry.getKey(), (JsonArray) entry.getValue());
+ }
+
+ log.debug("CustomExceptionLoader.LoadMap --> Map loaded - " + map);
+ } catch (JsonIOException e) {
+ e.printStackTrace();
+ } catch (JsonSyntaxException e) {
+ e.printStackTrace();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ finally {
+ if (fr != null) {
+ try {
+ fr.close();
+ } catch (IOException e) {
+ log.error("Error closing file reader stream : " +e.toString());
+ }
+ }
+ }
+ }
- public static void LoadMap() {
-
- map = new HashMap<String, JsonArray>();
- FileReader fr = null;
- try {
- JsonElement root = null;
- fr = new FileReader(CommonStartup.exceptionConfig);
- root = new JsonParser().parse(fr);
- JsonObject jsonObject = root.getAsJsonObject().get("code").getAsJsonObject();
-
- for (Entry<String, JsonElement> entry : jsonObject.entrySet()) {
- map.put(entry.getKey(), (JsonArray) entry.getValue());
- }
-
- log.debug("CustomExceptionLoader.LoadMap --> Map loaded - " + map);
- fr.close();
- } catch (JsonIOException e) {
- log.error("json IO exception occured " + e.getLocalizedMessage(), e);
- } catch (JsonSyntaxException e) {
- log.error("JsonSyntaxException occured " + e.getLocalizedMessage(), e);
- } catch (FileNotFoundException e) {
- log.error("FileNotFoundException occured " + e.getLocalizedMessage(), e);
- } catch (Exception e) {
- log.error("exception occured " + e.getLocalizedMessage(), e);
- } finally {
- if (fr != null) {
- try {
- fr.close();
- } catch (IOException e) {
- log.error("Error closing file reader stream : " + e.getLocalizedMessage(), e);
- }
- }
- }
- }
-
- public static String[] LookupMap(String error, String errorMsg) {
-
- String[] retarray = null;
-
- log.debug("CustomExceptionLoader.LookupMap -->" + " HTTP StatusCode:" + error + " Msg:"
- + errorMsg);
- try {
-
- JsonArray jarray = map.get(error);
- for (int i = 0; i < jarray.size(); i++) {
-
- JsonElement val = jarray.get(i).getAsJsonObject().get("Reason");
- JsonArray ec = (JsonArray) jarray.get(i).getAsJsonObject().get("ErrorCode");
- log.trace("CustomExceptionLoader.LookupMap Parameter -> Error msg : " + errorMsg
- + " Reason text being matched:" + val);
- if (errorMsg.contains(val.toString().replace("\"", ""))) {
- log.trace(
- "CustomExceptionLoader.LookupMap Successful! Exception matched to error message StatusCode:"
- + ec.get(0) + "ErrorMessage:" + ec.get(1));
- retarray = new String[2];
- retarray[0] = ec.get(0).toString();
- retarray[1] = ec.get(1).toString();
- return retarray;
- }
- }
-
- } catch (Exception e) {
- System.out.println(e.getMessage());
- }
-
- return retarray;
- }
+ public static String[] LookupMap (String error, String errormsg) {
+
+ String[] retarray = null;
+
+ log.debug("CustomExceptionLoader.LookupMap -->" + " HTTP StatusCode:" + error + " Msg:" + errormsg);
+ try{
+
+ JsonArray jarray = map.get(error);
+ for (int i = 0; i < jarray.size(); i++) {
+
+ JsonElement val = jarray.get(i).getAsJsonObject().get("Reason");
+ JsonArray ec = (JsonArray) jarray.get(i).getAsJsonObject().get("ErrorCode");
+ log.trace("CustomExceptionLoader.LookupMap Parameter -> Error msg : " + errormsg + " Reason text being matched:" + val);
+ if (errormsg.contains(val.toString().replace("\"", ""))){
+ log.trace("CustomExceptionLoader.LookupMap Successful! Exception matched to error message StatusCode:" + ec.get(0).toString() + "ErrorMessage:" + ec.get(1).toString());
+ retarray = new String[2];
+ retarray[0]=ec.get(0).toString();
+ retarray[1]=ec.get(1).toString();
+ return retarray;
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ System.out.println(e.getMessage());
+ }
+
+ return retarray;
+ }
}
+
diff --git a/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java b/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
index 971d61ab..cb4e3af6 100644
--- a/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
+++ b/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
@@ -46,8 +46,8 @@ public class DmaapPropertyReader {
private static final String CAMBRIA_HOSTS = "cambria.hosts";
private static final String USER = " USER:";
private static final String PWD = " PWD:";
- private static final String BASIC_AUTH_PASSWORD = "basicAuthPassword";
- private static final String BASIC_AUTH_USERNAME = "basicAuthUsername";
+ private static final String BA_PWD = "basicAuthPassword";
+ private static final String BA_UNAME = "basicAuthUsername";
public HashMap<String, String> dmaap_hash = new HashMap<String, String>();
@@ -68,8 +68,8 @@ public class DmaapPropertyReader {
jsonObject.get(i).getAsJsonObject().get("cambria.topic"), HOST_URL,
jsonObject.get(i).getAsJsonObject().get(CAMBRIA_URL),
jsonObject.get(i).getAsJsonObject().get(CAMBRIA_HOSTS), PWD,
- jsonObject.get(i).getAsJsonObject().get(BASIC_AUTH_PASSWORD), USER,
- jsonObject.get(i).getAsJsonObject().get(BASIC_AUTH_USERNAME),
+ jsonObject.get(i).getAsJsonObject().get(BA_PWD), USER,
+ jsonObject.get(i).getAsJsonObject().get(BA_UNAME),
jsonObject.get(i).getAsJsonObject().get("name")));
String convertedname = jsonObject.get(i).getAsJsonObject().get("name")
@@ -88,15 +88,15 @@ public class DmaapPropertyReader {
jsonObject.get(i).getAsJsonObject().get(CAMBRIA_URL).toString()
.replace("\"", ""));
}
- if (jsonObject.get(i).getAsJsonObject().get(BASIC_AUTH_PASSWORD) != null) {
+ if (jsonObject.get(i).getAsJsonObject().get(BA_PWD) != null) {
dmaap_hash.put(convertedname + ".basicAuthPassword",
jsonObject.get(i).getAsJsonObject()
- .get(BASIC_AUTH_PASSWORD).toString().replace("\"", ""));
+ .get(BA_PWD).toString().replace("\"", ""));
}
- if (jsonObject.get(i).getAsJsonObject().get(BASIC_AUTH_USERNAME) != null) {
+ if (jsonObject.get(i).getAsJsonObject().get(BA_UNAME) != null) {
dmaap_hash.put(convertedname + ".basicAuthUsername",
jsonObject.get(i).getAsJsonObject()
- .get(BASIC_AUTH_USERNAME).toString().replace("\"", ""));
+ .get(BA_UNAME).toString().replace("\"", ""));
}
}
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..a28bca86 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 String propFile = "collector.properties";
+ public String configFile = "/opt/app/KV-Configuration.json";
static String url;
static String retString;
@@ -60,11 +60,12 @@ public class LoadDynamicConfig {
try {
- String jsonData = readFile(configFile);
+ LoadDynamicConfig lc = new LoadDynamicConfig();
+ String jsonData = readFile(lc.configFile);
JSONObject jsonObject = new JSONObject(jsonData);
PropertiesConfiguration conf;
- conf = new PropertiesConfiguration(propFile);
+ conf = new PropertiesConfiguration(lc.propFile);
conf.setEncoding(null);
// update properties based on consul dynamic configuration
@@ -103,33 +104,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))) {
diff --git a/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java b/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java
index babb184b..fee9ce1c 100644
--- a/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java
+++ b/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java
@@ -21,6 +21,17 @@
package org.onap.dcae.restapi;
+import java.io.IOException;
+import java.net.URL;
+
+import javax.servlet.ServletException;
+
+import org.apache.tomcat.util.codec.binary.Base64;
+import org.onap.dcae.commonFunction.CommonStartup;
+import org.onap.dcae.commonFunction.VESLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.att.nsa.apiServer.CommonServlet;
import com.att.nsa.configs.ConfigDbException;
import com.att.nsa.drumlin.service.framework.DrumlinErrorHandler;
@@ -32,97 +43,119 @@ import com.att.nsa.drumlin.till.nv.rrNvReadable;
import com.att.nsa.drumlin.till.nv.rrNvReadable.loadException;
import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;
import com.att.nsa.security.NsaAuthenticator;
+
import com.att.nsa.security.authenticators.SimpleAuthenticator;
import com.att.nsa.security.db.simple.NsaSimpleApiKey;
-import org.apache.tomcat.util.codec.binary.Base64;
-import org.onap.dcae.commonFunction.CommonStartup;
-import org.onap.dcae.commonFunction.VESLogger;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.net.URL;
-import javax.servlet.ServletException;
-
-public class RestfulCollectorServlet extends CommonServlet {
-
- String authid;
- String authpwd;
- String authlist;
-
- public RestfulCollectorServlet(rrNvReadable settings) throws loadException, missingReqdSetting {
- super(settings, "collector", false);
- authid = settings.getString(CommonStartup.kSetting_authid, null);
- if (authid != null) {
- String authpwdtemp = settings.getString(CommonStartup.kSetting_authpwd, null);
- authpwd = new String(Base64.decodeBase64(authpwdtemp));
- }
- authlist = settings.getString(CommonStartup.kSetting_authlist, null);
- }
-
-
- /**
- * This is called once at server start. Use it to init any shared objects and setup the route mapping.
- */
- @Override
- protected void servletSetup()
- throws rrNvReadable.missingReqdSetting, rrNvReadable.invalidSettingValue, ServletException {
- super.servletSetup();
-
- try {
- // the base class provides a bunch of things like API authentication and ECOMP compliant
- // logging. The Restful Collector likely doesn't need API authentication, so for now,
- // we init the base class services with an in-memory (and empty!) config DB.
- commonServletSetup(ConfigDbType.MEMORY);
-
- VESLogger.setUpEcompLogging();
-
- // setup the servlet routing and error handling
- final DrumlinRequestRouter drr = getRequestRouter();
-
- // you can tell the request router what to do when a particular kind of exception is thrown.
- drr.setHandlerForException(IllegalArgumentException.class, new DrumlinErrorHandler() {
- @Override
- public void handle(DrumlinRequestContext ctx, Throwable cause) {
- sendJsonReply(ctx, HttpStatusCodes.k400_badRequest, cause.getMessage());
- }
- });
-
- // load the routes from the config file
- final URL routes = findStream("routes.conf");
- if (routes == null) {
- throw new rrNvReadable.missingReqdSetting("No routing configuration.");
- }
- final DrumlinPlayishRoutingFileSource drs = new DrumlinPlayishRoutingFileSource(routes);
- drr.addRouteSource(drs);
-
- if (CommonStartup.authflag > 0) {
- NsaAuthenticator<NsaSimpleApiKey> nsaAuth = new SimpleAuthenticator();
- if (authlist != null) {
- String[] authpair = authlist.split("\\|");
- for (String pair : authpair) {
- String[] lineid = pair.split(",");
- String listauthid = lineid[0];
- String listauthpwd = new String(Base64.decodeBase64(lineid[1]));
- ((SimpleAuthenticator) nsaAuth).add(listauthid, listauthpwd);
- }
-
- } else if (authid != null) {
- ((SimpleAuthenticator) nsaAuth).add(authid, authpwd);
- } else {
- //add a default test account
- ((SimpleAuthenticator) nsaAuth).add("admin", "collectorpasscode");
- }
- this.getSecurityManager().addAuthenticator(nsaAuth);
- }
-
- log.info("Restful Collector Servlet is up.");
- } catch (SecurityException | IOException | ConfigDbException e) {
- throw new ServletException(e);
- }
- }
-
-
- private static final long serialVersionUID = 1L;
- private static final Logger log = LoggerFactory.getLogger(RestfulCollectorServlet.class);
+public class RestfulCollectorServlet extends CommonServlet
+{
+ String authid;
+ String authpwd;
+ public String authlist;
+
+ public RestfulCollectorServlet ( rrNvReadable settings ) throws loadException, missingReqdSetting
+ {
+ super ( settings, "collector", false );
+ authid = settings.getString(CommonStartup.kSetting_authid,null);
+ if (authid != null)
+ {
+ String authpwdtemp = settings.getString(CommonStartup.kSetting_authpwd,null);
+ authpwd = new String(Base64.decodeBase64(authpwdtemp));
+ }
+ authlist = settings.getString(CommonStartup.kSetting_authlist,null);
+ }
+
+
+
+
+ /**
+ * This is called once at server start. Use it to init any shared objects and setup the route mapping.
+ */
+ @Override
+ protected void servletSetup () throws rrNvReadable.missingReqdSetting, rrNvReadable.invalidSettingValue, ServletException
+ {
+ super.servletSetup ();
+
+ try
+ {
+ // the base class provides a bunch of things like API authentication and ECOMP compliant
+ // logging. The Restful Collector likely doesn't need API authentication, so for now,
+ // we init the base class services with an in-memory (and empty!) config DB.
+ commonServletSetup ( ConfigDbType.MEMORY );
+
+ VESLogger.setUpEcompLogging();
+
+ // setup the servlet routing and error handling
+ final DrumlinRequestRouter drr = getRequestRouter ();
+
+ // you can tell the request router what to do when a particular kind of exception is thrown.
+ drr.setHandlerForException( IllegalArgumentException.class, new DrumlinErrorHandler()
+ {
+ @Override
+ public void handle ( DrumlinRequestContext ctx, Throwable cause )
+ {
+ sendJsonReply ( ctx, HttpStatusCodes.k400_badRequest, cause.getMessage() );
+ }
+ });
+
+ // load the routes from the config file
+ final URL routes = findStream ( "routes.conf" );
+ if ( routes == null ) throw new rrNvReadable.missingReqdSetting ( "No routing configuration." );
+ final DrumlinPlayishRoutingFileSource drs = new DrumlinPlayishRoutingFileSource ( routes );
+ drr.addRouteSource ( drs );
+
+ if (CommonStartup.authflag > 0) {
+ NsaAuthenticator<NsaSimpleApiKey> NsaAuth;
+ NsaAuth = AuthlistHandler(authlist);
+
+ this.getSecurityManager().addAuthenticator(NsaAuth);
+ }
+
+ log.info ( "Restful Collector Servlet is up." );
+ }
+ catch ( SecurityException e )
+ {
+ throw new ServletException ( e );
+ }
+ catch ( IOException e )
+ {
+ throw new ServletException ( e );
+ }
+ catch ( ConfigDbException e )
+ {
+ throw new ServletException ( e );
+ }
+ }
+
+ public NsaAuthenticator<NsaSimpleApiKey> AuthlistHandler (String authlist)
+ {
+ NsaAuthenticator<NsaSimpleApiKey> NsaAuth = new SimpleAuthenticator ();
+ if (authlist != null)
+ {
+ String authpair[] = authlist.split("\\|");
+ for (String pair: authpair) {
+ String lineid[] = pair.split(",");
+ String listauthid = lineid[0];
+ String listauthpwd = new String(Base64.decodeBase64(lineid[1]));
+ ((SimpleAuthenticator) NsaAuth).add(listauthid,listauthpwd);
+ }
+
+ }
+ else if (authid != null)
+ {
+ ((SimpleAuthenticator) NsaAuth).add(authid,authpwd);
+ }
+ else
+ {
+ //add a default test account
+ ((SimpleAuthenticator) NsaAuth).add("admin","collectorpasscode");
+ }
+ return NsaAuth;
+
+ }
+
+
+ private static final long serialVersionUID = 1L;
+ private static final Logger log = LoggerFactory.getLogger ( RestfulCollectorServlet.class );
}
+