fix merge error n sonar items 01/15201/1
authorVijay <vv770d@att.com>
Mon, 25 Sep 2017 20:32:23 +0000 (20:32 +0000)
committerVijay <vv770d@att.com>
Mon, 25 Sep 2017 20:32:48 +0000 (20:32 +0000)
commitf46b942de6b6ae6e9ede19a31c43c3e081fdc4e5
treeebc638bdec91f7c78b3db36e573c28ef14d4c668
parent86ac6e10c0caa05a9649d53b7179b3dcd8fbd802
fix merge error n sonar items

https://jenkins.onap.org/job/dcaegen2-collectors-ves-master-merge-java/33/console

Change-Id: I90693665dcf650028186a47ed69eaf15bc2f0d15
Issue-ID:DCAEGEN2-82
Signed-off-by: Vijay <vv770d@att.com>
src/main/java/org/onap/dcae/commonFunction/CommonStartup.java
src/main/java/org/onap/dcae/commonFunction/ConfigProcessors.java
src/main/java/org/onap/dcae/commonFunction/CustomExceptionLoader.java
src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java
src/test/java/org/onap/dcae/vestest/EventTransformTest.java
src/test/java/org/onap/dcae/vestest/TestCommonStartup.java
src/test/resources/event4xjson.txt