1 files changed, 109 insertions, 193 deletions

diff --git a/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java b/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
index dabd2b15..c0659aa6 100644
--- a/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
+++ b/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
@@ -20,204 +20,120 @@
 
 package org.onap.dcae.commonFunction;
 
-import java.io.FileNotFoundException;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import java.io.FileReader;
+
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
-
-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 java.util.Objects;
+import java.util.stream.Collectors;
 
 public class DmaapPropertyReader {
 
-	private static final String HOST_URL = " HOST-URL:";
-	private static final String TOPIC = "TOPIC:";
-	private static final String CAMBRIA_URL = "cambria.url";
-	private static final String CAMBRIA_HOSTS = "cambria.hosts";
-	private static final String PWD = " PWD:";
-	private static final String USER = " USER:";
-	private static final String BASIC_AUTH_PASSWORD = "basicAuthPassword";
-	private static final String BASIC_AUTH_USER_NAME = "basicAuthUsername";
-	private static DmaapPropertyReader instance = null;
-
-	private static final Logger log = LoggerFactory.getLogger(DmaapPropertyReader.class);
-
-	public HashMap<String, String> dmaap_hash = new HashMap<>();
-
-	public DmaapPropertyReader(String CambriaConfigFile) {
-
-		FileReader fr = null;
-		try {
-			JsonElement root = null;
-			fr = new FileReader(CambriaConfigFile);
-			root = new JsonParser().parse(fr);
-
-			// Check if dmaap config is handled by legacy controller/service
-			// manager
-			if (root.getAsJsonObject().has("channels")) {
-				JsonArray jsonObject = (JsonArray) root.getAsJsonObject().get("channels");
-
-				for (int i = 0; i < jsonObject.size(); i++) {
-					log.debug(TOPIC + jsonObject.get(i).getAsJsonObject().get("cambria.topic") + HOST_URL
-							+ jsonObject.get(i).getAsJsonObject().get(CAMBRIA_URL) + " HOSTS:"
-							+ jsonObject.get(i).getAsJsonObject().get(CAMBRIA_HOSTS) + PWD
-							+ jsonObject.get(i).getAsJsonObject().get(BASIC_AUTH_PASSWORD) + USER
-							+ jsonObject.get(i).getAsJsonObject().get(BASIC_AUTH_USER_NAME) + " NAME:"
-							+ jsonObject.get(i).getAsJsonObject().get("name"));
-
-					String convertedname = jsonObject.get(i).getAsJsonObject().get("name").toString().replace("\"", "");
-					dmaap_hash.put(convertedname + ".cambria.topic",
-							jsonObject.get(i).getAsJsonObject().get("cambria.topic").toString().replace("\"", ""));
-
-					if (jsonObject.get(i).getAsJsonObject().get(CAMBRIA_HOSTS) != null) {
-						dmaap_hash.put(convertedname + ".cambria.hosts",
-								jsonObject.get(i).getAsJsonObject().get(CAMBRIA_HOSTS).toString().replace("\"", ""));
-					}
-					if (jsonObject.get(i).getAsJsonObject().get(CAMBRIA_URL) != null) {
-						dmaap_hash.put(convertedname + ".cambria.url",
-								jsonObject.get(i).getAsJsonObject().get(CAMBRIA_URL).toString().replace("\"", ""));
-					}
-					if (jsonObject.get(i).getAsJsonObject().get(BASIC_AUTH_PASSWORD) != null) {
-						dmaap_hash.put(convertedname + ".basicAuthPassword", jsonObject.get(i).getAsJsonObject()
-								.get(BASIC_AUTH_PASSWORD).toString().replace("\"", ""));
-					}
-					if (jsonObject.get(i).getAsJsonObject().get(BASIC_AUTH_USER_NAME) != null) {
-						dmaap_hash.put(convertedname + ".basicAuthUsername", jsonObject.get(i).getAsJsonObject()
-								.get(BASIC_AUTH_USER_NAME).toString().replace("\"", ""));
-					}
-
-				}
-			} else {
-
-				// Handing new format from controllergen2/config_binding_service
-				JsonObject jsonObject = root.getAsJsonObject();
-				Set<Map.Entry<String, JsonElement>> entries = jsonObject.entrySet();
-
-				for (Map.Entry<String, JsonElement> entry : entries) {
-
-					JsonElement topicurl = entry.getValue().getAsJsonObject().get("dmaap_info").getAsJsonObject()
-							.get("topic_url");
-					String[] urlParts = dmaapUrlSplit(topicurl.toString().replace("\"", ""));
-
-					String mrTopic = null;
-					String mrUrl = null;
-					String[] hostport = null;
-					String username = null;
-					String userpwd = null;
-
-					try {
-
-						if (null != urlParts) {
-							mrUrl = urlParts[2];
-
-							// DCAE internal dmaap topic convention
-							if ("events".equals(urlParts[3])) {
-								mrTopic = urlParts[4];
-							} else {
-								// ONAP dmaap topic convention
-								mrTopic = urlParts[3];
-								hostport = mrUrl.split(":");
-							}
-
-						}
-					} catch (NullPointerException e) {
-						System.out.println("NullPointerException");
-						e.getMessage();
-					}
-
-					if (entry.getValue().getAsJsonObject().has("aaf_username")) {
-						username = entry.getValue().getAsJsonObject().get("aaf_username").toString().replace("\"", "");
-					}
-					if (entry.getValue().getAsJsonObject().has("aaf_password")) {
-						userpwd = entry.getValue().getAsJsonObject().get("aaf_password").toString().replace("\"", "");
-					}
-					if (hostport == null) {
-						log.debug(TOPIC + mrTopic + HOST_URL + mrUrl + PWD + userpwd + USER + username);
-					} else {
-						log.debug(TOPIC + mrTopic + HOST_URL + mrUrl + " HOSTS:" + hostport[0] + PWD
-								+ userpwd + USER + username + " NAME:" + entry.getKey());
-					}
-
-					dmaap_hash.put(entry.getKey() + ".cambria.topic", mrTopic);
-
-					if (!(hostport == null)) {
-						dmaap_hash.put(entry.getKey() + ".cambria.hosts", hostport[0]);
-					}
-
-					if (!(mrUrl == null)) {
-						dmaap_hash.put(entry.getKey() + ".cambria.url", mrUrl);
-					}
-
-					if (!(username == null)) {
-						dmaap_hash.put(entry.getKey() + ".basicAuthUsername", username);
-					}
-
-					if (!(userpwd == null)) {
-						dmaap_hash.put(entry.getKey() + ".basicAuthPassword", userpwd);
-					}
-
-				}
-
-			}
-
-		} catch (JsonIOException | JsonSyntaxException |
-
-				FileNotFoundException e1) {
-			e1.printStackTrace();
-			log.error("Problem loading Dmaap Channel configuration file: " + e1.toString());
-		} finally {
-			if (fr != null) {
-				try {
-					fr.close();
-				} catch (IOException e) {
-					log.error("Error closing file reader stream : " + e.toString());
-				}
-			}
-		}
-
-	}
-
-	/***
-	 * Dmaap url structure pub - https://<dmaaphostname>:<port>/events/
-	 * <namespace>.<dmaapcluster>.<topic>, sub - https://<dmaaphostname>:
-	 * <port>/events/<namespace>.<dmaapcluster>.<topic>/G1/u1";
-	 *
-	 * Onap url structure pub - http://<dmaaphostname>:<port>/<unauthenticated>.
-	 * <topic>,
-	 */
-
-	private String[] dmaapUrlSplit(String dmUrl) {
-		String[] multUrls = dmUrl.split(",");
-
-		StringBuffer newUrls = new StringBuffer();
-		String[] urlParts = null;
-		for (int i = 0; i < multUrls.length; i++) {
-			urlParts = multUrls[i].split("/");
-			if (i == 0) {
-				newUrls = newUrls.append(urlParts[2]);
-			} else {
-				newUrls = newUrls.append(",").append(urlParts[2]);
-			}
-		}
-		return urlParts;
-	}
-
-	public static synchronized DmaapPropertyReader getInstance(String channelConfig) {
-		if (instance == null) {
-			instance = new DmaapPropertyReader(channelConfig);
-		}
-		return instance;
-	}
-
-	public String getKeyValue(String hashKey) {
-		return this.dmaap_hash.get(hashKey);
-	}
-}
+
+    private static final Logger log = LoggerFactory.getLogger(DmaapPropertyReader.class);
+    private static final String CAMBRIA_TOPIC_KEY = "cambria.topic";
+    private static final String CAMBRIA_HOSTS_KEY = "cambria.hosts";
+    private static final String CAMBRIA_URL_KEY = "cambria.url";
+    private static final List<String> LEGACY_CHANNEL_MANDATORY_PARAMS = Lists.newArrayList(CAMBRIA_TOPIC_KEY, CAMBRIA_HOSTS_KEY, CAMBRIA_URL_KEY, "basicAuthPassword", "basicAuthUsername");
+    private static DmaapPropertyReader instance = null;
+    private final Map<String, String> dmaapProperties;
+
+    public DmaapPropertyReader(String cambriaConfigFilePath) {
+        this.dmaapProperties = DmaapPropertyReader.getProcessedDmaapProperties(cambriaConfigFilePath);
+    }
+
+    public Map<String, String> getDmaapProperties() {
+        return dmaapProperties;
+    }
+
+    public static synchronized DmaapPropertyReader getInstance(String channelConfig) {
+        if (instance == null) {
+            instance = new DmaapPropertyReader(channelConfig);
+        }
+        return instance;
+    }
+
+    public String getKeyValue(String hashKey) {
+        return dmaapProperties.get(hashKey);
+    }
+
+    private static Map<String, String> getProcessedDmaapProperties(String configFilePath) {
+        Map<String, String> transformedDmaapProperties = new HashMap<>();
+        try {
+            AnyNode root = AnyNode.parse(configFilePath);
+            if (root.hasKey("channels")) { // Check if dmaap config is handled by legacy controller/service/manager
+                transformedDmaapProperties = getLegacyDmaapPropertiesWithChannels(root.get("channels"));
+            } else {//Handing new format from controllergen2/config_binding_service
+                transformedDmaapProperties = getDmaapPropertiesWithInfoData(root);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return transformedDmaapProperties;
+    }
+
+    private static Map<String, String> getLegacyDmaapPropertiesWithChannels(AnyNode channelsNode) {
+        return channelsNode.asList().stream()
+                .map(DmaapPropertyReader::getTransformedMandatoryChannelProperties)
+                .flatMap(m -> m.entrySet().stream())
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
+    private static Map<String, String> getTransformedMandatoryChannelProperties(AnyNode channel) {
+        String prefix = channel.get("name").asString() + ".";
+        return channel.asMap().entrySet().stream().filter(el -> LEGACY_CHANNEL_MANDATORY_PARAMS.contains(el.getKey()) && !Objects.equals(el.getKey(), "name"))
+                .collect(Collectors.toMap(k -> prefix + k.getKey(), v -> v.getValue().asString().replace("\"", "")));
+    }
+
+    private static Map<String, String> getDmaapPropertiesWithInfoData(AnyNode root) {
+        return root.asMap().entrySet().stream()
+                .map(DmaapPropertyReader::getTransformedMandatoryInfoProperties).flatMap(m -> m.entrySet().stream())
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
+    private static Map<String, String> getTransformedMandatoryInfoProperties(Map.Entry<String, AnyNode> el) {
+        String prefix = el.getKey() + ".";
+        AnyNode val = el.getValue();
+        Map<String, String> map = Maps.newHashMap();
+        map.put(prefix + "basicAuthUsername", val.getAsOptional("aaf_username").orElse(AnyNode.nullValue()).asString().replace("\"", ""));
+        map.put(prefix + "basicAuthPassword", val.getAsOptional("aaf_password").orElse(AnyNode.nullValue()).asString().replace("\"", ""));
+        map.putAll(getParamsFromDmaapInfoTopicUrl(prefix, val.get("dmaap_info").get("topic_url").asString().replace("\"", "")));
+        return map;
+    }
+
+    /***
+     * Dmaap url structure pub - https://<dmaaphostname>:<port>/events/
+     * <namespace>.<dmaapcluster>.<topic>, sub - https://<dmaaphostname>:
+     * <port>/events/<namespace>.<dmaapcluster>.<topic>/G1/u1";
+     *
+     * Onap url structure pub - http://<dmaaphostname>:<port>/<unauthenticated>.
+     * <topic>,
+     */
+    private static Map<String, String> getParamsFromDmaapInfoTopicUrl(String keyPrefix, String topicUrl) {
+        Map<String, String> topicUrlParts = Maps.newHashMap();
+        try {
+            URL url = new URL(topicUrl);
+            topicUrlParts.put(keyPrefix + CAMBRIA_URL_KEY, url.getAuthority());
+            String[] pathParts = url.getPath().split("/");
+            if (pathParts.length > 2 && "events".equals(pathParts[1])) {
+                // DCAE internal dmaap topic convention
+                topicUrlParts.put(keyPrefix + CAMBRIA_TOPIC_KEY, pathParts[2]);
+            } else {
+                // ONAP dmaap topic convention
+                topicUrlParts.put(keyPrefix + CAMBRIA_TOPIC_KEY, pathParts[2]);
+                topicUrlParts.put(keyPrefix + CAMBRIA_HOSTS_KEY, url.getHost());
+            }
+        } catch (MalformedURLException e) {
+            log.error("Invalid URL found under topic_url key!", e);
+            e.printStackTrace();
+        }
+        return topicUrlParts;
+    }
+}
\ No newline at end of file