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=AWU41WhXwGn37JfbyHux&resolved=false&rules=squid%3ACommentedOutCodeLine&severities=MAJOR
Location:
src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java
Line No:L53 L88 L92 L125 L129 L136 L141 L238 L244 L260 L268

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

diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java b/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java
index 643eae9..4bef985 100644 (file)
--- a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java
+++ b/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java
@@ -50,7 +50,7 @@ import com.att.dmf.mr.utils.ConfigurationReader;
 //import org.apache.log4-j.Logger;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-//import com.att.dmf.mr.backends.kafka.kafka011.SettingsUtil;
+
 import com.att.nsa.configs.ConfigDb;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.configs.ConfigPath;
@@ -85,11 +85,9 @@ public class DMaaPKafkaMetaBroker implements Broker1 {
                
                
             props.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, fkafkaBrokers );
-           /* props.put("sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required username='admin' password='admin_secret';");
-                props.put(AdminClientConfig.SECURITY_PROTOCOL_CONFIG, "SASL_PLAINTEXT");            
-            props.put("sasl.mechanism", "PLAIN");*/
+          
             fKafkaAdminClient=AdminClient.create ( props );
-           // fKafkaAdminClient = null;
+           
        }
 
        //private static final Logger log = Logger.getLogger(DMaaPKafkaMetaBroker.class);
@@ -122,23 +120,21 @@ public class DMaaPKafkaMetaBroker implements Broker1 {
                
                
             props.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, fkafkaBrokers );
-            /* props.put("sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required username='admin' password='admin_secret';");
-                props.put(AdminClientConfig.SECURITY_PROTOCOL_CONFIG, "SASL_PLAINTEXT");            
-            props.put("sasl.mechanism", "PLAIN");*/
+            
             fKafkaAdminClient=AdminClient.create ( props );
-           // fKafkaAdminClient = null;
+           
                
                
        }
        
        public DMaaPKafkaMetaBroker( rrNvReadable settings,
                        ZkClient zk,  ConfigDb configDb,AdminClient client) {
-               //fSettings = settings;
+               
                fZk = zk;
                fCambriaConfig = configDb;
                fBaseTopicData = configDb.parse("/topics");
            fKafkaAdminClient= client;
-           // fKafkaAdminClient = null;
+          
                
                
        }
@@ -235,13 +231,13 @@ public class DMaaPKafkaMetaBroker implements Broker1 {
                        }
                        catch ( InterruptedException e )
                        {
-                               //timer.fail ( "Timeout" );
+                               
                                log.warn ( "Execution of describeTopics timed out." );
                                throw new ConfigDbException ( e );
                        }
                        catch ( ExecutionException e )
                        {
-                               //timer.fail ( "ExecutionError" );
+                               
                                log.warn ( "Execution of describeTopics failed: " + e.getCause ().getMessage (), e.getCause () );
                                throw new ConfigDbException ( e.getCause () );
                        }
@@ -256,16 +252,11 @@ public class DMaaPKafkaMetaBroker implements Broker1 {
                        log.info("Loading zookeeper client for topic deletion.");
                                        // topic creation. (Otherwise, the topic is only partially created
                        // in ZK.)
-                       /*zkClient = new ZkClient(ConfigurationReader.getMainZookeeperConnectionString(), 10000, 10000,
-                                       ZKStringSerializer$.MODULE$);
-                       String strkSettings_KafkaZookeeper = AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,CambriaConstants.kSetting_ZkConfigDbServers);
-                       if (null==strkSettings_KafkaZookeeper) strkSettings_KafkaZookeeper = CambriaConstants.kDefault_ZkConfigDbServers;
-                       ZkUtils zkutils =new ZkUtils(zkClient , new ZkConnection(strkSettings_KafkaZookeeper),false);
-                       */
+                       
                        
                        fKafkaAdminClient.deleteTopics(Arrays.asList(topic));
                        log.info("Zookeeper client loaded successfully. Deleting topic.");
-                       //AdminUtils.deleteTopic(zkutils, topic);
+                       
                } catch (Exception e) {
                        log.error("Failed to delete topic [" + topic + "]. " + e.getMessage(), e);
                        throw new ConfigDbException(e);