Prepare codebase for dynamic DMaaP configuration

From now on, there is only one single place
where we can create whole app core concerning sending events
and it has a single entry point, based on DMaaP configuration.
It can be used to rebuild part of app that is responsible
for sending events dynamically.
Changes are in scope for the dynamic DMaaP config feature.
+ bumped up code coverage a bit

Change-Id: Iecc8c4e534ae9b781f47e3616409271ba83169c8
Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>
Issue-ID: DCAEGEN2-517

2 files changed, 18 insertions, 182 deletions

diff --git a/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java b/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java
index 695f53c9..9400e46d 100644
--- a/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java
+++ b/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java
@@ -19,89 +19,45 @@
  */
 package org.onap.dcae.vestest;
 
-import com.google.common.collect.ImmutableMap;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.google.common.collect.Sets;
-import org.json.JSONObject;
+import java.util.Set;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.dcae.commonFunction.AnyNode;
 
-import java.io.IOException;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 /**
  * Created by koblosz on 07.06.18.
  */
 public class AnyNodeTest {
 
-    private static final String SAMPLE_JSON_FILEPATH = "src/test/resources/test_anynode_class.json";
-    private static final Map<String, Object> EXPECTED_RAW_MAP = ImmutableMap.<String, Object>builder().put("a", 1).put("b", 2).build();
-    private static final Set<String> EXPECTED_JSON_KEYS = Sets.newHashSet("channels", "sampleStrList", "sampleNestedObject", "sampleInt", "sampleString", "sampleNull");
+    private static final String SAMPLE_JSON_FILEPATH = "{\n"
+        + "  \"channels\": [{\n"
+        + "    \"one\": \"number1\", \"two\": \"number2\", \"three\": \"number3\"}],\n"
+        + "  \"sampleStrList\": [\"1\", \"2\", \"3\", \"4\", \"5\"],\n"
+        + "  \"sampleNestedObject\": {\"a\": 1, \"b\": 2},\n"
+        + "  \"sampleInt\": 1,\n"
+        + "  \"sampleString\": \"str\",\n"
+        + "  \"sampleNull\": null\n"
+        + "}\n";
+    private static final Set<String> EXPECTED_JSON_KEYS = Sets
+        .newHashSet("channels", "sampleStrList", "sampleNestedObject", "sampleInt", "sampleString", "sampleNull");
     private static AnyNode node;
 
 
     @BeforeClass
-    public static void setUpClass() throws IOException {
-        node = AnyNode.parse(SAMPLE_JSON_FILEPATH);
-    }
-
-    @Test(expected = IOException.class)
-    public void testShouldRethrowExceptionWhenFileNotFound() throws IOException {
-        AnyNode.parse("not/existing/path");
+    public static void setUpClass() {
+        node = AnyNode.fromString(SAMPLE_JSON_FILEPATH);
     }
 
     @Test
     public void testShouldReturnJsonObjectKeySet() {
-        assertThat(node.getKeys()).containsOnlyElementsOf(EXPECTED_JSON_KEYS);
-    }
-
-    @Test
-    public void testShouldGetElementAsString() {
-        assertThat(node.get("sampleStrList").get(0).asString()).isEqualTo("1");
-    }
-
-    @Test
-    public void testShouldGetElementAsInt() {
-        assertThat(node.get("sampleInt").asInt()).isSameAs(1);
-    }
-
-    @Test
-    public void testWhenNullValuePresentShouldReturnJsonObjectNullAsString() {
-        assertThat(node.get("sampleNull").asString()).isSameAs(JSONObject.NULL.toString());
+        assertThat(node.keys()).containsOnlyElementsOf(EXPECTED_JSON_KEYS);
     }
 
-    @Test
-    public void testShouldGetJsonObjectAsStringToObjectMap() {
-        assertThat(node.get("sampleNestedObject").asRawMap()).containsAllEntriesOf(EXPECTED_RAW_MAP);
-    }
-
-    @Test
-    public void testShouldGetAsMap() {
-        assertThat(node.asMap().keySet()).containsOnlyElementsOf(EXPECTED_JSON_KEYS);
-    }
-
-    @Test
-    public void testShouldGetAsList() {
-        assertThat(node.get("sampleStrList").asList().stream().map(AnyNode::asString).collect(Collectors.toList())).containsExactly("1", "2", "3", "4", "5");
-    }
-
-    @Test
-    public void testShouldGetAsOptional() {
-        assertThat(node.getAsOptional("absentKey")).isNotPresent();
-    }
-
-    @Test
-    public void testWhenChainMethodsShouldReturnValue() {
-        assertThat(node.get("channels").get(0).get("two").asString()).isEqualTo("number2");
-    }
-
-
     @Test(expected = ClassCastException.class)
     public void whenInvokedOnJsonObjInsteadOfJsonArrShouldRaiseRuntimeEx() {
-        node.asList();
+        node.toList();
     }
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/dcae/vestest/DmaapPropertyReaderTest.java b/src/test/java/org/onap/dcae/vestest/DmaapPropertyReaderTest.java
deleted file mode 100644
index 46f5da4b..00000000
--- a/src/test/java/org/onap/dcae/vestest/DmaapPropertyReaderTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * org.onap.dcaegen2.collectors.ves

- * ================================================================================

- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.

- * Copyright (C) 2018 Nokia. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-package org.onap.dcae.vestest;

-

-import com.google.common.collect.ImmutableMap;

-import org.junit.Test;

-import org.onap.dcae.commonFunction.DmaapPropertyReader;

-

-import java.util.Map;

-

-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;

-

-public class DmaapPropertyReaderTest {

-

-

-    private static final String legacyConfigFilePath = "src/test/resources/testDmaapConfig_ip.json";

-    private static final String dmaapInputConfigFilePath = "src/test/resources/testDmaapConfig_gen2.json";

-    private static final String fullDmaapConfigWithChannels = "src/test/resources/testFullDmaapConfig_channels.json";

-    private static final String fullGen2DmaapConfig = "src/test/resources/testFullDmaapConfig_gen2.json";

-

-    private static final String FAULT_UEB_KEY_PREFIX = "sec_fault_ueb";

-    private static final String VES_ALERT_SND_KEY_PREFIX = "ves-thresholdCrossingAlert-secondary";

-    private static final String VES_FAULT_SECONDARY = "ves-fault-secondary";

-

-    private static final String FAULT_BASIC_AUTH_USERNAME_KEY = VES_FAULT_SECONDARY + ".basicAuthUsername";

-    private static final String ALERT_BASIC_AUTH_PWD_KEY = VES_ALERT_SND_KEY_PREFIX + ".basicAuthPassword";

-

-    private static final String VES_ALERT_CAMBRIA_TOPIC_KEY = VES_ALERT_SND_KEY_PREFIX + ".cambria.topic";

-    private static final String VES_ALERT_CAMBRIA_URL_KEY = VES_ALERT_SND_KEY_PREFIX + ".cambria.url";

-    private static final String VES_FAULT_SND_CAMBRIA_URL_KEY = VES_FAULT_SECONDARY + ".cambria.url";

-    private static final String VES_FAULT_SND_AUTH_PWD_KEY = VES_FAULT_SECONDARY + ".basicAuthPassword";

-    private static final String VES_FAULT_SND_CAMBRIA_TOPIC_KEY = VES_FAULT_SECONDARY + ".cambria.topic";

-    private static final String FAULT_UEB_CAMBRIA_HOSTS_KEY = FAULT_UEB_KEY_PREFIX + ".cambria.hosts";

-    private static final String FAULT_UEB_CAMBRIA_TOPIC_KEY = FAULT_UEB_KEY_PREFIX + ".cambria.topic";

-    private static final String VES_ALERT_SND_AUTH_USERNAME_KEY = VES_ALERT_SND_KEY_PREFIX + ".basicAuthUsername";

-

-    private static final String NULL_TOSTRING = "null";

-

-    private static final Map<String, String> expectedCompleteGen2DmaapConfig = ImmutableMap.<String, String>builder()

-            .put(ALERT_BASIC_AUTH_PWD_KEY, "SamplePassWD2")

-            .put(VES_ALERT_CAMBRIA_TOPIC_KEY, "DCAE-SE-COLLECTOR-EVENTS-DEV")

-            .put(FAULT_BASIC_AUTH_USERNAME_KEY, "sampleUsername")

-            .put(VES_ALERT_CAMBRIA_URL_KEY, "UEBHOST:3904")

-            .put(VES_FAULT_SND_CAMBRIA_URL_KEY, "UEBHOST:3904")

-            .put(VES_FAULT_SND_AUTH_PWD_KEY, "SamplePasswd")

-            .put(VES_FAULT_SND_CAMBRIA_TOPIC_KEY, "DCAE-SE-COLLECTOR-EVENTS-DEV")

-            .put(VES_ALERT_SND_AUTH_USERNAME_KEY, "sampleUsername2")

-            .build();

-

-    private static final Map<String, String> expectedIncompleteGen2DmaapConfig = ImmutableMap.<String, String>builder()

-            .put(VES_ALERT_SND_AUTH_USERNAME_KEY, NULL_TOSTRING)

-            .put(FAULT_BASIC_AUTH_USERNAME_KEY, NULL_TOSTRING)

-            .put(VES_ALERT_CAMBRIA_TOPIC_KEY, "DCAE-SE-COLLECTOR-EVENTS-DEV")

-            .put(VES_ALERT_CAMBRIA_URL_KEY, "UEBHOST:3904")

-            .put(VES_FAULT_SND_CAMBRIA_URL_KEY, "UEBHOST:3904")

-            .put(ALERT_BASIC_AUTH_PWD_KEY, NULL_TOSTRING)

-            .put(VES_FAULT_SND_AUTH_PWD_KEY, NULL_TOSTRING)

-            .put(VES_FAULT_SND_CAMBRIA_TOPIC_KEY, "DCAE-SE-COLLECTOR-EVENTS-DEV")

-            .build();

-

-    private static final Map<String, String> expectedCompleteChannelsDmaapConfig = ImmutableMap.<String, String>builder()

-            .put(FAULT_UEB_CAMBRIA_HOSTS_KEY, "uebsb91kcdc.it.att.com,uebsb92kcdc.it.att.com,uebsb93kcdc.it.att.com")

-            .put(FAULT_UEB_CAMBRIA_TOPIC_KEY, "DCAE-SE-COLLECTOR-EVENTS-DEV")

-            .put(FAULT_UEB_KEY_PREFIX + ".basicAuthPassword", "S0mEPassWD")

-            .put(FAULT_UEB_KEY_PREFIX + ".basicAuthUsername", "sampleUser")

-            .put(FAULT_UEB_KEY_PREFIX + ".cambria.url", "127.0.0.1:3904")

-            .build();

-

-    private static final Map<String, String> expectedIncompleteChannelsDmaapConfig = ImmutableMap.<String, String>builder()

-            .put(FAULT_UEB_CAMBRIA_HOSTS_KEY, "uebsb91kcdc.it.att.com,uebsb92kcdc.it.att.com,uebsb93kcdc.it.att.com")

-            .put(FAULT_UEB_CAMBRIA_TOPIC_KEY, "DCAE-SE-COLLECTOR-EVENTS-DEV")

-            .build();

-

-    @Test

-    public void testShouldCreateReaderWithAbsentParamsOmittedBasedOnChannelDmaapConfig() {

-        assertReaderPreservedAllEntriesAfterTransformation(legacyConfigFilePath, expectedIncompleteChannelsDmaapConfig);

-    }

-

-    @Test

-    public void testShouldCreateReaderWithAbsentParamsOmittedBasedOnGen2DmaapConfig() {

-        assertReaderPreservedAllEntriesAfterTransformation(dmaapInputConfigFilePath, expectedIncompleteGen2DmaapConfig);

-    }

-

-    @Test

-    public void shouldCreateReaderWithCompleteChannelDmaapConfig() {

-        assertReaderPreservedAllEntriesAfterTransformation(fullDmaapConfigWithChannels, expectedCompleteChannelsDmaapConfig);

-    }

-

-    @Test

-    public void shouldCreateReaderWithCompleteGen2DmaapConfig() {

-        assertReaderPreservedAllEntriesAfterTransformation(fullGen2DmaapConfig, expectedCompleteGen2DmaapConfig);

-    }

-

-    private void assertReaderPreservedAllEntriesAfterTransformation(String dmaapConfigFilePath, Map<String, String> expectedMap) {

-        DmaapPropertyReader reader = new DmaapPropertyReader(dmaapConfigFilePath);

-

-        assertThat(reader.getDmaapProperties()).containsAllEntriesOf(expectedMap);

-        assertThat(expectedMap).containsAllEntriesOf(reader.getDmaapProperties());

-    }

-

-}

-