Replace nsaCore library with Spring

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

6 files changed, 59 insertions, 228 deletions

diff --git a/src/test/java/org/onap/dcae/ApplicationSettingsTest.java b/src/test/java/org/onap/dcae/ApplicationSettingsTest.java
index b162cef2..b483bcb6 100644
--- a/src/test/java/org/onap/dcae/ApplicationSettingsTest.java
+++ b/src/test/java/org/onap/dcae/ApplicationSettingsTest.java
@@ -28,6 +28,7 @@ import org.junit.Test;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Objects;
 
@@ -153,7 +154,7 @@ public class ApplicationSettingsTest {
         String passwordFileLocation = fromTemporaryConfiguration("collector.keystore.passwordfile=/somewhere/password").keystorePasswordFileLocation();
 
         // then
-        assertEquals("/somewhere/password", passwordFileLocation);
+        assertEquals(sanitizePath("/somewhere/password"), passwordFileLocation);
     }
 
     @Test
@@ -162,7 +163,7 @@ public class ApplicationSettingsTest {
         String passwordFileLocation = fromTemporaryConfiguration().keystorePasswordFileLocation();
 
         // then
-        assertEquals("./etc/passwordfile", passwordFileLocation);
+        assertEquals(sanitizePath("etc/passwordfile"), passwordFileLocation);
     }
 
     @Test
@@ -172,7 +173,7 @@ public class ApplicationSettingsTest {
                 .keystoreFileLocation();
 
         // then
-        assertEquals("/somewhere/keystore", keystoreFileLocation);
+        assertEquals(sanitizePath("/somewhere/keystore"), keystoreFileLocation);
     }
 
     @Test
@@ -181,7 +182,7 @@ public class ApplicationSettingsTest {
         String keystoreFileLocation = fromTemporaryConfiguration().keystoreFileLocation();
 
         // then
-        assertEquals("../etc/keystore", keystoreFileLocation);
+        assertEquals(sanitizePath("etc/keystore"), keystoreFileLocation);
     }
 
 
@@ -209,7 +210,7 @@ public class ApplicationSettingsTest {
         String dmaapConfigFileLocation = fromTemporaryConfiguration("collector.dmaapfile=/somewhere/dmaapFile").cambriaConfigurationFileLocation();
 
         // then
-        assertEquals("/somewhere/dmaapFile", dmaapConfigFileLocation);
+        assertEquals(sanitizePath("/somewhere/dmaapFile"), dmaapConfigFileLocation);
     }
 
     @Test
@@ -218,7 +219,7 @@ public class ApplicationSettingsTest {
         String dmaapConfigFileLocation = fromTemporaryConfiguration().cambriaConfigurationFileLocation();
 
         // then
-        assertEquals("./etc/DmaapConfig.json", dmaapConfigFileLocation);
+        assertEquals(sanitizePath("etc/DmaapConfig.json"), dmaapConfigFileLocation);
     }
 
     @Test
