Merge changes I61fe5ce8,I89758685,I6b215d2a

* changes:
  Sonar Major issues
  Sonar Major issues
  Sonar Major issues

diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/LockInstructionWatcher.java b/src/main/java/com/att/dmf/mr/backends/kafka/LockInstructionWatcher.java
index 5d3bc47..cc3338b 100644 (file)
--- a/src/main/java/com/att/dmf/mr/backends/kafka/LockInstructionWatcher.java
+++ b/src/main/java/com/att/dmf/mr/backends/kafka/LockInstructionWatcher.java
@@ -69,7 +69,7 @@ public class LockInstructionWatcher implements Watcher {
                        try {
                                
                                log.info("node children changed at path: {}", event.getPath());
-                               //String grpName = new String(curatorFramework.getData().forPath(event.getPath()));
+                               
                                List<String> children = curatorFramework.getChildren().forPath(event.getPath());
                                
                                log.info("found children nodes prodcessing now");

diff --git a/src/main/java/com/att/dmf/mr/backends/memory/MessageLogger.java b/src/main/java/com/att/dmf/mr/backends/memory/MessageLogger.java
index 8e41c9f..eb77dc2 100644 (file)
--- a/src/main/java/com/att/dmf/mr/backends/memory/MessageLogger.java
+++ b/src/main/java/com/att/dmf/mr/backends/memory/MessageLogger.java
@@ -32,7 +32,7 @@ import org.apache.kafka.clients.producer.ProducerRecord;
 
 import com.att.dmf.mr.backends.Publisher;
 
-//import kafka.producer.KeyedMessage;
+
 
 /**
  * class used for logging perspective

diff --git a/src/main/java/com/att/dmf/mr/constants/CambriaConstants.java b/src/main/java/com/att/dmf/mr/constants/CambriaConstants.java
index b640688..cb6653c 100644 (file)
--- a/src/main/java/com/att/dmf/mr/constants/CambriaConstants.java
+++ b/src/main/java/com/att/dmf/mr/constants/CambriaConstants.java
@@ -75,7 +75,7 @@ String msgRtr_prop="MsgRtrApi.properties";
        int kDefault_MaxThreads = -1;
        
        
-//     String kSetting_TomcatProtocolClass = "tomcat.protocolClass";
+       
        //String kDefault_TomcatProtocolClass = Http11NioProtocol.class.getName ();
 
        String kSetting_ZkConfigDbServers = "config.zk.servers";

diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java b/src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java
index ebdf3ed..80904ea 100644 (file)
--- a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java
+++ b/src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java
@@ -59,7 +59,7 @@ public class CambriaBaseClient extends HttpClient implements com.att.dmf.mr.metr
 
                
                fLog = EELFManager.getInstance().getLogger(this.getClass().getName());
-               //( this.getClass().getName () );
+               
        }
 
        @Override

diff --git a/src/main/java/com/att/dmf/mr/utils/DMaaPResponseBuilder.java b/src/main/java/com/att/dmf/mr/utils/DMaaPResponseBuilder.java
index 214aac8..72db9de 100644 (file)
--- a/src/main/java/com/att/dmf/mr/utils/DMaaPResponseBuilder.java
+++ b/src/main/java/com/att/dmf/mr/utils/DMaaPResponseBuilder.java
@@ -46,7 +46,7 @@ import com.att.eelf.configuration.EELFManager;
 
 public class DMaaPResponseBuilder {
 
-       //private static Logger log = Logger.getLogger(DMaaPResponseBuilder.class);
+       
        private static final EELFLogger log = EELFManager.getInstance().getLogger(DMaaPResponseBuilder.class);
        protected static final int kBufferLength = 4096;
 

diff --git a/src/main/java/com/att/dmf/mr/utils/Emailer.java b/src/main/java/com/att/dmf/mr/utils/Emailer.java
index bdff501..a940abf 100644 (file)
--- a/src/main/java/com/att/dmf/mr/utils/Emailer.java
+++ b/src/main/java/com/att/dmf/mr/utils/Emailer.java
@@ -108,7 +108,7 @@ public class Emailer
 
                private String getSetting ( String settingKey, String defval )
                {
-                       //return fSettings.getString ( settingKey, defval );
+                       
                        String strSet = AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,settingKey);
                        if(strSet==null)strSet=defval;
                        return strSet;