starts threads each for every supported collector

Make code changes so that mapper starts one thread each for every supported collector as per configuration

Change-Id: I90d3b9d27d0d64107b1b33c6752dc2f0c49344de
Issue-ID: DCAEGEN2-1174
Signed-off-by: amshegokar <AS00500801@techmahindra.com>

3 files changed, 1 insertions, 226 deletions

diff --git a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/adapter/UniversalEventAdapterTest.java b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/adapter/UniversalEventAdapterTest.java
index ec3cf7f..a5d03c9 100644
--- a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/adapter/UniversalEventAdapterTest.java
+++ b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/adapter/UniversalEventAdapterTest.java
@@ -219,7 +219,7 @@ public class UniversalEventAdapterTest  {
         try {
         	
             VESAdapterInitializer.setMappingFiles(testMap);
-        	String actualResult = universalVesAdapter.transform(incomingJsonString.toString(), "snmp");
+        	String actualResult = universalVesAdapter.transform(incomingJsonString.toString());
             assertNotNull(actualResult);
             assertNotEquals("", actualResult);
         } catch (VesException exception) {
diff --git a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/service/DMaapServiceTest.java b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/service/DMaapServiceTest.java
deleted file mode 100644
index f238306..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/service/DMaapServiceTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.universalvesadapter.service;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.mockito.stubbing.OngoingStubbing;
-import org.onap.universalvesadapter.Application;
-import org.onap.universalvesadapter.exception.DMaapException;
-import org.onap.universalvesadapter.service.DMaapService;
-import org.onap.universalvesadapter.service.DiskRepoConfigFileService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import com.att.nsa.mr.client.MRBatchingPublisher;
-import com.att.nsa.mr.client.MRConsumer;
-
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class DMaapServiceTest {
-
-    @Autowired
-    @InjectMocks
-    DMaapService dmaapService;
-    
-    @Mock
-    private MRConsumer consumer; 
-    
-    @Mock    
-    private MRBatchingPublisher publisher;
-    
-    private final Logger eLOGGER = LoggerFactory.getLogger(this.getClass());    
-    
-    @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
-    }    
-    
-    
-    
-    @Test
-    public void testConsumeFromDMaap() {
-        String[] iter = {"this ", "is ", "just ", "a ", "test"};
-        try {
-            Mockito.when(consumer.fetch()).thenReturn(Arrays.asList(iter));
-        } catch (IOException e) {
-            eLOGGER.error("Error occurred : " + e.getMessage());
-        } catch (Exception e) {
-            eLOGGER.error("Error occurred : " + e.getMessage());
-        }
-
-        StringBuffer sb = new StringBuffer("");
-        try {
-            for (String string : dmaapService.consumeFromDMaap()) {
-                sb.append(string);
-            }
-        } catch (DMaapException e) {
-            eLOGGER.error("Error occurred : " + e.getMessage());
-        }
-        
-        assertEquals("this is just a test", sb.toString());
-        
-    }
-
-    @Test
-    public void testPublishToDMaap() {
-        
-        dmaapService.addMessageInOutgoingQueue("test");
-        
-        ArgumentCaptor<?> valueCapture = ArgumentCaptor.forClass(String.class);
-        try {
-            int toBeReturned = 1;
-            doReturn(toBeReturned).when(publisher).send((String) valueCapture.capture());
-        } catch (IOException e) {
-            eLOGGER.error("Error occurred : " + e.getMessage());
-        }
-        try {
-            dmaapService.publishToDMaap();
-        } catch (DMaapException e) {
-            eLOGGER.error("Error occurred : " + e.getMessage());
-        }
-        assertEquals("test", valueCapture.getValue());
-        
-    }
-
-    @Test
-    public void testPublishToDMaapString() {
-        ArgumentCaptor<?> valueCapture = ArgumentCaptor.forClass(String.class);
-        try {
-            int toBeReturned = 1;
-            doReturn(toBeReturned).when(publisher).send((String) valueCapture.capture());
-        } catch (IOException e) {
-            eLOGGER.error("Error occurred : " + e.getMessage());
-        }
-        try {
-            dmaapService.publishToDMaap("test");
-        } catch (DMaapException e) {
-            eLOGGER.error("Error occurred : " + e.getMessage());
-        }
-        assertEquals("test", valueCapture.getValue());        
-        
-    }
-
-}
-
-*/
\ No newline at end of file
diff --git a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/MapperConfigUtilsTest.java b/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/MapperConfigUtilsTest.java
deleted file mode 100644
index 20e6d84..0000000
--- a/UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/utils/MapperConfigUtilsTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.universalvesadapter.utils;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-import org.onap.universalvesadapter.exception.MapperConfigException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class MapperConfigUtilsTest {
-
-     private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger");
-    
-    String mappingFileContent = "{" + "  \"entries\" : [" 
-            + "      {" 
-            + "          \"priority\" : 1,"
-            + "          \"evaluation\" : {" 
-            + "                  \"operand\" : \"STARTSWITH\","
-            + "                  \"field\" : \"notify OID\"," 
-            + "                  \"value\" : \".1.3.6.1.4.1.74\","
-            + "                  \"datatype\" : \"STRING\"," 
-            + "                  \"lhs\" : null,"
-            + "                  \"rhs\" : null  " 
-            + "              }," 
-            + "          \"result\" : \"snmp\""
-            + "      }       " 
-            + "  ]" 
-            + "}";
-
-    String inputJsonString = "{ " + "\"protocol version\":\"v2c\", "
-            + "\"notify OID\":\".1.3.6.1.4.1.74.2.46.12.1.1AAA\", "
-            + "\"cambria.partition\":\"dcae-snmp.client.research.att.com\", "
-            + "\"trap category\":\"UCSNMP-HEARTBEAT\", " 
-            + "\"epoch_serno\": 15161177410000, "
-            + "\"community\":\"public\", " 
-            + "\"time received\": 1516117741, " 
-            + "\"agent name\":\"localhost\", "
-            + "\"agent address\":\"127.0.0.1\", " 
-            + "\"community len\": 6, " 
-            + "\"notify OID len\": 12, "
-            + "\"varbinds\": [{ " 
-            + "    \"varbind_type\":\"octet\", "
-            + "    \"varbind_oid\":\".1.3.6.1.4.1.74.2.46.12.1.1.1\", "
-            + "    \"varbind_value\":\"ucsnmp heartbeat - ignore\" " 
-            + " }, { " + "    \"varbind_type\":\"octet\", "
-            + "    \"varbind_oid\":\".1.3.6.1.4.1.74.2.46.12.1.1.2\", "
-            + "    \"varbind_value\":\"Tue Jan 16 10:49:01 EST 2018\" " 
-            + " }] " + "}";
-
-    @Test
-    public void checkIncomingJsonForMatchingDomainTest() throws MapperConfigException {
-        try {
-            MapperConfigUtils.readMapperConfigFile(mappingFileContent);
-            String checkIncomingJsonForMatchingDomain = MapperConfigUtils
-                    .checkIncomingJsonForMatchingDomain(inputJsonString);
-            assertEquals("snmp", checkIncomingJsonForMatchingDomain);
-        } catch (MapperConfigException exception) {
-        	errorLogger.error("Error occurred : ", exception );
-        }
-
-    }
-
-}