optimization and sonar fixes

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

2 files changed, 1 insertions, 167 deletions

diff --git a/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java b/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java
index 70da7744..6b5502f7 100644
--- a/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java
+++ b/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java
@@ -202,7 +202,7 @@ public class CommonStartup extends NsaBaseEndpoint implements Runnable {
 				| InterruptedException e) {

 			CommonStartup.eplog.error("FATAL_STARTUP_ERROR" + e.getMessage());

 			throw new RuntimeException(e);

-		} catch (Throwable e) {

+		} catch (Exception e) {

 			System.err.println("Uncaught exception - " + e.getMessage());

 			CommonStartup.eplog.error("FATAL_ERROR" + e.getMessage());

 			e.printStackTrace(System.err);

diff --git a/src/main/java/org/onap/dcae/commonFunction/EventPublisher.java b/src/main/java/org/onap/dcae/commonFunction/EventPublisher.java
deleted file mode 100644
index 7dbb8f3c..00000000
--- a/src/main/java/org/onap/dcae/commonFunction/EventPublisher.java
+++ /dev/null
@@ -1,166 +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 com.att.nsa.cambria.client.CambriaBatchingPublisher;
-import com.att.nsa.cambria.client.CambriaClientBuilders;
-import com.att.nsa.clock.SaClock;
-import com.att.nsa.logging.LoggingContext;
-import com.att.nsa.logging.log4j.EcompFields;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-public class EventPublisher {
-
-	private static final String VES_UNIQUE_ID = "VESuniqueId";
-	private static EventPublisher instance;
-	private static CambriaBatchingPublisher pub;
-
-	private String streamid = "";
-	private String ueburl = "";
-	private String topic = "";
-	private String authuser = "";
-	private String authpwd = "";
-
-	private static Logger log = LoggerFactory.getLogger(EventPublisher.class);
-
-	private EventPublisher(String newstreamid) {
-
-		streamid = newstreamid;
-		try {
-			ueburl = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile).dmaap_hash
-					.get(streamid + ".cambria.url");
-
-			if (ueburl == null) {
-				ueburl = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile).dmaap_hash
-						.get(streamid + ".cambria.hosts");
-			}
-			topic = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile)
-					.getKeyValue(streamid + ".cambria.topic");
-			authuser = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile)
-					.getKeyValue(streamid + ".basicAuthUsername");
-
-			if (authuser != null) {
-				authpwd = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile).dmaap_hash
-						.get(streamid + ".basicAuthPassword");
-			}
-		} catch (Exception e) {
-			log.error("CambriaClientBuilders connection reader exception : " + e.getMessage());
-
-		}
-
-	}
-
-	/**
-	 * Returns event publisher
-	 *
-	 * @param streamid
-	 *            stream id
-	 * @return event publisher
-	 */
-	public static synchronized EventPublisher getInstance(String streamid) {
-		if (instance == null) {
-			instance = new EventPublisher(streamid);
-		}
-		if (!instance.streamid.equals(streamid)) {
-			instance.closePublisher();
-			instance = new EventPublisher(streamid);
-		}
-		return instance;
-
-	}
-
-	/**
-	 *
-	 * @param event
-	 *            json object for event
-	 */
-	public synchronized void sendEvent(JSONObject event) {
-
-		log.debug("EventPublisher.sendEvent: instance for publish is ready");
-
-		if (event.has(VES_UNIQUE_ID)) {
-			String uuid = event.get(VES_UNIQUE_ID).toString();
-			LoggingContext localLC = VESLogger.getLoggingContextForThread(uuid);
-			localLC.put(EcompFields.kBeginTimestampMs, SaClock.now());
-			log.debug("Removing VESuniqueid object from event");
-			event.remove(VES_UNIQUE_ID);
-		}
-
-		try {
-
-			if (authuser != null) {
-				log.debug(String.format("URL:%sTOPIC:%sAuthUser:%sAuthpwd:%s", ueburl, topic, authuser, authpwd));
-				pub = new CambriaClientBuilders.PublisherBuilder().usingHosts(ueburl).onTopic(topic).usingHttps()
-						.authenticatedByHttp(authuser, authpwd).logSendFailuresAfter(5)
-						// .logTo(log)
-						// .limitBatch(100, 10)
-						.build();
-			} else {
-
-				log.debug(String.format("URL:%sTOPIC:%s", ueburl, topic));
-				pub = new CambriaClientBuilders.PublisherBuilder().usingHosts(ueburl).onTopic(topic)
-						// .logTo(log)
-						.logSendFailuresAfter(5)
-						// .limitBatch(100, 10)
-						.build();
-
-			}
-
-			int pendingMsgs = pub.send("MyPartitionKey", event.toString());
-			// this.wait(2000);
-
-			if (pendingMsgs > 100) {
-				log.info("Pending Message Count=" + pendingMsgs);
-			}
-
-			log.info("pub.send invoked - no error");
-			CommonStartup.oplog.info(String.format("URL:%sTOPIC:%sEvent Published:%s", ueburl, topic, event));
-
-		} catch (IOException | GeneralSecurityException | IllegalArgumentException e) {
-			log.error("Unable to publish event: {} streamid: {}. Exception: {}", event, streamid, e);
-		} finally {
-			closePublisher();
-		}
-
-	}
-
-	public synchronized void closePublisher() {
-
-		try {
-			if (pub != null) {
-				final List<?> stuck = pub.close(20, TimeUnit.SECONDS);
-				if (!stuck.isEmpty()) {
-					log.error(stuck.size() + " messages unsent");
-				}
-			}
-		} catch (InterruptedException | IOException e) {
-			log.error("Caught Exception on Close event: {}", e);
-		}
-
-	}
-}