1 files changed, 95 insertions, 46 deletions
diff --git a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParser.java b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParser.java
index 6b7860c4..3ac6b2c6 100644
--- a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParser.java
+++ b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParser.java
@@ -18,11 +18,17 @@
 
 package org.onap.dcaegen2.collectors.datafile.configuration;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapConsumerConfiguration;
-import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapPublisherConfiguration;
-import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.ImmutableDmaapConsumerConfiguration;
-import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.ImmutableDmaapPublisherConfiguration;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.onap.dcaegen2.collectors.datafile.exceptions.DatafileTaskException;
 
 
 /**
@@ -32,63 +38,106 @@ import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.Immutabl
  * @author <a href="mailto:henrik.b.andersson@est.tech">Henrik Andersson</a>
  */
 public class CloudConfigParser {
-
     private static final String DMAAP_SECURITY_TRUST_STORE_PATH = "dmaap.security.trustStorePath";
     private static final String DMAAP_SECURITY_TRUST_STORE_PASS_PATH = "dmaap.security.trustStorePasswordPath";
     private static final String DMAAP_SECURITY_KEY_STORE_PATH = "dmaap.security.keyStorePath";
     private static final String DMAAP_SECURITY_KEY_STORE_PASS_PATH = "dmaap.security.keyStorePasswordPath";
     private static final String DMAAP_SECURITY_ENABLE_DMAAP_CERT_AUTH = "dmaap.security.enableDmaapCertAuth";
 
-    private final JsonObject jsonObject;
+    private final JsonObject serviceConfigurationRoot;
+    private final JsonObject dmaapConfigurationRoot;
 
-    CloudConfigParser(JsonObject jsonObject) {
-        this.jsonObject = jsonObject;
+    public CloudConfigParser(JsonObject serviceConfigurationRoot, JsonObject dmaapConfigurationRoot) {
+        this.serviceConfigurationRoot = serviceConfigurationRoot;
+        this.dmaapConfigurationRoot = dmaapConfigurationRoot;
     }
 
-    DmaapPublisherConfiguration getDmaapPublisherConfig() {
-        return new ImmutableDmaapPublisherConfiguration.Builder()
-                .dmaapTopicName(jsonObject.get("dmaap.dmaapProducerConfiguration.dmaapTopicName").getAsString())
-                .dmaapUserPassword(jsonObject.get("dmaap.dmaapProducerConfiguration.dmaapUserPassword").getAsString())
-                .dmaapPortNumber(jsonObject.get("dmaap.dmaapProducerConfiguration.dmaapPortNumber").getAsInt())
-                .dmaapProtocol(jsonObject.get("dmaap.dmaapProducerConfiguration.dmaapProtocol").getAsString())
-                .dmaapContentType(jsonObject.get("dmaap.dmaapProducerConfiguration.dmaapContentType").getAsString())
-                .dmaapHostName(jsonObject.get("dmaap.dmaapProducerConfiguration.dmaapHostName").getAsString())
-                .dmaapUserName(jsonObject.get("dmaap.dmaapProducerConfiguration.dmaapUserName").getAsString())
-                .trustStorePath(jsonObject.get(DMAAP_SECURITY_TRUST_STORE_PATH).getAsString())
-                .trustStorePasswordPath(jsonObject.get(DMAAP_SECURITY_TRUST_STORE_PASS_PATH).getAsString())
-                .keyStorePath(jsonObject.get(DMAAP_SECURITY_KEY_STORE_PATH).getAsString())
-                .keyStorePasswordPath(jsonObject.get(DMAAP_SECURITY_KEY_STORE_PASS_PATH).getAsString())
-                .enableDmaapCertAuth(jsonObject.get(DMAAP_SECURITY_ENABLE_DMAAP_CERT_AUTH).getAsBoolean()) //
-                .build();
+    public Map<String, PublisherConfiguration> getDmaapPublisherConfig() throws DatafileTaskException {
+        Iterator<JsonElement> producerCfgs =
+                toArray(serviceConfigurationRoot.get("dmaap.dmaapProducerConfiguration")).iterator();
+
+        Map<String, PublisherConfiguration> result = new HashMap<>();
+
+        while (producerCfgs.hasNext()) {
+            JsonObject producerCfg = producerCfgs.next().getAsJsonObject();
+            String feedName = getAsString(producerCfg, "feedName");
+            JsonObject feedConfig = getFeedConfig(feedName);
+
+            PublisherConfiguration cfg = ImmutablePublisherConfiguration.builder() //
+                    .publishUrl(getAsString(feedConfig, "publish_url")) //
+                    .passWord(getAsString(feedConfig, "password")) //
+                    .userName(getAsString(feedConfig, "username")) //
+                    .trustStorePath(getAsString(serviceConfigurationRoot, DMAAP_SECURITY_TRUST_STORE_PATH)) //
+                    .trustStorePasswordPath(getAsString(serviceConfigurationRoot, DMAAP_SECURITY_TRUST_STORE_PASS_PATH)) //
+                    .keyStorePath(getAsString(serviceConfigurationRoot, DMAAP_SECURITY_KEY_STORE_PATH)) //
+                    .keyStorePasswordPath(getAsString(serviceConfigurationRoot, DMAAP_SECURITY_KEY_STORE_PASS_PATH)) //
+                    .enableDmaapCertAuth(
+                            get(serviceConfigurationRoot, DMAAP_SECURITY_ENABLE_DMAAP_CERT_AUTH).getAsBoolean()) //
+                    .changeIdentifier(getAsString(producerCfg, "changeIdentifier")) //
+                    .logUrl(getAsString(feedConfig, "log_url")) //
+                    .build();
+
+            result.put(cfg.changeIdentifier(), cfg);
+        }
+        return result;
     }
 
-    DmaapConsumerConfiguration getDmaapConsumerConfig() {
-        return new ImmutableDmaapConsumerConfiguration.Builder()
-                .timeoutMs(jsonObject.get("dmaap.dmaapConsumerConfiguration.timeoutMs").getAsInt())
-                .dmaapHostName(jsonObject.get("dmaap.dmaapConsumerConfiguration.dmaapHostName").getAsString())
-                .dmaapUserName(jsonObject.get("dmaap.dmaapConsumerConfiguration.dmaapUserName").getAsString())
-                .dmaapUserPassword(jsonObject.get("dmaap.dmaapConsumerConfiguration.dmaapUserPassword").getAsString())
-                .dmaapTopicName(jsonObject.get("dmaap.dmaapConsumerConfiguration.dmaapTopicName").getAsString())
-                .dmaapPortNumber(jsonObject.get("dmaap.dmaapConsumerConfiguration.dmaapPortNumber").getAsInt())
-                .dmaapContentType(jsonObject.get("dmaap.dmaapConsumerConfiguration.dmaapContentType").getAsString())
-                .messageLimit(jsonObject.get("dmaap.dmaapConsumerConfiguration.messageLimit").getAsInt())
-                .dmaapProtocol(jsonObject.get("dmaap.dmaapConsumerConfiguration.dmaapProtocol").getAsString())
-                .consumerId(jsonObject.get("dmaap.dmaapConsumerConfiguration.consumerId").getAsString())
-                .consumerGroup(jsonObject.get("dmaap.dmaapConsumerConfiguration.consumerGroup").getAsString())
-                .trustStorePath(jsonObject.get(DMAAP_SECURITY_TRUST_STORE_PATH).getAsString())
-                .trustStorePasswordPath(jsonObject.get(DMAAP_SECURITY_TRUST_STORE_PASS_PATH).getAsString())
-                .keyStorePath(jsonObject.get(DMAAP_SECURITY_KEY_STORE_PATH).getAsString())
-                .keyStorePasswordPath(jsonObject.get(DMAAP_SECURITY_KEY_STORE_PASS_PATH).getAsString())
-                .enableDmaapCertAuth(jsonObject.get(DMAAP_SECURITY_ENABLE_DMAAP_CERT_AUTH).getAsBoolean()) //
+    public ConsumerConfiguration getDmaapConsumerConfig() throws DatafileTaskException {
+        JsonObject consumerCfg = serviceConfigurationRoot.get("streams_subscribes").getAsJsonObject();
+        Set<Entry<String, JsonElement>> topics = consumerCfg.entrySet();
+        if (topics.size() != 1) {
+            throw new DatafileTaskException("Invalid configuration, number oftopic must be one, config: " + topics);
+        }
+        JsonObject topic = topics.iterator().next().getValue().getAsJsonObject();
+        JsonObject dmaapInfo = get(topic, "dmmap_info").getAsJsonObject();
+        String topicUrl = getAsString(dmaapInfo, "topic_url");
+
+        return ImmutableConsumerConfiguration.builder().topicUrl(topicUrl)
+                .trustStorePath(getAsString(serviceConfigurationRoot, DMAAP_SECURITY_TRUST_STORE_PATH))
+                .trustStorePasswordPath(getAsString(serviceConfigurationRoot, DMAAP_SECURITY_TRUST_STORE_PASS_PATH))
+                .keyStorePath(getAsString(serviceConfigurationRoot, DMAAP_SECURITY_KEY_STORE_PATH))
+                .keyStorePasswordPath(getAsString(serviceConfigurationRoot, DMAAP_SECURITY_KEY_STORE_PASS_PATH))
+                .enableDmaapCertAuth(
+                        get(serviceConfigurationRoot, DMAAP_SECURITY_ENABLE_DMAAP_CERT_AUTH).getAsBoolean()) //
                 .build();
     }
 
-    FtpesConfig getFtpesConfig() {
+    public FtpesConfig getFtpesConfig() throws DatafileTaskException {
         return new ImmutableFtpesConfig.Builder() //
-                .keyCert(jsonObject.get("dmaap.ftpesConfig.keyCert").getAsString())
-                .keyPassword(jsonObject.get("dmaap.ftpesConfig.keyPassword").getAsString())
-                .trustedCa(jsonObject.get("dmaap.ftpesConfig.trustedCa").getAsString())
-                .trustedCaPassword(jsonObject.get("dmaap.ftpesConfig.trustedCaPassword").getAsString()) //
+                .keyCert(getAsString(serviceConfigurationRoot, "dmaap.ftpesConfig.keyCert"))
+                .keyPassword(getAsString(serviceConfigurationRoot, "dmaap.ftpesConfig.keyPassword"))
+                .trustedCa(getAsString(serviceConfigurationRoot, "dmaap.ftpesConfig.trustedCa"))
+                .trustedCaPassword(getAsString(serviceConfigurationRoot, "dmaap.ftpesConfig.trustedCaPassword")) //
                 .build();
     }
+
+    private static JsonElement get(JsonObject obj, String memberName) throws DatafileTaskException {
+        JsonElement elem = obj.get(memberName);
+        if (elem == null) {
+            throw new DatafileTaskException("Could not find member: " + memberName + " in: " + obj);
+        }
+        return elem;
+    }
+
+    private static String getAsString(JsonObject obj, String memberName) throws DatafileTaskException {
+        return get(obj, memberName).getAsString();
+    }
+
+    private JsonObject getFeedConfig(String feedName) throws DatafileTaskException {
+        JsonElement elem = dmaapConfigurationRoot.get(feedName);
+        if (elem == null) {
+            elem = get(serviceConfigurationRoot, feedName); // Fallback, try to find it under
+                                                            // serviceConfigurationRoot
+        }
+        return elem.getAsJsonObject();
+    }
+
+    private static JsonArray toArray(JsonElement obj) {
+        if (obj.isJsonArray()) {
+            return obj.getAsJsonArray();
+        }
+        JsonArray arr = new JsonArray();
+        arr.add(obj);
+        return arr;
+    }
 }