Merge "Conform ccsdk/sli/plugins to ONAP Style"

10 files changed, 1202 insertions, 1200 deletions

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java
index f22aa0b39..4de4a34d7 100644
--- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java
@@ -34,52 +34,52 @@ import org.slf4j.LoggerFactory;
 
 public class JsonParser {
 
-	private static final Logger log = LoggerFactory.getLogger(JsonParser.class);
-
-	@SuppressWarnings("unchecked")
-	public static Map<String, String> convertToProperties(String s) throws JSONException {
-		JSONObject json = new JSONObject(s);
-
-		Map<String, Object> wm = new HashMap<String, Object>();
-		Iterator<String> ii = json.keys();
-		while (ii.hasNext()) {
-			String key1 = ii.next();
-			wm.put(key1, json.get(key1));
-		}
-
-		Map<String, String> mm = new HashMap<String, String>();
-
-		while (!wm.isEmpty())
-			for (String key : new ArrayList<>(wm.keySet())) {
-				Object o = wm.get(key);
-				wm.remove(key);
-
-				if (o instanceof Boolean || o instanceof Number || o instanceof String) {
-					mm.put(key, o.toString());
-
-					log.info("Added property: " + key + ": " + o.toString());
-				}
-
-				else if (o instanceof JSONObject) {
-					JSONObject jo = (JSONObject) o;
-					Iterator<String> i = jo.keys();
-					while (i.hasNext()) {
-						String key1 = i.next();
-						wm.put(key + "." + key1, jo.get(key1));
-					}
-				}
-
-				else if (o instanceof JSONArray) {
-					JSONArray ja = (JSONArray) o;
-					mm.put(key + "_length", String.valueOf(ja.length()));
-
-					log.info("Added property: " + key + "_length" + ": " + String.valueOf(ja.length()));
-
-					for (int i = 0; i < ja.length(); i++)
-						wm.put(key + '[' + i + ']', ja.get(i));
-				}
-			}
-
-		return mm;
-	}
+    private static final Logger log = LoggerFactory.getLogger(JsonParser.class);
+
+    @SuppressWarnings("unchecked")
+    public static Map<String, String> convertToProperties(String s) throws JSONException {
+        JSONObject json = new JSONObject(s);
+
+        Map<String, Object> wm = new HashMap<String, Object>();
+        Iterator<String> ii = json.keys();
+        while (ii.hasNext()) {
+            String key1 = ii.next();
+            wm.put(key1, json.get(key1));
+        }
+
+        Map<String, String> mm = new HashMap<String, String>();
+
+        while (!wm.isEmpty())
+            for (String key : new ArrayList<>(wm.keySet())) {
+                Object o = wm.get(key);
+                wm.remove(key);
+
+                if (o instanceof Boolean || o instanceof Number || o instanceof String) {
+                    mm.put(key, o.toString());
+
+                    log.info("Added property: " + key + ": " + o.toString());
+                }
+
+                else if (o instanceof JSONObject) {
+                    JSONObject jo = (JSONObject) o;
+                    Iterator<String> i = jo.keys();
+                    while (i.hasNext()) {
+                        String key1 = i.next();
+                        wm.put(key + "." + key1, jo.get(key1));
+                    }
+                }
+
+                else if (o instanceof JSONArray) {
+                    JSONArray ja = (JSONArray) o;
+                    mm.put(key + "_length", String.valueOf(ja.length()));
+
+                    log.info("Added property: " + key + "_length" + ": " + String.valueOf(ja.length()));
+
+                    for (int i = 0; i < ja.length(); i++)
+                        wm.put(key + '[' + i + ']', ja.get(i));
+                }
+            }
+
+        return mm;
+    }
 }
diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java
index ef3145552..fb7722686 100644
--- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java
@@ -61,25 +61,25 @@ import com.sun.jersey.client.urlconnection.HTTPSProperties;
 
 public class RestapiCallNode implements SvcLogicJavaPlugin {
 
-	private static final Logger log = LoggerFactory.getLogger(RestapiCallNode.class);
+    private static final Logger log = LoggerFactory.getLogger(RestapiCallNode.class);
 
-	private String uebServers;
-	private String defaultUebTemplateFileName = "/opt/bvc/restapi/templates/default-ueb-message.json";
-	protected RetryPolicyStore retryPolicyStore;
+    private String uebServers;
+    private String defaultUebTemplateFileName = "/opt/bvc/restapi/templates/default-ueb-message.json";
+    protected RetryPolicyStore retryPolicyStore;
 
-	protected RetryPolicyStore getRetryPolicyStore() {
-		return retryPolicyStore;
-	}
+    protected RetryPolicyStore getRetryPolicyStore() {
+        return retryPolicyStore;
+    }
 
-	public void setRetryPolicyStore(RetryPolicyStore retryPolicyStore) {
-		this.retryPolicyStore = retryPolicyStore;
-	}
+    public void setRetryPolicyStore(RetryPolicyStore retryPolicyStore) {
+        this.retryPolicyStore = retryPolicyStore;
+    }
 
-	public RestapiCallNode() {
+    public RestapiCallNode() {
 
-	}
+    }
 
-	 /**
+     /**
      * Allows Directed Graphs  the ability to interact with REST APIs.
      * @param parameters HashMap<String,String> of parameters passed by the DG to this function
      * <table border="1">
@@ -106,654 +106,655 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
      * @since 11.0.2
      * @see String#split(String, int)
      */
-	public void sendRequest(Map<String, String> paramMap, SvcLogicContext ctx) throws SvcLogicException {
-		sendRequest(paramMap, ctx, null);
-	}
-
-	public void sendRequest(Map<String, String> paramMap, SvcLogicContext ctx, Integer retryCount)
-	        throws SvcLogicException {
-
-		RetryPolicy retryPolicy = null;
-		HttpResponse r = null;
-		try {
-			Parameters p = getParameters(paramMap);
-			if (p.partner != null) {
-				retryPolicy = retryPolicyStore.getRetryPolicy(p.partner);
-			}
-			String pp = p.responsePrefix != null ? p.responsePrefix + '.' : "";
-
-			String req = null;
-			if (p.templateFileName != null) {
-				String reqTemplate = readFile(p.templateFileName);
-				req = buildXmlJsonRequest(ctx, reqTemplate, p.format);
-			}
-			r = sendHttpRequest(req, p);
-			setResponseStatus(ctx, p.responsePrefix, r);
-
-			if (p.dumpHeaders && r.headers != null) {
+    public void sendRequest(Map<String, String> paramMap, SvcLogicContext ctx) throws SvcLogicException {
+        sendRequest(paramMap, ctx, null);
+    }
+
+    public void sendRequest(Map<String, String> paramMap, SvcLogicContext ctx, Integer retryCount)
+            throws SvcLogicException {
+
+        RetryPolicy retryPolicy = null;
+        HttpResponse r = null;
+        try {
+            Parameters p = getParameters(paramMap);
+            if (p.partner != null) {
+                retryPolicy = retryPolicyStore.getRetryPolicy(p.partner);
+            }
+            String pp = p.responsePrefix != null ? p.responsePrefix + '.' : "";
+
+            String req = null;
+            if (p.templateFileName != null) {
+                String reqTemplate = readFile(p.templateFileName);
+                req = buildXmlJsonRequest(ctx, reqTemplate, p.format);
+            }
+            r = sendHttpRequest(req, p);
+            setResponseStatus(ctx, p.responsePrefix, r);
+
+            if (p.dumpHeaders && r.headers != null) {
                 for (Entry<String, List<String>> a : r.headers.entrySet()) {
                     ctx.setAttribute(pp + "header." + a.getKey(), StringUtils.join(a.getValue(), ","));
                 }
             }
 
-			if (r.body != null && r.body.trim().length() > 0) {
-				ctx.setAttribute(pp + "httpResponse", r.body);
-
-				if (p.convertResponse) {
-					Map<String, String> mm = null;
-					if (p.format == Format.XML)
-						mm = XmlParser.convertToProperties(r.body, p.listNameList);
-					else if (p.format == Format.JSON)
-						mm = JsonParser.convertToProperties(r.body);
-
-					if (mm != null)
-						for (String key : mm.keySet())
-							ctx.setAttribute(pp + key, mm.get(key));
-				}
-			}
-		} catch (Exception e) {
-			boolean shouldRetry = false;
-			if (e.getCause() instanceof java.net.SocketException) {
-				shouldRetry = true;
-			}
-
-			log.error("Error sending the request: " + e.getMessage(), e);
-			String prefix = parseParam(paramMap, "responsePrefix", false, null);
-			if (retryPolicy == null || shouldRetry == false) {
-				setFailureResponseStatus(ctx, prefix, e.getMessage(), r);
-			} else {
-				if (retryCount == null) {
-					retryCount = 0;
-				}
-				String retryMessage = retryCount + " attempts were made out of " + retryPolicy.getMaximumRetries() +
-				        " maximum retries.";
-				log.debug(retryMessage);
-				try {
-					retryCount = retryCount + 1;
-					if (retryCount < retryPolicy.getMaximumRetries() + 1) {
-						URI uri = new URI(paramMap.get("restapiUrl"));
-						String hostname = uri.getHost();
-						String retryString = retryPolicy.getNextHostName((uri.toString()));
-						URI uriTwo = new URI(retryString);
-						URI retryUri = UriBuilder.fromUri(uri).host(uriTwo.getHost()).port(uriTwo.getPort()).scheme(
-						        uriTwo.getScheme()).build();
-						paramMap.put("restapiUrl", retryUri.toString());
-						log.debug("URL was set to " + retryUri.toString());
-						log.debug("Failed to communicate with host " + hostname +
-						        ". Request will be re-attempted using the host " + retryString + ".");
-						log.debug("This is retry attempt " + retryCount + " out of " + retryPolicy.getMaximumRetries());
-						sendRequest(paramMap, ctx, retryCount);
-					} else {
-						log.debug("Maximum retries reached, calling setFailureResponseStatus.");
-						setFailureResponseStatus(ctx, prefix, e.getMessage(), r);
-					}
-				} catch (Exception ex) {
-					log.error("Could not attempt retry.", ex);
-					String retryErrorMessage =
-					        "Retry attempt has failed. No further retry shall be attempted, calling setFailureResponseStatus.";
-					setFailureResponseStatus(ctx, prefix, retryErrorMessage, r);
-				}
-			}
-		}
-
-		if (r != null && r.code >= 300)
-			throw new SvcLogicException(String.valueOf(r.code) + ": " + r.message);
-	}
-
-	protected Parameters getParameters(Map<String, String> paramMap) throws SvcLogicException {
-		Parameters p = new Parameters();
-		p.templateFileName = parseParam(paramMap, "templateFileName", false, null);
-		p.restapiUrl = parseParam(paramMap, "restapiUrl", true, null);
-		p.restapiUser = parseParam(paramMap, "restapiUser", false, null);
-		p.restapiPassword = parseParam(paramMap, "restapiPassword", false, null);
-		p.contentType = parseParam(paramMap, "contentType", false, null);
-		p.format = Format.fromString(parseParam(paramMap, "format", false, "json"));
-		p.httpMethod = HttpMethod.fromString(parseParam(paramMap, "httpMethod", false, "post"));
-		p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
-		p.listNameList = getListNameList(paramMap);
-		String skipSendingStr = paramMap.get("skipSending");
-		p.skipSending = skipSendingStr != null && skipSendingStr.equalsIgnoreCase("true");
-		p.convertResponse = Boolean.valueOf(parseParam(paramMap, "convertResponse", false, "true"));
-		p.trustStoreFileName = parseParam(paramMap, "trustStoreFileName", false, null);
-		p.trustStorePassword = parseParam(paramMap, "trustStorePassword", false, null);
-		p.keyStoreFileName = parseParam(paramMap, "keyStoreFileName", false, null);
-		p.keyStorePassword = parseParam(paramMap, "keyStorePassword", false, null);
-		p.ssl = p.trustStoreFileName != null && p.trustStorePassword != null && p.keyStoreFileName != null &&
-		        p.keyStorePassword != null;
-		p.customHttpHeaders = parseParam(paramMap, "customHttpHeaders", false, null);
-		p.partner = parseParam(paramMap, "partner", false, null);
-	    p.dumpHeaders = Boolean.valueOf(parseParam(paramMap, "dumpHeaders", false, null));
-		return p;
-	}
-
-	protected Set<String> getListNameList(Map<String, String> paramMap) {
-		Set<String> ll = new HashSet<String>();
-		for (String key : paramMap.keySet())
-			if (key.startsWith("listName"))
-				ll.add(paramMap.get(key));
-		return ll;
-	}
-
-	protected String parseParam(Map<String, String> paramMap, String name, boolean required, String def)
-	        throws SvcLogicException {
-		String s = paramMap.get(name);
-
-		if (s == null || s.trim().length() == 0) {
-			if (!required)
-				return def;
-			throw new SvcLogicException("Parameter " + name + " is required in RestapiCallNode");
-		}
-
-		s = s.trim();
-		String value = "";
-		int i = 0;
-		int i1 = s.indexOf('%');
-		while (i1 >= 0) {
-			int i2 = s.indexOf('%', i1 + 1);
-			if (i2 < 0)
-				break;
-
-			String varName = s.substring(i1 + 1, i2);
-			String varValue = System.getenv(varName);
-			if (varValue == null)
-				varValue = "%" + varName + "%";
-
-			value += s.substring(i, i1);
-			value += varValue;
-
-			i = i2 + 1;
-			i1 = s.indexOf('%', i);
-		}
-		value += s.substring(i);
-
-		log.info("Parameter " + name + ": [" + value + "]");
-		return value;
-	}
-
-	protected String buildXmlJsonRequest(SvcLogicContext ctx, String template, Format format) {
-		log.info("Building " + format + " started");
-		long t1 = System.currentTimeMillis();
-
-		template = expandRepeats(ctx, template, 1);
-
-		Map<String, String> mm = new HashMap<>();
-		for (String s : ctx.getAttributeKeySet())
-			mm.put(s, ctx.getAttribute(s));
-
-		StringBuilder ss = new StringBuilder();
-		int i = 0;
-		while (i < template.length()) {
-			int i1 = template.indexOf("${", i);
-			if (i1 < 0) {
-				ss.append(template.substring(i));
-				break;
-			}
-
-			int i2 = template.indexOf('}', i1 + 2);
-			if (i2 < 0)
-				throw new RuntimeException("Template error: Matching } not found");
-
-			String var1 = template.substring(i1 + 2, i2);
-			String value1 = format == Format.XML ? XmlJsonUtil.getXml(mm, var1) : XmlJsonUtil.getJson(mm, var1);
-			// log.info(" " + var1 + ": " + value1);
-			if (value1 == null || value1.trim().length() == 0) {
-				// delete the whole element (line)
-				int i3 = template.lastIndexOf('\n', i1);
-				if (i3 < 0)
-					i3 = 0;
-				int i4 = template.indexOf('\n', i1);
-				if (i4 < 0)
-					i4 = template.length();
-
-				if (i < i3)
-					ss.append(template.substring(i, i3));
-				i = i4;
-			} else {
-				ss.append(template.substring(i, i1)).append(value1);
-				i = i2 + 1;
-			}
-		}
-
-		String req = format == Format.XML
-		        ? XmlJsonUtil.removeEmptyStructXml(ss.toString()) : XmlJsonUtil.removeEmptyStructJson(ss.toString());
-
-		if (format == Format.JSON)
-			req = XmlJsonUtil.removeLastCommaJson(req);
-
-		long t2 = System.currentTimeMillis();
-		log.info("Building " + format + " completed. Time: " + (t2 - t1));
-
-		return req;
-	}
-
-	protected String expandRepeats(SvcLogicContext ctx, String template, int level) {
-		StringBuilder newTemplate = new StringBuilder();
-		int k = 0;
-		while (k < template.length()) {
-			int i1 = template.indexOf("${repeat:", k);
-			if (i1 < 0) {
-				newTemplate.append(template.substring(k));
-				break;
-			}
-
-			int i2 = template.indexOf(':', i1 + 9);
-			if (i2 < 0)
-				throw new RuntimeException(
-				        "Template error: Context variable name followed by : is required after repeat");
-
-			// Find the closing }, store in i3
-			int nn = 1;
-			int i3 = -1;
-			int i = i2;
-			while (nn > 0 && i < template.length()) {
-				i3 = template.indexOf('}', i);
-				if (i3 < 0)
-					throw new RuntimeException("Template error: Matching } not found");
-				int i32 = template.indexOf('{', i);
-				if (i32 >= 0 && i32 < i3) {
-					nn++;
-					i = i32 + 1;
-				} else {
-					nn--;
-					i = i3 + 1;
-				}
-			}
-
-			String var1 = template.substring(i1 + 9, i2);
-			String value1 = ctx.getAttribute(var1);
-			log.info("     " + var1 + ": " + value1);
-			int n = 0;
-			try {
-				n = Integer.parseInt(value1);
-			} catch (Exception e) {
-				n = 0;
-			}
-
-			newTemplate.append(template.substring(k, i1));
-
-			String rpt = template.substring(i2 + 1, i3);
-
-			for (int ii = 0; ii < n; ii++) {
-				String ss = rpt.replaceAll("\\[\\$\\{" + level + "\\}\\]", "[" + ii + "]");
-				if (ii == n - 1 && ss.trim().endsWith(",")) {
-					int i4 = ss.lastIndexOf(',');
-					if (i4 > 0)
-						ss = ss.substring(0, i4) + ss.substring(i4 + 1);
-				}
-				newTemplate.append(ss);
-			}
-
-			k = i3 + 1;
-		}
-
-		if (k == 0)
-			return newTemplate.toString();
-
-		return expandRepeats(ctx, newTemplate.toString(), level + 1);
-	}
-
-	protected String readFile(String fileName) throws Exception {
-		byte[] encoded = Files.readAllBytes(Paths.get(fileName));
-		return new String(encoded, "UTF-8");
-	}
-
-	protected HttpResponse sendHttpRequest(String request, Parameters p) throws Exception {
-		ClientConfig config = new DefaultClientConfig();
-		SSLContext ssl = null;
-		if (p.ssl && p.restapiUrl.startsWith("https"))
-			ssl = createSSLContext(p);
-		if (ssl != null) {
-			HostnameVerifier hostnameVerifier = new HostnameVerifier() {
-
-				@Override
-				public boolean verify(String hostname, SSLSession session) {
-					return true;
-				}
-			};
-
-			config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES,
-			        new HTTPSProperties(hostnameVerifier, ssl));
-		}
-
-		logProperties(config.getProperties());
-
-		Client client = Client.create(config);
-		client.setConnectTimeout(5000);
-		if (p.restapiUser != null)
-			client.addFilter(new HTTPBasicAuthFilter(p.restapiUser, p.restapiPassword));
-		WebResource webResource = client.resource(p.restapiUrl);
-
-		log.info("Sending request:");
-		log.info(request);
-		long t1 = System.currentTimeMillis();
-
-		HttpResponse r = new HttpResponse();
-		r.code = 200;
-
-		if (!p.skipSending) {
-			String tt = p.format == Format.XML ? "application/xml" : "application/json";
-			String tt1 = tt + ";charset=UTF-8";
-			if (p.contentType != null) {
-				tt = p.contentType;
-				tt1 = p.contentType;
-			}
-
-			WebResource.Builder webResourceBuilder = webResource.accept(tt).type(tt1);
+            if (r.body != null && r.body.trim().length() > 0) {
+                ctx.setAttribute(pp + "httpResponse", r.body);
+
+                if (p.convertResponse) {
+                    Map<String, String> mm = null;
+                    if (p.format == Format.XML)
+                        mm = XmlParser.convertToProperties(r.body, p.listNameList);
+                    else if (p.format == Format.JSON)
+                        mm = JsonParser.convertToProperties(r.body);
+
+                    if (mm != null)
+                        for (String key : mm.keySet())
+                            ctx.setAttribute(pp + key, mm.get(key));
+                }
+            }
+        } catch (Exception e) {
+            boolean shouldRetry = false;
+            if (e.getCause() instanceof java.net.SocketException) {
+                shouldRetry = true;
+            }
+
+            log.error("Error sending the request: " + e.getMessage(), e);
+            String prefix = parseParam(paramMap, "responsePrefix", false, null);
+            if (retryPolicy == null || shouldRetry == false) {
+                setFailureResponseStatus(ctx, prefix, e.getMessage(), r);
+            } else {
+                if (retryCount == null) {
+                    retryCount = 0;
+                }
+                String retryMessage = retryCount + " attempts were made out of " + retryPolicy.getMaximumRetries() +
+                        " maximum retries.";
+                log.debug(retryMessage);
+                try {
+                    retryCount = retryCount + 1;
+                    if (retryCount < retryPolicy.getMaximumRetries() + 1) {
+                        URI uri = new URI(paramMap.get("restapiUrl"));
+                        String hostname = uri.getHost();
+                        String retryString = retryPolicy.getNextHostName((uri.toString()));
+                        URI uriTwo = new URI(retryString);
+                        URI retryUri = UriBuilder.fromUri(uri).host(uriTwo.getHost()).port(uriTwo.getPort()).scheme(
+                                uriTwo.getScheme()).build();
+                        paramMap.put("restapiUrl", retryUri.toString());
+                        log.debug("URL was set to " + retryUri.toString());
+                        log.debug("Failed to communicate with host " + hostname +
+                                ". Request will be re-attempted using the host " + retryString + ".");
+                        log.debug("This is retry attempt " + retryCount + " out of " + retryPolicy.getMaximumRetries());
+                        sendRequest(paramMap, ctx, retryCount);
+                    } else {
+                        log.debug("Maximum retries reached, calling setFailureResponseStatus.");
+                        setFailureResponseStatus(ctx, prefix, e.getMessage(), r);
+                    }
+                } catch (Exception ex) {
+                    log.error("Could not attempt retry.", ex);
+                    String retryErrorMessage =
+                            "Retry attempt has failed. No further retry shall be attempted, calling setFailureResponseStatus.";
+                    setFailureResponseStatus(ctx, prefix, retryErrorMessage, r);
+                }
+            }
+        }
+
+        if (r != null && r.code >= 300)
+            throw new SvcLogicException(String.valueOf(r.code) + ": " + r.message);
+    }
+
+    protected Parameters getParameters(Map<String, String> paramMap) throws SvcLogicException {
+        Parameters p = new Parameters();
+        p.templateFileName = parseParam(paramMap, "templateFileName", false, null);
+        p.restapiUrl = parseParam(paramMap, "restapiUrl", true, null);
+        p.restapiUser = parseParam(paramMap, "restapiUser", false, null);
+        p.restapiPassword = parseParam(paramMap, "restapiPassword", false, null);
+        p.contentType = parseParam(paramMap, "contentType", false, null);
+        p.format = Format.fromString(parseParam(paramMap, "format", false, "json"));
+        p.httpMethod = HttpMethod.fromString(parseParam(paramMap, "httpMethod", false, "post"));
+        p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
+        p.listNameList = getListNameList(paramMap);
+        String skipSendingStr = paramMap.get("skipSending");
+        p.skipSending = skipSendingStr != null && skipSendingStr.equalsIgnoreCase("true");
+        p.convertResponse = Boolean.valueOf(parseParam(paramMap, "convertResponse", false, "true"));
+        p.trustStoreFileName = parseParam(paramMap, "trustStoreFileName", false, null);
+        p.trustStorePassword = parseParam(paramMap, "trustStorePassword", false, null);
+        p.keyStoreFileName = parseParam(paramMap, "keyStoreFileName", false, null);
+        p.keyStorePassword = parseParam(paramMap, "keyStorePassword", false, null);
+        p.ssl = p.trustStoreFileName != null && p.trustStorePassword != null && p.keyStoreFileName != null &&
+                p.keyStorePassword != null;
+        p.customHttpHeaders = parseParam(paramMap, "customHttpHeaders", false, null);
+        p.partner = parseParam(paramMap, "partner", false, null);
+        p.dumpHeaders = Boolean.valueOf(parseParam(paramMap, "dumpHeaders", false, null));
+        return p;
+    }
+
+    protected Set<String> getListNameList(Map<String, String> paramMap) {
+        Set<String> ll = new HashSet<String>();
+        for (String key : paramMap.keySet())
+            if (key.startsWith("listName"))
+                ll.add(paramMap.get(key));
+        return ll;
+    }
+
+    protected String parseParam(Map<String, String> paramMap, String name, boolean required, String def)
+            throws SvcLogicException {
+        String s = paramMap.get(name);
+
+        if (s == null || s.trim().length() == 0) {
+            if (!required)
+                return def;
+            throw new SvcLogicException("Parameter " + name + " is required in RestapiCallNode");
+        }
+
+        s = s.trim();
+        String value = "";
+        int i = 0;
+        int i1 = s.indexOf('%');
+        while (i1 >= 0) {
+            int i2 = s.indexOf('%', i1 + 1);
+            if (i2 < 0)
+                break;
+
+            String varName = s.substring(i1 + 1, i2);
+            String varValue = System.getenv(varName);
+            if (varValue == null)
+                varValue = "%" + varName + "%";
+
+            value += s.substring(i, i1);
+            value += varValue;
+
+            i = i2 + 1;
+            i1 = s.indexOf('%', i);
+        }
+        value += s.substring(i);
+
+        log.info("Parameter " + name + ": [" + value + "]");
+        return value;
+    }
+
+    protected String buildXmlJsonRequest(SvcLogicContext ctx, String template, Format format) {
+        log.info("Building " + format + " started");
+        long t1 = System.currentTimeMillis();
+
+        template = expandRepeats(ctx, template, 1);
+
+        Map<String, String> mm = new HashMap<>();
+        for (String s : ctx.getAttributeKeySet())
+            mm.put(s, ctx.getAttribute(s));
+
+        StringBuilder ss = new StringBuilder();
+        int i = 0;
+        while (i < template.length()) {
+            int i1 = template.indexOf("${", i);
+            if (i1 < 0) {
+                ss.append(template.substring(i));
+                break;
+            }
+
+            int i2 = template.indexOf('}', i1 + 2);
+            if (i2 < 0)
+                throw new RuntimeException("Template error: Matching } not found");
+
+            String var1 = template.substring(i1 + 2, i2);
+            String value1 = format == Format.XML ? XmlJsonUtil.getXml(mm, var1) : XmlJsonUtil.getJson(mm, var1);
+            // log.info(" " + var1 + ": " + value1);
+            if (value1 == null || value1.trim().length() == 0) {
+                // delete the whole element (line)
+                int i3 = template.lastIndexOf('\n', i1);
+                if (i3 < 0)
+                    i3 = 0;
+                int i4 = template.indexOf('\n', i1);
+                if (i4 < 0)
+                    i4 = template.length();
+
+                if (i < i3)
+                    ss.append(template.substring(i, i3));
+                i = i4;
+            } else {
+                ss.append(template.substring(i, i1)).append(value1);
+                i = i2 + 1;
+            }
+        }
+
+        String req = format == Format.XML
+                ? XmlJsonUtil.removeEmptyStructXml(ss.toString()) : XmlJsonUtil.removeEmptyStructJson(ss.toString());
+
+        if (format == Format.JSON)
+            req = XmlJsonUtil.removeLastCommaJson(req);
+
+        long t2 = System.currentTimeMillis();
+        log.info("Building " + format + " completed. Time: " + (t2 - t1));
+
+        return req;
+    }
+
+    protected String expandRepeats(SvcLogicContext ctx, String template, int level) {
+        StringBuilder newTemplate = new StringBuilder();
+        int k = 0;
+        while (k < template.length()) {
+            int i1 = template.indexOf("${repeat:", k);
+            if (i1 < 0) {
+                newTemplate.append(template.substring(k));
+                break;
+            }
+
+            int i2 = template.indexOf(':', i1 + 9);
+            if (i2 < 0)
+                throw new RuntimeException(
+                        "Template error: Context variable name followed by : is required after repeat");
+
+            // Find the closing }, store in i3
+            int nn = 1;
+            int i3 = -1;
+            int i = i2;
+            while (nn > 0 && i < template.length()) {
+                i3 = template.indexOf('}', i);
+                if (i3 < 0)
+                    throw new RuntimeException("Template error: Matching } not found");
+                int i32 = template.indexOf('{', i);
+                if (i32 >= 0 && i32 < i3) {
+                    nn++;
+                    i = i32 + 1;
+                } else {
+                    nn--;
+                    i = i3 + 1;
+                }
+            }
+
+            String var1 = template.substring(i1 + 9, i2);
+            String value1 = ctx.getAttribute(var1);
+            log.info("     " + var1 + ": " + value1);
+            int n = 0;
+            try {
+                n = Integer.parseInt(value1);
+            } catch (Exception e) {
+                n = 0;
+            }
+
+            newTemplate.append(template.substring(k, i1));
+
+            String rpt = template.substring(i2 + 1, i3);
+
+            for (int ii = 0; ii < n; ii++) {
+                String ss = rpt.replaceAll("\\[\\$\\{" + level + "\\}\\]", "[" + ii + "]");
+                if (ii == n - 1 && ss.trim().endsWith(",")) {
+                    int i4 = ss.lastIndexOf(',');
+                    if (i4 > 0)
+                        ss = ss.substring(0, i4) + ss.substring(i4 + 1);
+                }
+                newTemplate.append(ss);
+            }
+
+            k = i3 + 1;
+        }
+
+        if (k == 0)
+            return newTemplate.toString();
+
+        return expandRepeats(ctx, newTemplate.toString(), level + 1);
+    }
+
+    protected String readFile(String fileName) throws Exception {
+        byte[] encoded = Files.readAllBytes(Paths.get(fileName));
+        return new String(encoded, "UTF-8");
+    }
+
+    protected HttpResponse sendHttpRequest(String request, Parameters p) throws Exception {
+        ClientConfig config = new DefaultClientConfig();
+        SSLContext ssl = null;
+        if (p.ssl && p.restapiUrl.startsWith("https"))
+            ssl = createSSLContext(p);
+        if (ssl != null) {
+            HostnameVerifier hostnameVerifier = new HostnameVerifier() {
+
+                @Override
+                public boolean verify(String hostname, SSLSession session) {
+                    return true;
+                }
+            };
+
+            config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES,
+                    new HTTPSProperties(hostnameVerifier, ssl));
+        }
+
+        logProperties(config.getProperties());
+
+        Client client = Client.create(config);
+        client.setConnectTimeout(5000);
+        if (p.restapiUser != null)
+            client.addFilter(new HTTPBasicAuthFilter(p.restapiUser, p.restapiPassword));
+        WebResource webResource = client.resource(p.restapiUrl);
+
+        log.info("Sending request:");
+        log.info(request);
+        long t1 = System.currentTimeMillis();
+
+        HttpResponse r = new HttpResponse();
+        r.code = 200;
+
+        if (!p.skipSending) {
+            String tt = p.format == Format.XML ? "application/xml" : "application/json";
+            String tt1 = tt + ";charset=UTF-8";
+            if (p.contentType != null) {
+                tt = p.contentType;
+                tt1 = p.contentType;
+            }
+
+            WebResource.Builder webResourceBuilder = webResource.accept(tt).type(tt1);
 
             if (p.customHttpHeaders != null && p.customHttpHeaders.length() > 0) {
                 String[] keyValuePairs = p.customHttpHeaders.split(",");
                 for (String singlePair : keyValuePairs) {
                     int equalPosition = singlePair.indexOf('=');
-                    webResourceBuilder.header(singlePair.substring(0, equalPosition), singlePair.substring(equalPosition + 1, singlePair.length()));
+                    webResourceBuilder.header(singlePair.substring(0, equalPosition),
+                            singlePair.substring(equalPosition + 1, singlePair.length()));
                 }
             }
 
             webResourceBuilder.header("X-ECOMP-RequestID",org.slf4j.MDC.get("X-ECOMP-RequestID"));
 
-			ClientResponse response = webResourceBuilder.method(p.httpMethod.toString(), ClientResponse.class, request);
-
-			r.code = response.getStatus();
-			r.headers = response.getHeaders();
-			EntityTag etag = response.getEntityTag();
-			if (etag != null)
-				r.message = etag.getValue();
-			if (response.hasEntity() && r.code != 204)
-				r.body = response.getEntity(String.class);
-		}
-
-		long t2 = System.currentTimeMillis();
-		log.info("Response received. Time: " + (t2 - t1));
-		log.info("HTTP response code: " + r.code);
-		log.info("HTTP response message: " + r.message);
-		logHeaders(r.headers);
-		log.info("HTTP response: " + r.body);
-
-		return r;
-	}
-
-	protected SSLContext createSSLContext(Parameters p) {
-		try {
-			System.setProperty("jsse.enableSNIExtension", "false");
-			System.setProperty("javax.net.ssl.trustStore", p.trustStoreFileName);
-			System.setProperty("javax.net.ssl.trustStorePassword", p.trustStorePassword);
-
-			HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
-
-				@Override
-				public boolean verify(String string, SSLSession ssls) {
-					return true;
-				}
-			});
-
-			KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-			FileInputStream in = new FileInputStream(p.keyStoreFileName);
-			KeyStore ks = KeyStore.getInstance("PKCS12");
-			char[] pwd = p.keyStorePassword.toCharArray();
-			ks.load(in, pwd);
-			kmf.init(ks, pwd);
-
-			SSLContext ctx = SSLContext.getInstance("TLS");
-			ctx.init(kmf.getKeyManagers(), null, null);
-			return ctx;
-		} catch (Exception e) {
-			log.error("Error creating SSLContext: " + e.getMessage(), e);
-		}
-		return null;
-	}
-
-	protected void setFailureResponseStatus(SvcLogicContext ctx, String prefix, String errorMessage, HttpResponse r) {
-		r = new HttpResponse();
-		r.code = 500;
-		r.message = errorMessage;
-		String pp = prefix != null ? prefix + '.' : "";
-		ctx.setAttribute(pp + "response-code", String.valueOf(r.code));
-		ctx.setAttribute(pp + "response-message", r.message);
-	}
-
-	protected void setResponseStatus(SvcLogicContext ctx, String prefix, HttpResponse r) {
-		String pp = prefix != null ? prefix + '.' : "";
-		ctx.setAttribute(pp + "response-code", String.valueOf(r.code));
-		ctx.setAttribute(pp + "response-message", r.message);
-	}
-
-	public void sendFile(Map<String, String> paramMap, SvcLogicContext ctx) throws SvcLogicException {
-		HttpResponse r = null;
-		try {
-			FileParam p = getFileParameters(paramMap);
-			byte[] data = Files.readAllBytes(Paths.get(p.fileName));
-
-			r = sendHttpData(data, p);
-			setResponseStatus(ctx, p.responsePrefix, r);
-
-		} catch (Exception e) {
-			log.error("Error sending the request: " + e.getMessage(), e);
-
-			r = new HttpResponse();
-			r.code = 500;
-			r.message = e.getMessage();
-			String prefix = parseParam(paramMap, "responsePrefix", false, null);
-			setResponseStatus(ctx, prefix, r);
-		}
-
-		if (r != null && r.code >= 300)
-			throw new SvcLogicException(String.valueOf(r.code) + ": " + r.message);
-	}
-
-	private static class FileParam {
-
-		public String fileName;
-		public String url;
-		public String user;
-		public String password;
-		public HttpMethod httpMethod;
-		public String responsePrefix;
-		public boolean skipSending;
-	}
-
-	private FileParam getFileParameters(Map<String, String> paramMap) throws SvcLogicException {
-		FileParam p = new FileParam();
-		p.fileName = parseParam(paramMap, "fileName", true, null);
-		p.url = parseParam(paramMap, "url", true, null);
-		p.user = parseParam(paramMap, "user", false, null);
-		p.password = parseParam(paramMap, "password", false, null);
-		p.httpMethod = HttpMethod.fromString(parseParam(paramMap, "httpMethod", false, "post"));
-		p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
-		String skipSendingStr = paramMap.get("skipSending");
-		p.skipSending = skipSendingStr != null && skipSendingStr.equalsIgnoreCase("true");
-		return p;
-	}
-
-	protected HttpResponse sendHttpData(byte[] data, FileParam p) {
-		Client client = Client.create();
-		client.setConnectTimeout(5000);
-		client.setFollowRedirects(true);
-		if (p.user != null)
-			client.addFilter(new HTTPBasicAuthFilter(p.user, p.password));
-		WebResource webResource = client.resource(p.url);
-
-		log.info("Sending file");
-		long t1 = System.currentTimeMillis();
-
-		HttpResponse r = new HttpResponse();
-		r.code = 200;
-
-		if (!p.skipSending) {
-			String tt = "application/octet-stream";
-
-			ClientResponse response = null;
-			if (p.httpMethod == HttpMethod.POST)
-				response = webResource.accept(tt).type(tt).post(ClientResponse.class, data);
-			else if (p.httpMethod == HttpMethod.PUT)
-				response = webResource.accept(tt).type(tt).put(ClientResponse.class, data);
-
-			r.code = response.getStatus();
-			r.headers = response.getHeaders();
-			EntityTag etag = response.getEntityTag();
-			if (etag != null)
-				r.message = etag.getValue();
-			if (response.hasEntity() && r.code != 204)
-				r.body = response.getEntity(String.class);
-
-			if (r.code == 301) {
-				String newUrl = response.getHeaders().getFirst("Location");
-
-				log.info("Got response code 301. Sending same request to URL: " + newUrl);
-
-				webResource = client.resource(newUrl);
-
-				if (p.httpMethod == HttpMethod.POST)
-					response = webResource.accept(tt).type(tt).post(ClientResponse.class, data);
-				else if (p.httpMethod == HttpMethod.PUT)
-					response = webResource.accept(tt).type(tt).put(ClientResponse.class, data);
-
-				r.code = response.getStatus();
-				etag = response.getEntityTag();
-				if (etag != null)
-					r.message = etag.getValue();
-				if (response.hasEntity() && r.code != 204)
-					r.body = response.getEntity(String.class);
-			}
-		}
-
-		long t2 = System.currentTimeMillis();
-		log.info("Response received. Time: " + (t2 - t1));
-		log.info("HTTP response code: " + r.code);
-		log.info("HTTP response message: " + r.message);
-		logHeaders(r.headers);
-		log.info("HTTP response: " + r.body);
-
-		return r;
-	}
-
-	public void postMessageOnUeb(Map<String, String> paramMap, SvcLogicContext ctx) throws SvcLogicException {
-		HttpResponse r = null;
-		try {
-			UebParam p = getUebParameters(paramMap);
-
-			String pp = p.responsePrefix != null ? p.responsePrefix + '.' : "";
-
-			String req = null;
-
-			if (p.templateFileName == null) {
-				log.info("No template file name specified. Using default UEB template: " + defaultUebTemplateFileName);
-				p.templateFileName = defaultUebTemplateFileName;
-			}
-
-			String reqTemplate = readFile(p.templateFileName);
-			reqTemplate = reqTemplate.replaceAll("rootVarName", p.rootVarName);
-			req = buildXmlJsonRequest(ctx, reqTemplate, Format.JSON);
-
-			r = postOnUeb(req, p);
-			setResponseStatus(ctx, p.responsePrefix, r);
-			if (r.body != null)
-				ctx.setAttribute(pp + "httpResponse", r.body);
-
-		} catch (Exception e) {
-			log.error("Error sending the request: " + e.getMessage(), e);
-
-			r = new HttpResponse();
-			r.code = 500;
-			r.message = e.getMessage();
-			String prefix = parseParam(paramMap, "responsePrefix", false, null);
-			setResponseStatus(ctx, prefix, r);
-		}
-
-		if (r != null && r.code >= 300)
-			throw new SvcLogicException(String.valueOf(r.code) + ": " + r.message);
-	}
-
-	private static class UebParam {
-
-		public String topic;
-		public String templateFileName;
-		public String rootVarName;
-		public String responsePrefix;
-		public boolean skipSending;
-	}
-
-	private UebParam getUebParameters(Map<String, String> paramMap) throws SvcLogicException {
-		UebParam p = new UebParam();
-		p.topic = parseParam(paramMap, "topic", true, null);
-		p.templateFileName = parseParam(paramMap, "templateFileName", false, null);
-		p.rootVarName = parseParam(paramMap, "rootVarName", false, null);
-		p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
-		String skipSendingStr = paramMap.get("skipSending");
-		p.skipSending = skipSendingStr != null && skipSendingStr.equalsIgnoreCase("true");
-		return p;
-	}
-
-	protected HttpResponse postOnUeb(String request, UebParam p) throws Exception {
-		String[] urls = uebServers.split(" ");
-		for (int i = 0; i < urls.length; i++) {
-			if (!urls[i].endsWith("/"))
-				urls[i] += "/";
-			urls[i] += "events/" + p.topic;
-		}
-
-		Client client = Client.create();
-		client.setConnectTimeout(5000);
-		WebResource webResource = client.resource(urls[0]);
-
-		log.info("UEB URL: " + urls[0]);
-		log.info("Sending request:");
-		log.info(request);
-		long t1 = System.currentTimeMillis();
-
-		HttpResponse r = new HttpResponse();
-		r.code = 200;
-
-		if (!p.skipSending) {
-			String tt = "application/json";
-			String tt1 = tt + ";charset=UTF-8";
-
-			ClientResponse response = webResource.accept(tt).type(tt1).post(ClientResponse.class, request);
-
-			r.code = response.getStatus();
-			r.headers = response.getHeaders();
-			if (response.hasEntity())
-				r.body = response.getEntity(String.class);
-		}
-
-		long t2 = System.currentTimeMillis();
-		log.info("Response received. Time: " + (t2 - t1));
-		log.info("HTTP response code: " + r.code);
-		logHeaders(r.headers);
-		log.info("HTTP response:\n" + r.body);
-
-		return r;
-	}
-
-	protected void logProperties(Map<String, Object> mm) {
-		List<String> ll = new ArrayList<>();
-		for (Object o : mm.keySet())
-			ll.add((String) o);
-		Collections.sort(ll);
-
-		log.info("Properties:");
-		for (String name : ll)
-			log.info("--- " + name + ": " + String.valueOf(mm.get(name)));
-	}
-
-	protected void logHeaders(MultivaluedMap<String, String> mm) {
-		log.info("HTTP response headers:");
-
-		if (mm == null)
-			return;
-
-		List<String> ll = new ArrayList<>();
-		for (Object o : mm.keySet())
-			ll.add((String) o);
-		Collections.sort(ll);
-
-		for (String name : ll)
-			log.info("--- " + name + ": " + String.valueOf(mm.get(name)));
-	}
-
-	public void setUebServers(String uebServers) {
-		this.uebServers = uebServers;
-	}
-
-	public void setDefaultUebTemplateFileName(String defaultUebTemplateFileName) {
-		this.defaultUebTemplateFileName = defaultUebTemplateFileName;
-	}
+            ClientResponse response = webResourceBuilder.method(p.httpMethod.toString(), ClientResponse.class, request);
+
+            r.code = response.getStatus();
+            r.headers = response.getHeaders();
+            EntityTag etag = response.getEntityTag();
+            if (etag != null)
+                r.message = etag.getValue();
+            if (response.hasEntity() && r.code != 204)
+                r.body = response.getEntity(String.class);
+        }
+
+        long t2 = System.currentTimeMillis();
+        log.info("Response received. Time: " + (t2 - t1));
+        log.info("HTTP response code: " + r.code);
+        log.info("HTTP response message: " + r.message);
+        logHeaders(r.headers);
+        log.info("HTTP response: " + r.body);
+
+        return r;
+    }
+
+    protected SSLContext createSSLContext(Parameters p) {
+        try {
+            System.setProperty("jsse.enableSNIExtension", "false");
+            System.setProperty("javax.net.ssl.trustStore", p.trustStoreFileName);
+            System.setProperty("javax.net.ssl.trustStorePassword", p.trustStorePassword);
+
+            HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
+
+                @Override
+                public boolean verify(String string, SSLSession ssls) {
+                    return true;
+                }
+            });
+
+            KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+            FileInputStream in = new FileInputStream(p.keyStoreFileName);
+            KeyStore ks = KeyStore.getInstance("PKCS12");
+            char[] pwd = p.keyStorePassword.toCharArray();
+            ks.load(in, pwd);
+            kmf.init(ks, pwd);
+
+            SSLContext ctx = SSLContext.getInstance("TLS");
+            ctx.init(kmf.getKeyManagers(), null, null);
+            return ctx;
+        } catch (Exception e) {
+            log.error("Error creating SSLContext: " + e.getMessage(), e);
+        }
+        return null;
+    }
+
+    protected void setFailureResponseStatus(SvcLogicContext ctx, String prefix, String errorMessage, HttpResponse r) {
+        r = new HttpResponse();
+        r.code = 500;
+        r.message = errorMessage;
+        String pp = prefix != null ? prefix + '.' : "";
+        ctx.setAttribute(pp + "response-code", String.valueOf(r.code));
+        ctx.setAttribute(pp + "response-message", r.message);
+    }
+
+    protected void setResponseStatus(SvcLogicContext ctx, String prefix, HttpResponse r) {
+        String pp = prefix != null ? prefix + '.' : "";
+        ctx.setAttribute(pp + "response-code", String.valueOf(r.code));
+        ctx.setAttribute(pp + "response-message", r.message);
+    }
+
+    public void sendFile(Map<String, String> paramMap, SvcLogicContext ctx) throws SvcLogicException {
+        HttpResponse r = null;
+        try {
+            FileParam p = getFileParameters(paramMap);
+            byte[] data = Files.readAllBytes(Paths.get(p.fileName));
+
+            r = sendHttpData(data, p);
+            setResponseStatus(ctx, p.responsePrefix, r);
+
+        } catch (Exception e) {
+            log.error("Error sending the request: " + e.getMessage(), e);
+
+            r = new HttpResponse();
+            r.code = 500;
+            r.message = e.getMessage();
+            String prefix = parseParam(paramMap, "responsePrefix", false, null);
+            setResponseStatus(ctx, prefix, r);
+        }
+
+        if (r != null && r.code >= 300)
+            throw new SvcLogicException(String.valueOf(r.code) + ": " + r.message);
+    }
+
+    private static class FileParam {
+
+        public String fileName;
+        public String url;
+        public String user;
+        public String password;
+        public HttpMethod httpMethod;
+        public String responsePrefix;
+        public boolean skipSending;
+    }
+
+    private FileParam getFileParameters(Map<String, String> paramMap) throws SvcLogicException {
+        FileParam p = new FileParam();
+        p.fileName = parseParam(paramMap, "fileName", true, null);
+        p.url = parseParam(paramMap, "url", true, null);
+        p.user = parseParam(paramMap, "user", false, null);
+        p.password = parseParam(paramMap, "password", false, null);
+        p.httpMethod = HttpMethod.fromString(parseParam(paramMap, "httpMethod", false, "post"));
+        p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
+        String skipSendingStr = paramMap.get("skipSending");
+        p.skipSending = skipSendingStr != null && skipSendingStr.equalsIgnoreCase("true");
+        return p;
+    }
+
+    protected HttpResponse sendHttpData(byte[] data, FileParam p) {
+        Client client = Client.create();
+        client.setConnectTimeout(5000);
+        client.setFollowRedirects(true);
+        if (p.user != null)
+            client.addFilter(new HTTPBasicAuthFilter(p.user, p.password));
+        WebResource webResource = client.resource(p.url);
+
+        log.info("Sending file");
+        long t1 = System.currentTimeMillis();
+
+        HttpResponse r = new HttpResponse();
+        r.code = 200;
+
+        if (!p.skipSending) {
+            String tt = "application/octet-stream";
+
+            ClientResponse response = null;
+            if (p.httpMethod == HttpMethod.POST)
+                response = webResource.accept(tt).type(tt).post(ClientResponse.class, data);
+            else if (p.httpMethod == HttpMethod.PUT)
+                response = webResource.accept(tt).type(tt).put(ClientResponse.class, data);
+
+            r.code = response.getStatus();
+            r.headers = response.getHeaders();
+            EntityTag etag = response.getEntityTag();
+            if (etag != null)
+                r.message = etag.getValue();
+            if (response.hasEntity() && r.code != 204)
+                r.body = response.getEntity(String.class);
+
+            if (r.code == 301) {
+                String newUrl = response.getHeaders().getFirst("Location");
+
+                log.info("Got response code 301. Sending same request to URL: " + newUrl);
+
+                webResource = client.resource(newUrl);
+
+                if (p.httpMethod == HttpMethod.POST)
+                    response = webResource.accept(tt).type(tt).post(ClientResponse.class, data);
+                else if (p.httpMethod == HttpMethod.PUT)
+                    response = webResource.accept(tt).type(tt).put(ClientResponse.class, data);
+
+                r.code = response.getStatus();
+                etag = response.getEntityTag();
+                if (etag != null)
+                    r.message = etag.getValue();
+                if (response.hasEntity() && r.code != 204)
+                    r.body = response.getEntity(String.class);
+            }
+        }
+
+        long t2 = System.currentTimeMillis();
+        log.info("Response received. Time: " + (t2 - t1));
+        log.info("HTTP response code: " + r.code);
+        log.info("HTTP response message: " + r.message);
+        logHeaders(r.headers);
+        log.info("HTTP response: " + r.body);
+
+        return r;
+    }
+
+    public void postMessageOnUeb(Map<String, String> paramMap, SvcLogicContext ctx) throws SvcLogicException {
+        HttpResponse r = null;
+        try {
+            UebParam p = getUebParameters(paramMap);
+
+            String pp = p.responsePrefix != null ? p.responsePrefix + '.' : "";
+
+            String req = null;
+
+            if (p.templateFileName == null) {
+                log.info("No template file name specified. Using default UEB template: " + defaultUebTemplateFileName);
+                p.templateFileName = defaultUebTemplateFileName;
+            }
+
+            String reqTemplate = readFile(p.templateFileName);
+            reqTemplate = reqTemplate.replaceAll("rootVarName", p.rootVarName);
+            req = buildXmlJsonRequest(ctx, reqTemplate, Format.JSON);
+
+            r = postOnUeb(req, p);
+            setResponseStatus(ctx, p.responsePrefix, r);
+            if (r.body != null)
+                ctx.setAttribute(pp + "httpResponse", r.body);
+
+        } catch (Exception e) {
+            log.error("Error sending the request: " + e.getMessage(), e);
+
+            r = new HttpResponse();
+            r.code = 500;
+            r.message = e.getMessage();
+            String prefix = parseParam(paramMap, "responsePrefix", false, null);
+            setResponseStatus(ctx, prefix, r);
+        }
+
+        if (r != null && r.code >= 300)
+            throw new SvcLogicException(String.valueOf(r.code) + ": " + r.message);
+    }
+
+    private static class UebParam {
+
+        public String topic;
+        public String templateFileName;
+        public String rootVarName;
+        public String responsePrefix;
+        public boolean skipSending;
+    }
+
+    private UebParam getUebParameters(Map<String, String> paramMap) throws SvcLogicException {
+        UebParam p = new UebParam();
+        p.topic = parseParam(paramMap, "topic", true, null);
+        p.templateFileName = parseParam(paramMap, "templateFileName", false, null);
+        p.rootVarName = parseParam(paramMap, "rootVarName", false, null);
+        p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
+        String skipSendingStr = paramMap.get("skipSending");
+        p.skipSending = skipSendingStr != null && skipSendingStr.equalsIgnoreCase("true");
+        return p;
+    }
+
+    protected HttpResponse postOnUeb(String request, UebParam p) throws Exception {
+        String[] urls = uebServers.split(" ");
+        for (int i = 0; i < urls.length; i++) {
+            if (!urls[i].endsWith("/"))
+                urls[i] += "/";
+            urls[i] += "events/" + p.topic;
+        }
+
+        Client client = Client.create();
+        client.setConnectTimeout(5000);
+        WebResource webResource = client.resource(urls[0]);
+
+        log.info("UEB URL: " + urls[0]);
+        log.info("Sending request:");
+        log.info(request);
+        long t1 = System.currentTimeMillis();
+
+        HttpResponse r = new HttpResponse();
+        r.code = 200;
+
+        if (!p.skipSending) {
+            String tt = "application/json";
+            String tt1 = tt + ";charset=UTF-8";
+
+            ClientResponse response = webResource.accept(tt).type(tt1).post(ClientResponse.class, request);
+
+            r.code = response.getStatus();
+            r.headers = response.getHeaders();
+            if (response.hasEntity())
+                r.body = response.getEntity(String.class);
+        }
+
+        long t2 = System.currentTimeMillis();
+        log.info("Response received. Time: " + (t2 - t1));
+        log.info("HTTP response code: " + r.code);
+        logHeaders(r.headers);
+        log.info("HTTP response:\n" + r.body);
+
+        return r;
+    }
+
+    protected void logProperties(Map<String, Object> mm) {
+        List<String> ll = new ArrayList<>();
+        for (Object o : mm.keySet())
+            ll.add((String) o);
+        Collections.sort(ll);
+
+        log.info("Properties:");
+        for (String name : ll)
+            log.info("--- " + name + ": " + String.valueOf(mm.get(name)));
+    }
+
+    protected void logHeaders(MultivaluedMap<String, String> mm) {
+        log.info("HTTP response headers:");
+
+        if (mm == null)
+            return;
+
+        List<String> ll = new ArrayList<>();
+        for (Object o : mm.keySet())
+            ll.add((String) o);
+        Collections.sort(ll);
+
+        for (String name : ll)
+            log.info("--- " + name + ": " + String.valueOf(mm.get(name)));
+    }
+
+    public void setUebServers(String uebServers) {
+        this.uebServers = uebServers;
+    }
+
+    public void setDefaultUebTemplateFileName(String defaultUebTemplateFileName) {
+        this.defaultUebTemplateFileName = defaultUebTemplateFileName;
+    }
 }
diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java
index 69334a969..5cee07791 100644
--- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java
@@ -40,7 +40,8 @@ public class RetryPolicy {
         }
 
         if(position == null){
-            throw new RetryException("No match found for the provided uri[" + uri + "] so the next host name could not be retreived");
+            throw new RetryException("No match found for the provided uri[" + uri + "] " +
+                    "so the next host name could not be retreived");
         }
         position++;
 
diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java
index 2fa3fa541..16b9f519f 100644
--- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java
@@ -31,342 +31,342 @@ import org.slf4j.LoggerFactory;
 
 public class XmlJsonUtil {
 
-	private static final Logger log = LoggerFactory.getLogger(XmlJsonUtil.class);
-
-	public static String getXml(Map<String, String> varmap, String var) {
-		boolean escape = true;
-		if (var.startsWith("'")) {
-			var = var.substring(1);
-			escape = false;
-		}
-
-		Object o = createStructure(varmap, var);
-		return generateXml(o, 0, escape);
-	}
-
-	public static String getJson(Map<String, String> varmap, String var) {
-		boolean escape = true;
-		if (var.startsWith("'")) {
-			var = var.substring(1);
-			escape = false;
-		}
-
-		Object o = createStructure(varmap, var);
-		return generateJson(o, escape);
-	}
-
-	private static Object createStructure(Map<String, String> flatmap, String var) {
-		if (flatmap.containsKey(var)) {
-			if (var.endsWith("_length") || var.endsWith("].key"))
-				return null;
-			return flatmap.get(var);
-		}
-
-		Map<String, Object> mm = new HashMap<>();
-		for (String k : flatmap.keySet())
-			if (k.startsWith(var + ".")) {
-				int i1 = k.indexOf('.', var.length() + 1);
-				int i2 = k.indexOf('[', var.length() + 1);
-				int i3 = k.length();
-				if (i1 > 0 && i1 < i3)
-					i3 = i1;
-				if (i2 > 0 && i2 < i3)
-					i3 = i2;
-				String k1 = k.substring(var.length() + 1, i3);
-				String var1 = k.substring(0, i3);
-				if (!mm.containsKey(k1)) {
-					Object str = createStructure(flatmap, var1);
-					if (str != null && (!(str instanceof String) || ((String) str).trim().length() > 0))
-						mm.put(k1, str);
-				}
-			}
-		if (!mm.isEmpty())
-			return mm;
-
-		boolean arrayFound = false;
-		for (String k : flatmap.keySet())
-			if (k.startsWith(var + "[")) {
-				arrayFound = true;
-				break;
-			}
-
-		if (arrayFound) {
-			List<Object> ll = new ArrayList<>();
-
-			int length = Integer.MAX_VALUE;
-			String lengthStr = flatmap.get(var + "_length");
-			if (lengthStr != null) {
-				try {
-					length = Integer.parseInt(lengthStr);
-				} catch (Exception e) {
-					log.warn("Invalid number for " + var + "_length:" + lengthStr);
-				}
-			}
-
-			for (int i = 0; i < length; i++) {
-				Object v = createStructure(flatmap, var + '[' + i + ']');
-				if (v == null)
-					break;
-				ll.add(v);
-			}
-
-			if (!ll.isEmpty())
-				return ll;
-		}
-
-		return null;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static String generateXml(Object o, int indent, boolean escape) {
-		if (o == null)
-			return null;
-
-		if (o instanceof String)
-			return escape ? escapeXml((String) o) : (String) o;;
-
-		if (o instanceof Map) {
-			StringBuilder ss = new StringBuilder();
-			Map<String, Object> mm = (Map<String, Object>) o;
-			for (String k : mm.keySet()) {
-				Object v = mm.get(k);
-				if (v instanceof String) {
-					String s = escape ? escapeXml((String) v) : (String) v;
-					ss.append(pad(indent)).append('<').append(k).append('>');
-					ss.append(s);
-					ss.append("</").append(k).append('>').append('\n');
-				} else if (v instanceof Map) {
-					ss.append(pad(indent)).append('<').append(k).append('>').append('\n');
-					ss.append(generateXml(v, indent + 1, escape));
-					ss.append(pad(indent)).append("</").append(k).append('>').append('\n');
-				} else if (v instanceof List) {
-					List<Object> ll = (List<Object>) v;
-					for (Object o1 : ll) {
-						ss.append(pad(indent)).append('<').append(k).append('>').append('\n');
-						ss.append(generateXml(o1, indent + 1, escape));
-						ss.append(pad(indent)).append("</").append(k).append('>').append('\n');
-					}
-				}
-			}
-			return ss.toString();
-		}
-
-		return null;
-	}
-
-	private static String generateJson(Object o, boolean escape) {
-		if (o == null)
-			return null;
-
-		StringBuilder ss = new StringBuilder();
-		generateJson(ss, o, 0, false, escape);
-		return ss.toString();
-	}
-
-	@SuppressWarnings("unchecked")
-	private static void generateJson(StringBuilder ss, Object o, int indent, boolean padFirst, boolean escape) {
-		if (o instanceof String) {
-			String s = escape ? escapeJson((String) o) : (String) o;
-			if (padFirst)
-				ss.append(pad(indent));
-			ss.append('"').append(s).append('"');
-			return;
-		}
-
-		if (o instanceof Map) {
-			Map<String, Object> mm = (Map<String, Object>) o;
-
-			if (padFirst)
-				ss.append(pad(indent));
-			ss.append("{\n");
-
-			boolean first = true;
-			for (String k : mm.keySet()) {
-				if (!first)
-					ss.append(",\n");
-				first = false;
-
-				Object v = mm.get(k);
-				ss.append(pad(indent + 1)).append('"').append(k).append("\": ");
-				generateJson(ss, v, indent + 1, false, escape);
-			}
-
-			ss.append("\n");
-			ss.append(pad(indent)).append('}');
-
-			return;
-		}
-
-		if (o instanceof List) {
-			List<Object> ll = (List<Object>) o;
-
-			if (padFirst)
-				ss.append(pad(indent));
-			ss.append("[\n");
-
-			boolean first = true;
-			for (Object o1 : ll) {
-				if (!first)
-					ss.append(",\n");
-				first = false;
-
-				generateJson(ss, o1, indent + 1, true, escape);
-			}
-
-			ss.append("\n");
-			ss.append(pad(indent)).append(']');
-		}
-	}
-
-	public static String removeLastCommaJson(String s) {
-		StringBuilder sb = new StringBuilder();
-		int k = 0;
-		int start = 0;
-		while (k < s.length()) {
-			int i11 = s.indexOf('}', k);
-			int i12 = s.indexOf(']', k);
-			int i1 = -1;
-			if (i11 < 0)
-				i1 = i12;
-			else if (i12 < 0)
-				i1 = i11;
-			else
-				i1 = i11 < i12 ? i11 : i12;
-			if (i1 < 0)
-				break;
-
-			int i2 = s.lastIndexOf(',', i1);
-			if (i2 < 0) {
-				k = i1 + 1;
-				continue;
-			}
-
-			String between = s.substring(i2 + 1, i1);
-			if (between.trim().length() > 0) {
-				k = i1 + 1;
-				continue;
-			}
-
-			sb.append(s.substring(start, i2));
-			start = i2 + 1;
-			k = i1 + 1;
-		}
-
-		sb.append(s.substring(start, s.length()));
-
-		return sb.toString();
-	}
-
-	public static String removeEmptyStructJson(String s) {
-		int k = 0;
-		while (k < s.length()) {
-			boolean curly = true;
-			int i11 = s.indexOf('{', k);
-			int i12 = s.indexOf('[', k);
-			int i1 = -1;
-			if (i11 < 0) {
-				i1 = i12;
-				curly = false;
-			} else if (i12 < 0)
-				i1 = i11;
-			else
-				if (i11 < i12)
-					i1 = i11;
-				else {
-					i1 = i12;
-					curly = false;
-				}
-
-			if (i1 >= 0) {
-				int i2 = curly ? s.indexOf('}', i1) : s.indexOf(']', i1);
-				if (i2 > 0) {
-					String value = s.substring(i1 + 1, i2);
-					if (value.trim().length() == 0) {
-						int i4 = s.lastIndexOf('\n', i1);
-						if (i4 < 0)
-							i4 = 0;
-						int i5 = s.indexOf('\n', i2);
-						if (i5 < 0)
-							i5 = s.length();
-
-						s = s.substring(0, i4) + s.substring(i5);
-						k = 0;
-					} else
-						k = i1 + 1;
-				} else
-					break;
-			} else
-				break;
-		}
-
-		return s;
-	}
-
-	public static String removeEmptyStructXml(String s) {
-		int k = 0;
-		while (k < s.length()) {
-			int i1 = s.indexOf('<', k);
-			if (i1 < 0 || i1 == s.length() - 1)
-				break;
-
-			char c1 = s.charAt(i1 + 1);
-			if (c1 == '?' || c1 == '!') {
-				k = i1 + 2;
-				continue;
-			}
-
-			int i2 = s.indexOf('>', i1);
-			if (i2 < 0) {
-				k = i1 + 1;
-				continue;
-			}
-
-			String closingTag = "</" + s.substring(i1 + 1, i2 + 1);
-			int i3 = s.indexOf(closingTag, i2 + 1);
-			if (i3 < 0) {
-				k = i2 + 1;
-				continue;
-			}
-
-			String value = s.substring(i2 + 1, i3);
-			if (value.trim().length() > 0) {
-				k = i2 + 1;
-				continue;
-			}
-
-			int i4 = s.lastIndexOf('\n', i1);
-			if (i4 < 0)
-				i4 = 0;
-			int i5 = s.indexOf('\n', i3);
-			if (i5 < 0)
-				i5 = s.length();
-
-			s = s.substring(0, i4) + s.substring(i5);
-			k = 0;
-		}
-
-		return s;
-	}
-
-	private static String escapeXml(String v) {
-		String s = v.replaceAll("&", "&amp;");
-		s = s.replaceAll("<", "&lt;");
-		s = s.replaceAll("'", "&apos;");
-		s = s.replaceAll("\"", "&quot;");
-		s = s.replaceAll(">", "&gt;");
-		return s;
-	}
-
-	private static String escapeJson(String v) {
-		String s = v.replaceAll("\\\\", "\\\\\\\\");
-		s = s.replaceAll("\"", "\\\\\"");
-		return s;
-	}
-
-	private static String pad(int n) {
-		String s = "";
-		for (int i = 0; i < n; i++)
-			s += '\t';
-		return s;
-	}
+    private static final Logger log = LoggerFactory.getLogger(XmlJsonUtil.class);
+
+    public static String getXml(Map<String, String> varmap, String var) {
+        boolean escape = true;
+        if (var.startsWith("'")) {
+            var = var.substring(1);
+            escape = false;
+        }
+
+        Object o = createStructure(varmap, var);
+        return generateXml(o, 0, escape);
+    }
+
+    public static String getJson(Map<String, String> varmap, String var) {
+        boolean escape = true;
+        if (var.startsWith("'")) {
+            var = var.substring(1);
+            escape = false;
+        }
+
+        Object o = createStructure(varmap, var);
+        return generateJson(o, escape);
+    }
+
+    private static Object createStructure(Map<String, String> flatmap, String var) {
+        if (flatmap.containsKey(var)) {
+            if (var.endsWith("_length") || var.endsWith("].key"))
+                return null;
+            return flatmap.get(var);
+        }
+
+        Map<String, Object> mm = new HashMap<>();
+        for (String k : flatmap.keySet())
+            if (k.startsWith(var + ".")) {
+                int i1 = k.indexOf('.', var.length() + 1);
+                int i2 = k.indexOf('[', var.length() + 1);
+                int i3 = k.length();
+                if (i1 > 0 && i1 < i3)
+                    i3 = i1;
+                if (i2 > 0 && i2 < i3)
+                    i3 = i2;
+                String k1 = k.substring(var.length() + 1, i3);
+                String var1 = k.substring(0, i3);
+                if (!mm.containsKey(k1)) {
+                    Object str = createStructure(flatmap, var1);
+                    if (str != null && (!(str instanceof String) || ((String) str).trim().length() > 0))
+                        mm.put(k1, str);
+                }
+            }
+        if (!mm.isEmpty())
+            return mm;
+
+        boolean arrayFound = false;
+        for (String k : flatmap.keySet())
+            if (k.startsWith(var + "[")) {
+                arrayFound = true;
+                break;
+            }
+
+        if (arrayFound) {
+            List<Object> ll = new ArrayList<>();
+
+            int length = Integer.MAX_VALUE;
+            String lengthStr = flatmap.get(var + "_length");
+            if (lengthStr != null) {
+                try {
+                    length = Integer.parseInt(lengthStr);
+                } catch (Exception e) {
+                    log.warn("Invalid number for " + var + "_length:" + lengthStr);
+                }
+            }
+
+            for (int i = 0; i < length; i++) {
+                Object v = createStructure(flatmap, var + '[' + i + ']');
+                if (v == null)
+                    break;
+                ll.add(v);
+            }
+
+            if (!ll.isEmpty())
+                return ll;
+        }
+
+        return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static String generateXml(Object o, int indent, boolean escape) {
+        if (o == null)
+            return null;
+
+        if (o instanceof String)
+            return escape ? escapeXml((String) o) : (String) o;;
+
+        if (o instanceof Map) {
+            StringBuilder ss = new StringBuilder();
+            Map<String, Object> mm = (Map<String, Object>) o;
+            for (String k : mm.keySet()) {
+                Object v = mm.get(k);
+                if (v instanceof String) {
+                    String s = escape ? escapeXml((String) v) : (String) v;
+                    ss.append(pad(indent)).append('<').append(k).append('>');
+                    ss.append(s);
+                    ss.append("</").append(k).append('>').append('\n');
+                } else if (v instanceof Map) {
+                    ss.append(pad(indent)).append('<').append(k).append('>').append('\n');
+                    ss.append(generateXml(v, indent + 1, escape));
+                    ss.append(pad(indent)).append("</").append(k).append('>').append('\n');
+                } else if (v instanceof List) {
+                    List<Object> ll = (List<Object>) v;
+                    for (Object o1 : ll) {
+                        ss.append(pad(indent)).append('<').append(k).append('>').append('\n');
+                        ss.append(generateXml(o1, indent + 1, escape));
+                        ss.append(pad(indent)).append("</").append(k).append('>').append('\n');
+                    }
+                }
+            }
+            return ss.toString();
+        }
+
+        return null;
+    }
+
+    private static String generateJson(Object o, boolean escape) {
+        if (o == null)
+            return null;
+
+        StringBuilder ss = new StringBuilder();
+        generateJson(ss, o, 0, false, escape);
+        return ss.toString();
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void generateJson(StringBuilder ss, Object o, int indent, boolean padFirst, boolean escape) {
+        if (o instanceof String) {
+            String s = escape ? escapeJson((String) o) : (String) o;
+            if (padFirst)
+                ss.append(pad(indent));
+            ss.append('"').append(s).append('"');
+            return;
+        }
+
+        if (o instanceof Map) {
+            Map<String, Object> mm = (Map<String, Object>) o;
+
+            if (padFirst)
+                ss.append(pad(indent));
+            ss.append("{\n");
+
+            boolean first = true;
+            for (String k : mm.keySet()) {
+                if (!first)
+                    ss.append(",\n");
+                first = false;
+
+                Object v = mm.get(k);
+                ss.append(pad(indent + 1)).append('"').append(k).append("\": ");
+                generateJson(ss, v, indent + 1, false, escape);
+            }
+
+            ss.append("\n");
+            ss.append(pad(indent)).append('}');
+
+            return;
+        }
+
+        if (o instanceof List) {
+            List<Object> ll = (List<Object>) o;
+
+            if (padFirst)
+                ss.append(pad(indent));
+            ss.append("[\n");
+
+            boolean first = true;
+            for (Object o1 : ll) {
+                if (!first)
+                    ss.append(",\n");
+                first = false;
+
+                generateJson(ss, o1, indent + 1, true, escape);
+            }
+
+            ss.append("\n");
+            ss.append(pad(indent)).append(']');
+        }
+    }
+
+    public static String removeLastCommaJson(String s) {
+        StringBuilder sb = new StringBuilder();
+        int k = 0;
+        int start = 0;
+        while (k < s.length()) {
+            int i11 = s.indexOf('}', k);
+            int i12 = s.indexOf(']', k);
+            int i1 = -1;
+            if (i11 < 0)
+                i1 = i12;
+            else if (i12 < 0)
+                i1 = i11;
+            else
+                i1 = i11 < i12 ? i11 : i12;
+            if (i1 < 0)
+                break;
+
+            int i2 = s.lastIndexOf(',', i1);
+            if (i2 < 0) {
+                k = i1 + 1;
+                continue;
+            }
+
+            String between = s.substring(i2 + 1, i1);
+            if (between.trim().length() > 0) {
+                k = i1 + 1;
+                continue;
+            }
+
+            sb.append(s.substring(start, i2));
+            start = i2 + 1;
+            k = i1 + 1;
+        }
+
+        sb.append(s.substring(start, s.length()));
+
+        return sb.toString();
+    }
+
+    public static String removeEmptyStructJson(String s) {
+        int k = 0;
+        while (k < s.length()) {
+            boolean curly = true;
+            int i11 = s.indexOf('{', k);
+            int i12 = s.indexOf('[', k);
+            int i1 = -1;
+            if (i11 < 0) {
+                i1 = i12;
+                curly = false;
+            } else if (i12 < 0)
+                i1 = i11;
+            else
+                if (i11 < i12)
+                    i1 = i11;
+                else {
+                    i1 = i12;
+                    curly = false;
+                }
+
+            if (i1 >= 0) {
+                int i2 = curly ? s.indexOf('}', i1) : s.indexOf(']', i1);
+                if (i2 > 0) {
+                    String value = s.substring(i1 + 1, i2);
+                    if (value.trim().length() == 0) {
+                        int i4 = s.lastIndexOf('\n', i1);
+                        if (i4 < 0)
+                            i4 = 0;
+                        int i5 = s.indexOf('\n', i2);
+                        if (i5 < 0)
+                            i5 = s.length();
+
+                        s = s.substring(0, i4) + s.substring(i5);
+                        k = 0;
+                    } else
+                        k = i1 + 1;
+                } else
+                    break;
+            } else
+                break;
+        }
+
+        return s;
+    }
+
+    public static String removeEmptyStructXml(String s) {
+        int k = 0;
+        while (k < s.length()) {
+            int i1 = s.indexOf('<', k);
+            if (i1 < 0 || i1 == s.length() - 1)
+                break;
+
+            char c1 = s.charAt(i1 + 1);
+            if (c1 == '?' || c1 == '!') {
+                k = i1 + 2;
+                continue;
+            }
+
+            int i2 = s.indexOf('>', i1);
+            if (i2 < 0) {
+                k = i1 + 1;
+                continue;
+            }
+
+            String closingTag = "</" + s.substring(i1 + 1, i2 + 1);
+            int i3 = s.indexOf(closingTag, i2 + 1);
+            if (i3 < 0) {
+                k = i2 + 1;
+                continue;
+            }
+
+            String value = s.substring(i2 + 1, i3);
+            if (value.trim().length() > 0) {
+                k = i2 + 1;
+                continue;
+            }
+
+            int i4 = s.lastIndexOf('\n', i1);
+            if (i4 < 0)
+                i4 = 0;
+            int i5 = s.indexOf('\n', i3);
+            if (i5 < 0)
+                i5 = s.length();
+
+            s = s.substring(0, i4) + s.substring(i5);
+            k = 0;
+        }
+
+        return s;
+    }
+
+    private static String escapeXml(String v) {
+        String s = v.replaceAll("&", "&amp;");
+        s = s.replaceAll("<", "&lt;");
+        s = s.replaceAll("'", "&apos;");
+        s = s.replaceAll("\"", "&quot;");
+        s = s.replaceAll(">", "&gt;");
+        return s;
+    }
+
+    private static String escapeJson(String v) {
+        String s = v.replaceAll("\\\\", "\\\\\\\\");
+        s = s.replaceAll("\"", "\\\\\"");
+        return s;
+    }
+
+    private static String pad(int n) {
+        String s = "";
+        for (int i = 0; i < n; i++)
+            s += '\t';
+        return s;
+    }
 }
diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java
index 8f3febcaf..85c9dc018 100644
--- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java
@@ -39,122 +39,122 @@ import org.xml.sax.helpers.DefaultHandler;
 
 public class XmlParser {
 
-	private static final Logger log = LoggerFactory.getLogger(XmlParser.class);
-
-	public static Map<String, String> convertToProperties(String s, Set<String> listNameList) {
-		Handler handler = new Handler(listNameList);
-		try {
-			SAXParserFactory factory = SAXParserFactory.newInstance();
-			SAXParser saxParser = factory.newSAXParser();
-			InputStream in = new ByteArrayInputStream(s.getBytes());
-			saxParser.parse(in, handler);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		return handler.getProperties();
-	}
-
-	private static class Handler extends DefaultHandler {
-
-		private Set<String> listNameList;
-
-		private Map<String, String> properties = new HashMap<>();
-
-		public Map<String, String> getProperties() {
-			return properties;
-		}
-
-		public Handler(Set<String> listNameList) {
-			super();
-			this.listNameList = listNameList;
-			if (this.listNameList == null)
-				this.listNameList = new HashSet<String>();
-		}
-
-		String currentName = "";
-		String currentValue = "";
-
-		@Override
-		public void startElement(String uri, String localName, String qName, Attributes attributes)
-		        throws SAXException {
-			super.startElement(uri, localName, qName, attributes);
-
-			String name = localName;
-			if (name == null || name.trim().length() == 0)
-				name = qName;
-			int i2 = name.indexOf(':');
-			if (i2 >= 0)
-				name = name.substring(i2 + 1);
-
-			if (currentName.length() > 0)
-				currentName += '.';
-			currentName += name;
-
-			String listName = removeIndexes(currentName);
-
-			if (listNameList.contains(listName)) {
-				int len = getInt(properties, currentName + "_length");
-				properties.put(currentName + "_length", String.valueOf(len + 1));
-				currentName += "[" + len + "]";
-			}
-		}
-
-		@Override
-		public void endElement(String uri, String localName, String qName) throws SAXException {
-			super.endElement(uri, localName, qName);
-
-			String name = localName;
-			if (name == null || name.trim().length() == 0)
-				name = qName;
-			int i2 = name.indexOf(':');
-			if (i2 >= 0)
-				name = name.substring(i2 + 1);
-
-			if (currentValue.trim().length() > 0) {
-				currentValue = currentValue.trim();
-				properties.put(currentName, currentValue);
-
-				log.info("Added property: " + currentName + ": " + currentValue);
-
-				currentValue = "";
-			}
-
-			int i1 = currentName.lastIndexOf("." + name);
-			if (i1 <= 0)
-				currentName = "";
-			else
-				currentName = currentName.substring(0, i1);
-		}
-
-		@Override
-		public void characters(char[] ch, int start, int length) throws SAXException {
-			super.characters(ch, start, length);
-
-			String value = new String(ch, start, length);
-			currentValue += value;
-		}
-
-		private static int getInt(Map<String, String> mm, String name) {
-			String s = mm.get(name);
-			if (s == null)
-				return 0;
-			return Integer.parseInt(s);
-		}
-
-		private String removeIndexes(String currentName) {
-			String s = "";
-			boolean add = true;
-			for (int i = 0; i < currentName.length(); i++) {
-				char c = currentName.charAt(i);
-				if (c == '[')
-					add = false;
-				else if (c == ']')
-					add = true;
-				else if (add)
-					s += c;
-			}
-			return s;
-		}
-	}
+    private static final Logger log = LoggerFactory.getLogger(XmlParser.class);
+
+    public static Map<String, String> convertToProperties(String s, Set<String> listNameList) {
+        Handler handler = new Handler(listNameList);
+        try {
+            SAXParserFactory factory = SAXParserFactory.newInstance();
+            SAXParser saxParser = factory.newSAXParser();
+            InputStream in = new ByteArrayInputStream(s.getBytes());
+            saxParser.parse(in, handler);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return handler.getProperties();
+    }
+
+    private static class Handler extends DefaultHandler {
+
+        private Set<String> listNameList;
+
+        private Map<String, String> properties = new HashMap<>();
+
+        public Map<String, String> getProperties() {
+            return properties;
+        }
+
+        public Handler(Set<String> listNameList) {
+            super();
+            this.listNameList = listNameList;
+            if (this.listNameList == null)
+                this.listNameList = new HashSet<String>();
+        }
+
+        String currentName = "";
+        String currentValue = "";
+
+        @Override
+        public void startElement(String uri, String localName, String qName, Attributes attributes)
+                throws SAXException {
+            super.startElement(uri, localName, qName, attributes);
+
+            String name = localName;
+            if (name == null || name.trim().length() == 0)
+                name = qName;
+            int i2 = name.indexOf(':');
+            if (i2 >= 0)
+                name = name.substring(i2 + 1);
+
+            if (currentName.length() > 0)
+                currentName += '.';
+            currentName += name;
+
+            String listName = removeIndexes(currentName);
+
+            if (listNameList.contains(listName)) {
+                int len = getInt(properties, currentName + "_length");
+                properties.put(currentName + "_length", String.valueOf(len + 1));
+                currentName += "[" + len + "]";
+            }
+        }
+
+        @Override
+        public void endElement(String uri, String localName, String qName) throws SAXException {
+            super.endElement(uri, localName, qName);
+
+            String name = localName;
+            if (name == null || name.trim().length() == 0)
+                name = qName;
+            int i2 = name.indexOf(':');
+            if (i2 >= 0)
+                name = name.substring(i2 + 1);
+
+            if (currentValue.trim().length() > 0) {
+                currentValue = currentValue.trim();
+                properties.put(currentName, currentValue);
+
+                log.info("Added property: " + currentName + ": " + currentValue);
+
+                currentValue = "";
+            }
+
+            int i1 = currentName.lastIndexOf("." + name);
+            if (i1 <= 0)
+                currentName = "";
+            else
+                currentName = currentName.substring(0, i1);
+        }
+
+        @Override
+        public void characters(char[] ch, int start, int length) throws SAXException {
+            super.characters(ch, start, length);
+
+            String value = new String(ch, start, length);
+            currentValue += value;
+        }
+
+        private static int getInt(Map<String, String> mm, String name) {
+            String s = mm.get(name);
+            if (s == null)
+                return 0;
+            return Integer.parseInt(s);
+        }
+
+        private String removeIndexes(String currentName) {
+            String s = "";
+            boolean add = true;
+            for (int i = 0; i < currentName.length(); i++) {
+                char c = currentName.charAt(i);
+                if (c == '[')
+                    add = false;
+                else if (c == ']')
+                    add = true;
+                else if (add)
+                    s += c;
+            }
+            return s;
+        }
+    }
 }
diff --git a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml b/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml
index 25ce0120a..87850624c 100644
--- a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml
+++ b/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml
@@ -24,26 +24,26 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd">
-        
-	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-	        <property name="locations">
+
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+            <property name="locations">
             <list>
                 <value>file:${SDNC_CONFIG_DIR}/ueb.properties</value>
                 <value>file:${SDNC_CONFIG_DIR}/dme2.properties</value>
             </list>
-        </property> 
-		<property name="ignoreResourceNotFound" value="true" />
-		<property name="ignoreUnresolvablePlaceholders" value="true" />
-	</bean>
+        </property>
+        <property name="ignoreResourceNotFound" value="true" />
+        <property name="ignoreUnresolvablePlaceholders" value="true" />
+    </bean>
 
-	<!-- context:property-placeholder location="file:${SDNC_CONFIG_DIR}/ueb.properties" /-->
+    <!-- context:property-placeholder location="file:${SDNC_CONFIG_DIR}/ueb.properties" /-->
 
-	<bean id="restapiCallNode" class="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode">
-		<property name="uebServers" value="${servers}" />
-		<property name="retryPolicyStore" ref="retryPolicyStore"/>
-	</bean>
+    <bean id="restapiCallNode" class="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode">
+        <property name="uebServers" value="${servers}" />
+        <property name="retryPolicyStore" ref="retryPolicyStore"/>
+    </bean>
 
-	<bean id="retryPolicyStore" class="org.onap.ccsdk.sli.plugins.restapicall.RetryPolicyStore">
-		<property name="proxyServers" value="${proxyUrl}" />
-	</bean>
+    <bean id="retryPolicyStore" class="org.onap.ccsdk.sli.plugins.restapicall.RetryPolicyStore">
+        <property name="proxyServers" value="${proxyUrl}" />
+    </bean>
 </beans>
diff --git a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml b/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml
index 8f34005d5..2f1e4dbde 100644
--- a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml
+++ b/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml
@@ -21,12 +21,12 @@
   -->
 
 <beans:beans xmlns="http://www.springframework.org/schema/osgi"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+    xsi:schemaLocation="http://www.springframework.org/schema/osgi
        http://www.springframework.org/schema/osgi/spring-osgi.xsd
-       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<service ref="restapiCallNode" interface="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" />
+    <service ref="restapiCallNode" interface="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" />
 
 </beans:beans>
diff --git a/restapi-call-node/provider/src/main/resources/default-ueb-message.json b/restapi-call-node/provider/src/main/resources/default-ueb-message.json
index 4b1aa0386..6ef6be7f6 100644
--- a/restapi-call-node/provider/src/main/resources/default-ueb-message.json
+++ b/restapi-call-node/provider/src/main/resources/default-ueb-message.json
@@ -20,13 +20,13 @@
  */
 
 {
-	"event":{
-		"header":{
-			"eventSource":"sdn-c"
-		},
-		"body":
+    "event":{
+        "header":{
+            "eventSource":"sdn-c"
+        },
+        "body":
 
 ${rootVarName}
 
-	}
+    }
 }
diff --git a/restapi-call-node/provider/src/main/resources/northbound-api-template.json b/restapi-call-node/provider/src/main/resources/northbound-api-template.json
index d48c41ce9..73a61b636 100644
--- a/restapi-call-node/provider/src/main/resources/northbound-api-template.json
+++ b/restapi-call-node/provider/src/main/resources/northbound-api-template.json
@@ -19,25 +19,25 @@
  * ============LICENSE_END=========================================================
  */
 
-{ 
-"input": 
-            { 
-			"sdnc-request-header":{
-				"svc-request-id":	${service-topology-operation-input.sdnc-request-header.svc-request-id},
-				"svc-notification-url":	${service-topology-operation-input.sdnc-request-header.svc-notification-url}
-			},
-			"request-information":{
-				"request-id":	${service-topology-operation-input.request-information.request-id},
-				"request-action":	${service-topology-operation-input.request-information.request-action},
-				"request-sub-action":	${service-topology-operation-input.request-information.request-sub-action},
-				"source":	${service-topology-operation-input.request-information.source},
-				"notification-url":	${service-topology-operation-input.request-information.notification-url}
-			},
-			"service-information":{
-				"service-type":	${service-topology-operation-input.service-information.service-type},
-				"service-instance-id":	${service-topology-operation-input.service-information.service-instance-id},
-				"subscriber-name":	${service-topology-operation-input.service-information.subscriber-name},
-				"subscriber-global-id": ${service-topology-operation-input.service-information.subscriber-global-id}
-			}
+{
+"input":
+            {
+            "sdnc-request-header":{
+                "svc-request-id":	${service-topology-operation-input.sdnc-request-header.svc-request-id},
+                "svc-notification-url":	${service-topology-operation-input.sdnc-request-header.svc-notification-url}
+            },
+            "request-information":{
+                "request-id":	${service-topology-operation-input.request-information.request-id},
+                "request-action":	${service-topology-operation-input.request-information.request-action},
+                "request-sub-action":	${service-topology-operation-input.request-information.request-sub-action},
+                "source":	${service-topology-operation-input.request-information.source},
+                "notification-url":	${service-topology-operation-input.request-information.notification-url}
+            },
+            "service-information":{
+                "service-type":	${service-topology-operation-input.service-information.service-type},
+                "service-instance-id":	${service-topology-operation-input.service-information.service-instance-id},
+                "subscriber-name":	${service-topology-operation-input.service-information.subscriber-name},
+                "subscriber-global-id": ${service-topology-operation-input.service-information.subscriber-global-id}
+            }
 }
-            
+
diff --git a/restapi-call-node/provider/src/main/resources/northbound-api-template.xml b/restapi-call-node/provider/src/main/resources/northbound-api-template.xml
index 5c2b9ad9a..aea0625c1 100644
--- a/restapi-call-node/provider/src/main/resources/northbound-api-template.xml
+++ b/restapi-call-node/provider/src/main/resources/northbound-api-template.xml
@@ -37,7 +37,7 @@
          <service-type>${service-topology-operation-input.service-information.service-type}</service-type>
          <subscriber-global-id>${service-topology-operation-input.service-information.subscriber-global-id}</subscriber-global-id>
          <subscriber-name>${service-topology-operation-input.service-information.subscriber-name}</subscriber-name>
-	</service-information>
+    </service-information>
         ${'northbound-anyData}
     </${northbound-Container}>
    </input>