@@ -347,25 +348,25 @@ public class ApplicationSettingsTest {
     @Test
     public void shouldReturnValidCredentials() throws IOException {
         // when
-        String userToBase64PasswordDelimitedByCommaSeparatedByPipes = fromTemporaryConfiguration(
-                "header.authlist=pasza,123jsad1|someoneelse,12asd31"
+        Map<String, String> allowedUsers = fromTemporaryConfiguration(
+                "header.authlist=pasza,c2ltcGxlcGFzc3dvcmQNCg==|someoneelse,c2ltcGxlcGFzc3dvcmQNCg=="
         ).validAuthorizationCredentials();
 
         // then
-        assertEquals("pasza,123jsad1|someoneelse,12asd31", userToBase64PasswordDelimitedByCommaSeparatedByPipes);
+        assertEquals(allowedUsers.get("pasza").get(), "simplepassword");
+        assertEquals(allowedUsers.get("someoneelse").get(), "simplepassword");
     }
 
     @Test
     public void shouldbyDefaultThereShouldBeNoValidCredentials() throws IOException {
         // when
-        String userToBase64PasswordDelimitedByCommaSeparatedByPipes = fromTemporaryConfiguration().
+        Map<String, String> userToBase64PasswordDelimitedByCommaSeparatedByPipes = fromTemporaryConfiguration().
                 validAuthorizationCredentials();
 
         // then
-        assertNull(userToBase64PasswordDelimitedByCommaSeparatedByPipes);
+        assertTrue(userToBase64PasswordDelimitedByCommaSeparatedByPipes.isEmpty());
     }
 
-
     @Test
     public void shouldReturnIfEventTransformingIsEnabled() throws IOException {
         // when
@@ -392,7 +393,7 @@ public class ApplicationSettingsTest {
                 .cambriaConfigurationFileLocation();
 
         // then
-        assertEquals("/somewhere/dmaapConfig", cambriaConfigurationFileLocation);
+        assertEquals(sanitizePath("/somewhere/dmaapConfig"), cambriaConfigurationFileLocation);
     }
 
     @Test
@@ -402,7 +403,7 @@ public class ApplicationSettingsTest {
                 .cambriaConfigurationFileLocation();
 
         // then
-        assertEquals("./etc/DmaapConfig.json", cambriaConfigurationFileLocation);
+        assertEquals(sanitizePath("etc/DmaapConfig.json"), cambriaConfigurationFileLocation);
     }
 
     private static ApplicationSettings fromTemporaryConfiguration(String... fileLines)
@@ -410,8 +411,10 @@ public class ApplicationSettingsTest {
         File tempConfFile = File.createTempFile("doesNotMatter", "doesNotMatter");
         Files.write(tempConfFile.toPath(), Arrays.asList(fileLines));
         tempConfFile.deleteOnExit();
-        return new ApplicationSettings(new String[]{"-c", tempConfFile.toString()}, args -> processCmdLine(args));
+        return new ApplicationSettings(new String[]{"-c", tempConfFile.toString()}, args -> processCmdLine(args), "");
     }
 
-
+    private String sanitizePath(String path) {
+        return Paths.get(path).toString();
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/dcae/commonFunction/CommonStartupTest.java b/src/test/java/org/onap/dcae/commonFunction/CommonStartupTest.java
deleted file mode 100644
index 5a171484..00000000
--- a/src/test/java/org/onap/dcae/commonFunction/CommonStartupTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.commonFunction;
-
-import static java.util.Base64.getDecoder;
-import static java.util.Base64.getEncoder;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.att.nsa.cmdLine.NsaCommandLineUtil;
-import com.att.nsa.drumlin.service.framework.context.DrumlinRequest;
-import com.att.nsa.drumlin.till.nv.impl.nvReadableStack;
-import com.att.nsa.drumlin.till.nv.impl.nvReadableTable;
-import com.att.nsa.drumlin.till.nv.rrNvReadable.loadException;
-import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;
-import com.att.nsa.security.authenticators.SimpleAuthenticator;
-import com.att.nsa.security.db.simple.NsaSimpleApiKey;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Map;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.onap.dcae.ApplicationSettings;
-import org.onap.dcae.CLIUtils;
-import org.onap.dcae.commonFunction.CommonStartup.QueueFullException;
-import org.onap.dcae.commonFunction.event.publishing.EventPublisher;
-import org.onap.dcae.restapi.RestfulCollectorServlet;
-import org.onap.dcae.vestest.TestingUtilities;
-
-
-public class CommonStartupTest {
-
-    @Test
-    public void testParseCLIArguments() {
-        // given
-        String args[] = {"-a", "aa"};
-        Map<String, String> argMap = NsaCommandLineUtil.processCmdLine(args, true);
-        // when
-        nvReadableStack settings = new nvReadableStack();
-        settings.push(new nvReadableTable(argMap));
-
-        // then
-        assertEquals(settings.getString("a", "default"), "aa");
-    }
-
-    @Test
-    public void shouldPutValidVESEventOnProcessingQueueWithoutExceptions() throws IOException, QueueFullException {
-        // given
-        CommonStartup.fProcessingInputQueue = new LinkedBlockingQueue<>(
-            CommonStartup.maxQueueEvent);
-        JsonElement vesEvent = new JsonParser().parse(new FileReader("src/test/resources/VES_valid.txt"));
-        JSONObject validVESEvent = new JSONObject(vesEvent.toString());
-        JSONArray jsonArrayMod = new JSONArray().put(validVESEvent);
-
-        // then
-        CommonStartup.handleEvents(jsonArrayMod);
-    }
-
-
-    @Test
-    public void testParseStreamIdToStreamHashMapping() {
-        // given
-
-        CommonStartup.streamID = TestingUtilities.convertDMaaPStreamsPropertyToMap("fault=sec_fault|syslog=sec_syslog|heartbeat=sec_heartbeat|measurementsForVfScaling=sec_measurement|mobileFlow=sec_mobileflow|other=sec_other|stateChange=sec_statechange|thresholdCrossingAlert=sec_thresholdCrossingAlert|voiceQuality=ves_voicequality|sipSignaling=ves_sipsignaling");
-        EventProcessor eventProcessor = new EventProcessor(mock(EventPublisher.class));
-        // when
-        Map<String, String[]> streamHashMapping = EventProcessor.streamidHash;
-
-        // then
-        assertEquals(streamHashMapping.get("fault")[0], "sec_fault");
-        assertEquals(streamHashMapping.get("measurementsForVfScaling")[0], "sec_measurement");
-    }
-
-    @Test
-    public void testAuthListHandler() throws loadException, missingReqdSetting {
-        // given
-        ApplicationSettings settings = new ApplicationSettings(new String[]{}, CLIUtils::processCmdLine);
-
-        String user1 = "secureid";
-        String password1Hashed = "IWRjYWVSb2FkbTEyMyEt";
-        String password1UnHashed = new String(getDecoder().decode("IWRjYWVSb2FkbTEyMyEt"));
-        String user2 = "sample1";
-        String password2Hashed = "c2FtcGxlMQ";
-
-        String authlist = user1 + "," + password1Hashed + "|" + user2 + "," + password2Hashed;
-
-        RestfulCollectorServlet rsv = new RestfulCollectorServlet(settings);
-
-        DrumlinRequest drumlinRequestMock = Mockito.mock(DrumlinRequest.class);
-
-        String basicHeaderForUser1 = "Basic " + getEncoder().encodeToString((user1 + ":" + password1UnHashed).getBytes());
-        when(drumlinRequestMock.getFirstHeader("Authorization")).thenReturn(basicHeaderForUser1);
-
-        // when
-        SimpleAuthenticator simpleAuthenticator = (SimpleAuthenticator) rsv.createAuthenticator(authlist);
-        NsaSimpleApiKey authentic = simpleAuthenticator.isAuthentic(drumlinRequestMock);
-
-        // then
-        assertEquals(authentic.getSecret(), password1UnHashed);
-    }
-}
-
-
diff --git a/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java b/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java
index 77ef005f..f5c5d5f9 100644
--- a/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java
+++ b/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java
@@ -21,40 +21,42 @@
 package org.onap.dcae.commonFunction;
 
 import com.google.gson.Gson;
-import java.util.concurrent.atomic.AtomicReference;
-
-import io.vavr.collection.HashMap;
+import io.vavr.collection.Map;
 import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
-
-import java.util.List;
+import org.onap.dcae.ApplicationSettings;
+import org.onap.dcae.CLIUtils;
 import org.onap.dcae.commonFunction.event.publishing.EventPublisher;
 import org.onap.dcae.vestest.TestingUtilities;
 
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 import static org.onap.dcae.commonFunction.EventProcessor.EVENT_LIST_TYPE;
 
 public class EventProcessorTest {
 
     private final String ev = "{\"event\": {\"commonEventHeader\": {	\"reportingEntityName\": \"VM name will be provided by ECOMP\",	\"startEpochMicrosec\": 1477012779802988,\"lastEpochMicrosec\": 1477012789802988,\"eventId\": \"83\",\"sourceName\": \"Dummy VM name - No Metadata available\",\"sequence\": 83,\"priority\": \"Normal\",\"functionalRole\": \"vFirewall\",\"domain\": \"measurementsForVfScaling\",\"reportingEntityId\": \"VM UUID will be provided by ECOMP\",\"sourceId\": \"Dummy VM UUID - No Metadata available\",\"version\": 1.1},\"measurementsForVfScalingFields\": {\"measurementInterval\": 10,\"measurementsForVfScalingVersion\": 1.1,\"vNicUsageArray\": [{\"multicastPacketsIn\": 0,\"bytesIn\": 3896,\"unicastPacketsIn\": 0,	\"multicastPacketsOut\": 0,\"broadcastPacketsOut\": 0,		\"packetsOut\": 28,\"bytesOut\": 12178,\"broadcastPacketsIn\": 0,\"packetsIn\": 58,\"unicastPacketsOut\": 0,\"vNicIdentifier\": \"eth0\"}]}}}";
 
+    Map<String, String[]> streamID;
+    private ApplicationSettings properties;
+
     @Before
     public void setUp() {
-        CommonStartup.streamID = TestingUtilities.convertDMaaPStreamsPropertyToMap("fault=sec_fault|syslog=sec_syslog|heartbeat=sec_heartbeat|measurementsForVfScaling=sec_measurement|mobileFlow=sec_mobileflow|other=sec_other|stateChange=sec_statechange|thresholdCrossingAlert=sec_thresholdCrossingAlert|voiceQuality=ves_voicequality|sipSignaling=ves_sipsignaling");
+        streamID = TestingUtilities.convertDMaaPStreamsPropertyToMap("fault=sec_fault|syslog=sec_syslog|heartbeat=sec_heartbeat|measurementsForVfScaling=sec_measurement|mobileFlow=sec_mobileflow|other=sec_other|stateChange=sec_statechange|thresholdCrossingAlert=sec_thresholdCrossingAlert|voiceQuality=ves_voicequality|sipSignaling=ves_sipsignaling");
+        properties = new ApplicationSettings(new String[]{}, CLIUtils::processCmdLine);
+        streamID = properties.dMaaPStreamsMapping();
     }
 
     @Test
     public void testLoad() {
         //given
-        EventProcessor ec = new EventProcessor(mock(EventPublisher.class));
+        EventProcessor ec = new EventProcessor(mock(EventPublisher.class), properties);
         ec.event = new org.json.JSONObject(ev);
         //when
         ec.overrideEvent();
@@ -67,7 +69,7 @@ public class EventProcessorTest {
     @Test
     public void shouldParseJsonEvents() throws ReflectiveOperationException {
         //given
-        EventProcessor eventProcessor = new EventProcessor(mock(EventPublisher.class));
+        EventProcessor eventProcessor = new EventProcessor(mock(EventPublisher.class), properties);
         String event_json = "[{ \"filter\": {\"event.commonEventHeader.domain\":\"heartbeat\",\"VESversion\":\"v4\"},\"processors\":[" +
                 "{\"functionName\": \"concatenateValue\",\"args\":{\"field\":\"event.commonEventHeader.eventName\",\"concatenate\": [\"$event.commonEventHeader.domain\",\"$event.commonEventHeader.eventType\",\"$event.faultFields.alarmCondition\"], \"delimiter\":\"_\"}}" +
                 ",{\"functionName\": \"addAttribute\",\"args\":{\"field\": \"event.heartbeatFields.heartbeatFieldsVersion\",\"value\": \"1.0\",\"fieldType\": \"number\"}}" +
@@ -86,5 +88,4 @@ public class EventProcessorTest {
         assertThat(stringArgumentCaptor.getAllValues()).contains("concatenateValue", "addAttribute", "map");
     }
 
-}
-
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java b/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
index 49b53d24..09517ae3 100644
--- a/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
+++ b/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
@@ -64,11 +64,11 @@ public class TestConfigProcessor {
 

         final JSONObject jsonObject = getFileAsJsonObject();

         final String functionRole = (jsonObject.getJSONObject("event")).getJSONObject("commonEventHeader")

-            .get("functionalRole").toString();

+                .get("functionalRole").toString();

         System.out.println("event==" + jsonObject.toString());

         System.out.println("functionRole==" + functionRole);

         final JSONObject jsonArgs = new JSONObject(

-            "{\"field\": \"event.commonEventHeader.nfNamingCode\",\"oldField\": \"event.commonEventHeader.functionalRole\"}");

+                "{\"field\": \"event.commonEventHeader.nfNamingCode\",\"oldField\": \"event.commonEventHeader.functionalRole\"}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

         cpEvent.map(jsonArgs);

         final String responseData = cpEvent.getEventObjectVal("event.commonEventHeader.nfNamingCode").toString();

@@ -82,15 +82,15 @@ public class TestConfigProcessor {
 

         final JSONObject jsonObject = getFileAsJsonObject();

         final String alarmAdditionalInformation = (jsonObject.getJSONObject("event")).getJSONObject("faultFields")

-            .get("alarmAdditionalInformation").toString();

+                .get("alarmAdditionalInformation").toString();

         System.out.println("event==" + jsonObject.toString());

         System.out.println("alarmAdditionalInformation==" + alarmAdditionalInformation);

         final JSONObject jsonArgs = new JSONObject(

-            "{\"field\": \"event.faultFields.eventAdditionalInformation\",\"oldField\": \"event.faultFields.alarmAdditionalInformation\"}");

+                "{\"field\": \"event.faultFields.eventAdditionalInformation\",\"oldField\": \"event.faultFields.alarmAdditionalInformation\"}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

         cpEvent.map(jsonArgs);

         final String responseData = cpEvent.getEventObjectVal("event.faultFields.eventAdditionalInformation")

-            .toString();

+                .toString();

         System.out.println("modified event==" + jsonObject.toString());

         System.out.println("responseData==" + responseData);

         assertEquals(alarmAdditionalInformation, responseData);

@@ -104,14 +104,14 @@ public class TestConfigProcessor {
         System.out.println("event==" + jsonObject.toString());

         //System.out.println("alarmAdditionalInformation==" + alarmAdditionalInformation);

         final JSONObject jsonArgs = new JSONObject(

-            "{\"field\": \"event.faultFields.vNicPerformanceArray[]\",\"oldField\": \"event.faultFields.errors\",\"attrMap\":{\"receiveDiscards\":\"receivedDiscardedPacketsAccumulated\"}}");

+                "{\"field\": \"event.faultFields.vNicPerformanceArray[]\",\"oldField\": \"event.faultFields.errors\",\"attrMap\":{\"receiveDiscards\":\"receivedDiscardedPacketsAccumulated\"}}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

         final String receiveDiscards = cpEvent.getEventObjectVal("event.faultFields.errors.receiveDiscards").toString();

         System.out.println("receiveDiscards==" + receiveDiscards);

         cpEvent.map(jsonArgs);

         final String responseData = cpEvent

-            .getEventObjectVal("event.faultFields.vNicPerformanceArray[0].receivedDiscardedPacketsAccumulated")

-            .toString();

+                .getEventObjectVal("event.faultFields.vNicPerformanceArray[0].receivedDiscardedPacketsAccumulated")

+                .toString();

         System.out.println("modified event==" + jsonObject.toString());

         System.out.println("responseData==" + responseData);

         assertEquals(receiveDiscards, responseData);

@@ -125,7 +125,7 @@ public class TestConfigProcessor {
         System.out.println("event==" + jsonObject.toString());

         //System.out.println("functionRole==" + functionRole);

         final JSONObject jsonArgs = new JSONObject(

-            "{\"field\": \"event.faultFields.version\",\"value\": \"2.0\",\"fieldType\": \"number\"}");

+                "{\"field\": \"event.faultFields.version\",\"value\": \"2.0\",\"fieldType\": \"number\"}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

         cpEvent.addAttribute(jsonArgs);

         final String responseData = cpEvent.getEventObjectVal("event.faultFields.version").toString();

@@ -142,7 +142,7 @@ public class TestConfigProcessor {
         System.out.println("event==" + jsonObject.toString());

         //System.out.println("functionRole==" + functionRole);

         final JSONObject jsonArgs = new JSONObject(

-            "{\"field\": \"event.faultFields.version\",\"value\": \"2.0\",\"fieldType\": \"number\"}");

+                "{\"field\": \"event.faultFields.version\",\"value\": \"2.0\",\"fieldType\": \"number\"}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

         cpEvent.updateAttribute(jsonArgs);

         final String responseData = cpEvent.getEventObjectVal("event.faultFields.version").toString();

@@ -156,16 +156,16 @@ public class TestConfigProcessor {
 

         final JSONObject jsonObject = getFileAsJsonObject();

         final String eventType = (jsonObject.getJSONObject("event")).getJSONObject("commonEventHeader").get("eventType")

-            .toString();

+                .toString();

         final String domain = (jsonObject.getJSONObject("event")).getJSONObject("commonEventHeader").get("domain")

-            .toString();

+                .toString();

         final String alarmCondition = (jsonObject.getJSONObject("event")).getJSONObject("faultFields")

-            .get("alarmCondition").toString();

+                .get("alarmCondition").toString();

         System.out.println("event==" + jsonObject.toString());

         final String eventName = domain + "_" + eventType + "_" + alarmCondition;

         System.out.println("eventName==" + eventName);

         final JSONObject jsonArgs = new JSONObject(

-            "{\"field\":\"event.commonEventHeader.eventName\",\"concatenate\": [\"$event.commonEventHeader.domain\",\"$event.commonEventHeader.eventType\",\"$event.faultFields.alarmCondition\"],\"delimiter\":\"_\"}");

+                "{\"field\":\"event.commonEventHeader.eventName\",\"concatenate\": [\"$event.commonEventHeader.domain\",\"$event.commonEventHeader.eventType\",\"$event.faultFields.alarmCondition\"],\"delimiter\":\"_\"}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

         cpEvent.concatenateValue(jsonArgs);

         final String responseData = cpEvent.getEventObjectVal("event.commonEventHeader.eventName").toString();

@@ -179,14 +179,14 @@ public class TestConfigProcessor {
 

         final JSONObject jsonObject = getFileAsJsonObject();

         final String memoryConfigured = (jsonObject.getJSONObject("event")).getJSONObject("faultFields")

-            .get("memoryConfigured").toString();

+                .get("memoryConfigured").toString();

         final String memoryUsed = (jsonObject.getJSONObject("event")).getJSONObject("faultFields").get("memoryUsed")

-            .toString();

+                .toString();

         System.out.println("event==" + jsonObject.toString());

         System.out.println("memoryConfigured==" + memoryConfigured);

         System.out.println("memoryUsed==" + memoryUsed);

         final JSONObject jsonArgs = new JSONObject(

-            "{\"field\": \"event.faultFields.memoryFree\",\"subtract\": [\"$event.faultFields.memoryConfigured\",\"$event.faultFields.memoryUsed\"]}");

+                "{\"field\": \"event.faultFields.memoryFree\",\"subtract\": [\"$event.faultFields.memoryConfigured\",\"$event.faultFields.memoryUsed\"]}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

         cpEvent.subtractValue(jsonArgs);

         final String responseData = cpEvent.getEventObjectVal("event.faultFields.memoryFree").toString();

@@ -202,7 +202,7 @@ public class TestConfigProcessor {
         System.out.println("event==" + jsonObject.toString());

         System.out.println("Testing SetValue");

         final JSONObject jsonArgs = new JSONObject(

-            "{\"field\": \"event.faultFields.version\",\"value\": \"2.0\",\"fieldType\": \"number\"}");

+                "{\"field\": \"event.faultFields.version\",\"value\": \"2.0\",\"fieldType\": \"number\"}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

         cpEvent.setValue(jsonArgs);

         final String responseData = cpEvent.getEventObjectVal("event.faultFields.version").toString();

diff --git a/src/test/java/org/onap/dcae/vestest/TestEventReceipt.java b/src/test/java/org/onap/dcae/vestest/TestEventReceipt.java
deleted file mode 100644
index a3893eaa..00000000
--- a/src/test/java/org/onap/dcae/vestest/TestEventReceipt.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-

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

- * PROJECT

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

- * Copyright (C) 2018 AT&T Intellectual Property. 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 static org.junit.Assert.assertEquals;

-

-import org.json.JSONObject;

-import org.junit.Test;

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

-import org.onap.dcae.restapi.endpoints.EventReceipt;

-

-public class TestEventReceipt {

-

-

-    @Test

-    public void shouldGetSchemaFileLocationBasedOnVersion() {

-        CommonStartup.schemaFileJson = new JSONObject("{\"v1\":\"filePath1\", \"v5\":\"filePath2\"}");

-        String schemaFilePath = EventReceipt.schemaFileVersion("v5");

-        assertEquals(schemaFilePath, "filePath2");

-    }

-

-    @Test

-    public void shouldByDefaultReturnV5SchemaFileLocation() {

-        CommonStartup.schemaFileJson = new JSONObject("{\"v1\":\"filePath1\", \"v5\":\"filePath2\"}");

-        String schemaFilePath = EventReceipt.schemaFileVersion("v2");

-        assertEquals(schemaFilePath, "filePath2");

-    }

-

-}

diff --git a/src/test/java/org/onap/dcae/vestest/TestJsonSchemaValidation.java b/src/test/java/org/onap/dcae/vestest/TestJsonSchemaValidation.java
index 0489811d..c39fb013 100644
--- a/src/test/java/org/onap/dcae/vestest/TestJsonSchemaValidation.java
+++ b/src/test/java/org/onap/dcae/vestest/TestJsonSchemaValidation.java
@@ -28,24 +28,24 @@ import com.google.gson.JsonParser;
 import java.io.IOException;
 import java.nio.file.Paths;
 import org.junit.Test;
-import org.onap.dcae.commonFunction.CommonStartup;
+import org.onap.dcae.SchemaValidator;
 
 public class TestJsonSchemaValidation {
 
     @Test
     public void shouldValidEventPassSchema_27_2() throws IOException {
-        String result = CommonStartup.validateAgainstSchema(
-            readJSONFromFile("src/test/resources/VES_valid.txt").toString(),
-            readJSONFromFile("etc/CommonEventFormat_27.2.json").toString());
+        String result = SchemaValidator.validateAgainstSchema(
+                readJSONFromFile("src/test/resources/VES_valid.txt").toString(),
+                readJSONFromFile("etc/CommonEventFormat_27.2.json").toString());
         assertEquals(result, "true");
     }
 
 
     @Test
     public void shouldInvalidEventDoesNotPassSchema_27_2() throws IOException {
-        String result = CommonStartup.validateAgainstSchema(
-            readJSONFromFile("src/test/resources/VES_invalid.txt").toString(),
-            readJSONFromFile("etc/CommonEventFormat_27.2.json").toString());
+        String result = SchemaValidator.validateAgainstSchema(
+                readJSONFromFile("src/test/resources/VES_invalid.txt").toString(),
+                readJSONFromFile("etc/CommonEventFormat_27.2.json").toString());
         assertEquals(result, "false");
     }