From: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
Date: Fri, 24 Aug 2018 09:30:01 +0000 (+0530)
Subject: Sonar Major issues
X-Git-Tag: 1.1.7~20^2~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fmessagerouter%2Fmsgrtr.git;a=commitdiff_plain;h=d11262a229f695ac03ef9c47a5935c96e6ef92eb

Sonar Major issues

 This block of commented-out lines of code should be removed
Sonar Link:
https://sonar.onap.org/project/issues?assignees=sumapriya&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41WhOwGn37JfbyHuE&resolved=false&severities=MAJOR
Location:
src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java
Line No:L49 L62 L66 L110 L199 L268 L271 L298

Change-Id: I39e2469211cf47642761fafe05e381b6fd1f91cf
Issue-ID: DMAAP-643
Signed-off-by: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
---

diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java b/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java
index 6fc0838..e4e09c8 100644
--- a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java
+++ b/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java
@@ -46,8 +46,8 @@ import com.att.dmf.mr.backends.kafka.KafkaLiveLockAvoider2;
 import com.att.dmf.mr.backends.kafka.LiveLockAvoidance;
 import com.att.dmf.mr.constants.CambriaConstants;
 import com.att.dmf.mr.utils.ConfigurationReader;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
+
+
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;
@@ -58,12 +58,9 @@ import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;
  */
 public class DMaaPKafkaConsumerFactory implements ConsumerFactory {
 
-	// private static final Logger log = LoggerFactory
-	// .getLogger(DMaaPKafkaConsumerFactory.class);
+	
 	private static final EELFLogger log = EELFManager.getInstance().getLogger(DMaaPKafkaConsumerFactory.class);
-	// @Autowired
-	// private KafkaLiveLockAvoider kafkaLiveLockAvoider = new
-	// KafkaLiveLockAvoider();
+	
 
 	/**
 	 * constructor initialization
@@ -106,8 +103,7 @@ public class DMaaPKafkaConsumerFactory implements ConsumerFactory {
 
 		final boolean isCacheEnabled = kSetting_EnableCache;
 
-		// fCache = (isCacheEnabled) ? new KafkaConsumerCache(apiNodeId,
-		// metrics) : null;
+		
 		fCache = null;
 		if (isCacheEnabled) {
 			fCache = KafkaConsumerCache.getInstance();
@@ -195,8 +191,7 @@ public class DMaaPKafkaConsumerFactory implements ConsumerFactory {
 					final Properties props = createConsumerConfig(topic,consumerGroupName, consumerId);
 					long fCreateTimeMs = System.currentTimeMillis();
 					KafkaConsumer<String, String> cc = new KafkaConsumer<>(props);
-					kc = new Kafka011Consumer(topic, consumerGroupName, consumerId, cc, fkafkaLiveLockAvoider);// ,fCache.getkafkaLiveLockAvoiderObj()
-																												// );
+					kc = new Kafka011Consumer(topic, consumerGroupName, consumerId, cc, fkafkaLiveLockAvoider);
 					log.info(" kafka stream created in " + (System.currentTimeMillis() - fCreateTimeMs));
 
 					if (fCache != null) {
@@ -265,10 +260,9 @@ public class DMaaPKafkaConsumerFactory implements ConsumerFactory {
 	private void transferSettingIfProvided(Properties target, String key, String prefix) {
 		String keyVal = AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, makeLongKey(key, prefix));
 
-		// if (fSettings.hasValueFor(makeLongKey(key, prefix))) {
+		
 		if (null != keyVal) {
-			// final String val = fSettings
-			// .getString(makeLongKey(key, prefix), "");
+		
 			log.info("Setting [" + key + "] to " + keyVal + ".");
 			target.put(key, keyVal);
 		}
@@ -294,10 +288,8 @@ public class DMaaPKafkaConsumerFactory implements ConsumerFactory {
 		props.put("group.id", fakeGroupName);
 		props.put("enable.auto.commit", "false"); // 0.11
 		props.put("bootstrap.servers", fkafkaBrokers);
-		/*props.put("sasl.jaas.config",
-				"org.apache.kafka.common.security.plain.PlainLoginModule required username='admin' password='admin_secret';");
-		props.put("security.protocol", "SASL_PLAINTEXT");
-		props.put("sasl.mechanism", "PLAIN");*/
+
+		
 		props.put("client.id", consumerId);
 
 		// additional settings: start with our defaults, then pull in configured