optimization and sonar fixes

Change-Id: I47b2c429abc2a8c795f9faa7739d8d75f67ed287
Signed-off-by: VENKATESH KUMAR <vv770d@att.com>
Issue-ID: DCAEGEN2-227

2 files changed, 254 insertions, 302 deletions

diff --git a/src/test/java/org/onap/dcae/vestest/TestEventProcessor.java b/src/test/java/org/onap/dcae/vestest/TestEventProcessor.java
index 47672956..821e7a19 100644
--- a/src/test/java/org/onap/dcae/vestest/TestEventProcessor.java
+++ b/src/test/java/org/onap/dcae/vestest/TestEventProcessor.java
@@ -1,174 +1,138 @@
-/*-
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2017-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.*;
-
-
-import java.io.File;
-import java.net.URL;
-import java.util.Map;
-
-import org.json.simple.JSONObject;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.dcae.commonFunction.CommonStartup;
-import org.onap.dcae.commonFunction.EventProcessor;
-import org.onap.dcae.commonFunction.EventPublisher;
-import org.onap.dcae.commonFunction.EventPublisherHash;
-import org.onap.dcae.controller.LoadDynamicConfig;
-import org.onap.dcae.commonFunction.DmaapPropertyReader;
-
-import com.att.nsa.cambria.client.CambriaBatchingPublisher;
-import com.google.gson.JsonParser;
-
-public class TestEventProcessor {
-
-	EventProcessor ec;
-	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\"}]}}}";
-	String testinput;
-	
-	@Before
-	public void setUp() throws Exception {
-		CommonStartup.streamid="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";
-		CommonStartup.eventTransformFlag = 1;
-		testinput = "src/test/resources/testDmaapConfig_ip.json";
-	
-	}
-
-	@After
-	public void tearDown() throws Exception {
-	}
-
-	@Test
-	public void testLoad() {
-
-	
-		EventProcessor ec = new EventProcessor();
-		
-		ec.event=new org.json.JSONObject(ev);
-		
-		ec.overrideEvent();
-		//event.commonEventHeader.sourceName
-		Boolean flag = ec.event.getJSONObject("event").getJSONObject("commonEventHeader").has("sourceName");
-		assertEquals(true, flag);
-	}
-
-
-	@Test
-	public void testpublisher() {
-
-	    DmaapPropertyReader dr;
-		EventPublisher ep = null;
-	
-	    Boolean flag = false;
-	    dr = new DmaapPropertyReader(testinput);
-
-				//new EventPublisher("sec_fault_ueb");
-		ep = EventPublisher.getInstance("sec_fault_ueb");
-		//event.commonEventHeader.sourceName
-		
-		if (ep.equals(null))
-		{
-			flag = false;
-		}
-		else
-		{
-			flag = true;
-		}
-		assertEquals(true, flag);
-	}
-	
-	
-	@Test
-	public void testpublisherhashclass() {
-
-	    DmaapPropertyReader dr;
-	    EventPublisherHash eph = null;
-	    
-	    Boolean flag = false;
-	    dr = new DmaapPropertyReader(testinput);
-		eph = EventPublisherHash.getInstance();
-	
-		
-		if (eph.equals(null))
-		{
-			flag = false;
-		}
-		else
-		{
-			flag = true;
-		}
-		assertEquals(true, flag);
-		
-		
-	}
-	
-	@Test
-	public void testpublisherhashclassload() {
-
-	    DmaapPropertyReader dr;
-	    EventPublisherHash eph = null;
-	    
-	    Boolean flag = false;
-	    dr = new DmaapPropertyReader(testinput);
-		eph = EventPublisherHash.getInstance();
-		EventProcessor ec = new EventProcessor();
-		ec.event=new org.json.JSONObject(ev);	
-		CommonStartup.cambriaConfigFile="src/test/resources/testDmaapConfig_ip.json";
-		   
-		CambriaBatchingPublisher pub = eph.Dmaaphash("sec_fault_ueb");
-		
-		if (pub == null || pub.equals(null))
-		{
-			flag = false;
-		}
-		else
-		{
-			flag = true;
-		}
-		assertEquals(true, flag);
-		
-	}		
-
-	@Test
-	public void testpublisherhashSend() {
-
-	    DmaapPropertyReader dr;
-	    EventPublisherHash eph = null;
-	    
-	    Boolean flag = true;
-	    dr = new DmaapPropertyReader(testinput);
-		eph = EventPublisherHash.getInstance();
-
-		
-		EventProcessor ec = new EventProcessor();
-		ec.event=new org.json.JSONObject(ev);
-		CommonStartup.cambriaConfigFile="src/test/resources/testDmaapConfig_ip.json";
-		eph.sendEvent(ec.event, "sec_fault_ueb");
-		
-		assertEquals(true, flag);
-		
-	}
-}
-
+/*-

+ * ============LICENSE_START=======================================================

+ * PROJECT

+ * ================================================================================

+ * Copyright (C) 2017-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.junit.After;

+import org.junit.Before;

+import org.junit.Test;

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

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

+import org.onap.dcae.commonFunction.EventProcessor;

+import org.onap.dcae.commonFunction.EventPublisherHash;

+

+import com.att.nsa.cambria.client.CambriaBatchingPublisher;

+

+public class TestEventProcessor {

+

+	EventProcessor ec;

+	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\"}]}}}";

+	String testinput;

+	

+	@Before

+	public void setUp() throws Exception {

+		CommonStartup.streamid="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";

+		CommonStartup.eventTransformFlag = 1;

+		testinput = "src/test/resources/testDmaapConfig_ip.json";

+	

+	}

+

+	@After

+	public void tearDown() throws Exception {

+	}

+

+	@Test

+	public void testLoad() {

+

+	

+		EventProcessor ec = new EventProcessor();

+		

+		ec.event=new org.json.JSONObject(ev);

+		

+		ec.overrideEvent();

+		//event.commonEventHeader.sourceName

+		Boolean flag = ec.event.getJSONObject("event").getJSONObject("commonEventHeader").has("sourceName");

+		assertEquals(true, flag);

+	}

+

+

+	@Test

+	public void testpublisherhashclass() {

+

+	    DmaapPropertyReader dr = null;

+	    EventPublisherHash eph = null;

+	    

+	    Boolean flag = false;

+	    dr = new DmaapPropertyReader(testinput);

+		eph = EventPublisherHash.getInstance();

+	

+		

+		if (eph.equals(null))

+		{

+			flag = false;

+		}

+		else

+		{

+			flag = true;

+		}

+		assertEquals(true, flag);

+		

+		

+	}

+	

+	@Test

+	public void testpublisherhashclassload() {

+

+	    DmaapPropertyReader dr;

+	    EventPublisherHash eph = null;

+	    

+	    Boolean flag = false;

+	    dr = new DmaapPropertyReader(testinput);

+		eph = EventPublisherHash.getInstance();

+		EventProcessor ec = new EventProcessor();

+		ec.event=new org.json.JSONObject(ev);	

+		CommonStartup.cambriaConfigFile="src/test/resources/testDmaapConfig_ip.json";

+		   

+		CambriaBatchingPublisher pub = eph.Dmaaphash("sec_fault_ueb");

+		

+		if (pub == null || pub.equals(null))

+		{

+			flag = false;

+		}

+		else

+		{

+			flag = true;

+		}

+		assertEquals(true, flag);

+		

+	}		

+

+	@Test

+	public void testpublisherhashSend() {

+

+	    DmaapPropertyReader dr;

+	    EventPublisherHash eph = null;

+	    

+	    Boolean flag = true;

+	    dr = new DmaapPropertyReader(testinput);

+		eph = EventPublisherHash.getInstance();

+

+		

+		EventProcessor ec = new EventProcessor();

+		ec.event=new org.json.JSONObject(ev);

+		CommonStartup.cambriaConfigFile="src/test/resources/testDmaapConfig_ip.json";

+		eph.sendEvent(ec.event, "sec_fault_ueb");

+		

+		assertEquals(true, flag);

+		

+	}

+}

+

diff --git a/src/test/java/org/onap/dcae/vestest/TestSchemaValidation.java b/src/test/java/org/onap/dcae/vestest/TestSchemaValidation.java
index af8a62f3..816b3283 100644
--- a/src/test/java/org/onap/dcae/vestest/TestSchemaValidation.java
+++ b/src/test/java/org/onap/dcae/vestest/TestSchemaValidation.java
@@ -1,128 +1,116 @@
-/*-
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2017-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.*;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.json.simple.JSONObject;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.dcae.commonFunction.CommonStartup;
-import org.onap.dcae.restapi.endpoints.EventReceipt;
-
-import com.att.nsa.drumlin.service.framework.DrumlinServlet;
-import com.att.nsa.drumlin.service.framework.context.DrumlinRequestContext;
-import com.google.gson.JsonParser;
-
-public class TestSchemaValidation {
-
-        CommonStartup cl;
-        String schema = null;
-        String payload = null;
-        String payloadinvalid = null;
-
-        @Before
-        public void setUp() throws Exception {
-
-                schema = new JsonParser().parse(new FileReader("etc/CommonEventFormat_27.2.json")).toString();
-                payload = new JsonParser().parse(new FileReader("src/test/resources/VES_valid.txt")).toString();
-                payloadinvalid = new JsonParser().parse(new FileReader("src/test/resources/VES_invalid.txt")).toString();
-
-        }
-
-        @After
-        public void tearDown() throws Exception {
-        }
-
-        @Test
-        public void testsuccessfulschemavalidation() {
-
-                String valresult = CommonStartup.schemavalidate(payload, schema);
-                System.out.println("testsuccessfulschemavalidation:" + valresult);
-                Assert.assertEquals(valresult, "true");
-        }
-
-        @Test
-        public void testunsuccessfulschemavalidation() {
-                String valresult = null;
-                valresult = CommonStartup.schemavalidate(payloadinvalid, schema);
-                System.out.println("testunsuccessfulschemavalidation:" + valresult);
-                Assert.assertFalse(valresult.equals("true"));
-
-        }
-
-/*
-        @Test
-        public void testeventReceipt() {
-
-                DrumlinServlet webServlet = new DrumlinServlet();
-                DrumlinRequestContext ctx = new DrumlinRequestContext(webServlet, null, null, null, null, null);
-                EventReceipt er= new EventReceipt();
-                try {
-                	EventReceipt.receiveVESEvent(null);
-                } catch ( NullPointerException   e) {
-                     
-                	e.printStackTrace();
-                }
-                Assert.assertEquals("true", "true");
-
-        }*/
-
-        @Test
-        public void testsafeclosefr() {
-
-
-                FileReader fr;
-                try {
-                        fr = new FileReader("etc/CommonEventFormat_27.2.json");
-                        EventReceipt.safeClose(fr);
-                } catch (FileNotFoundException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                }
-                Assert.assertEquals("true", "true");
-
-        }
-
-        @Test
-        public void testsafecloseis() {
-
-                        InputStream is = new ByteArrayInputStream(StandardCharsets.UTF_16.encode("randomstring").array());
-                        EventReceipt.safeClose(is);
-                        Assert.assertEquals("true", "true");
-
-        }
-}
-
+/*-

+ * ============LICENSE_START=======================================================

+ * PROJECT

+ * ================================================================================

+ * Copyright (C) 2017-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 java.io.ByteArrayInputStream;

+import java.io.FileNotFoundException;

+import java.io.FileReader;

+import java.io.InputStream;

+import java.nio.charset.StandardCharsets;

+

+import org.junit.After;

+import org.junit.Assert;

+import org.junit.Before;

+import org.junit.Test;

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

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

+

+import com.google.gson.JsonParser;

+

+public class TestSchemaValidation {

+

+        CommonStartup cl;

+        String schema = null;

+        String payload = null;

+        String payloadinvalid = null;

+

+        @Before

+        public void setUp() throws Exception {

+

+                schema = new JsonParser().parse(new FileReader("etc/CommonEventFormat_27.2.json")).toString();

+                payload = new JsonParser().parse(new FileReader("src/test/resources/VES_valid.txt")).toString();

+                payloadinvalid = new JsonParser().parse(new FileReader("src/test/resources/VES_invalid.txt")).toString();

+

+        }

+

+        @After

+        public void tearDown() throws Exception {

+        }

+

+        @Test

+        public void testsuccessfulschemavalidation() {

+

+                String valresult = CommonStartup.schemavalidate(payload, schema);

+                System.out.println("testsuccessfulschemavalidation:" + valresult);

+                Assert.assertEquals(valresult, "true");

+        }

+

+        @Test

+        public void testunsuccessfulschemavalidation() {

+                String valresult = null;

+                valresult = CommonStartup.schemavalidate(payloadinvalid, schema);

+                System.out.println("testunsuccessfulschemavalidation:" + valresult);

+                Assert.assertFalse(valresult.equals("true"));

+

+        }

+

+/*

+        @Test

+        public void testeventReceipt() {

+

+                DrumlinServlet webServlet = new DrumlinServlet();

+                DrumlinRequestContext ctx = new DrumlinRequestContext(webServlet, null, null, null, null, null);

+                EventReceipt er= new EventReceipt();

+                try {

+                	EventReceipt.receiveVESEvent(null);

+                } catch ( NullPointerException   e) {

+                     

+                	e.printStackTrace();

+                }

+                Assert.assertEquals("true", "true");

+

+        }*/

+

+        @Test

+        public void testsafeclosefr() {

+

+

+                FileReader fr;

+                try {

+                        fr = new FileReader("etc/CommonEventFormat_27.2.json");

+                        EventReceipt.safeClose(fr);

+                } catch (FileNotFoundException e) {

+                        // TODO Auto-generated catch block

+                        e.printStackTrace();

+                }

+                Assert.assertEquals("true", "true");

+

+        }

+

+        @Test

+        public void testsafecloseis() {

+

+                        InputStream is = new ByteArrayInputStream(StandardCharsets.UTF_16.encode("randomstring").array());

+                        EventReceipt.safeClose(is);

+                        Assert.assertEquals("true", "true");

+

+        }

+}

+