Merge changes Ic7d570d6,I65961cf0,Ia09070d3

* 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/resources/CambriaOutboundEventStream.java b/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java
index fd786b7..9ef2139 100644 (file)
--- a/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java
+++ b/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java
@@ -479,10 +479,10 @@ public class CambriaOutboundEventStream implements StreamWriter {
         * 
         * Checks whether filter is initialized
         */
-       /*private boolean isFilterInitialized() {
-               return (fHpAlarmFilter != null && fHppe != null);
-       }
-*/
+       
+               
+       
+
        /**
         * 
         * @param msg
@@ -490,18 +490,18 @@ public class CambriaOutboundEventStream implements StreamWriter {
         */
        private boolean filterMatches(String msg) {
                boolean result = true;
-               /*if (isFilterInitialized()) {
-                       try {
-                               final HpJsonEvent e = new HpJsonEvent("e", new JSONObject(msg));
-                               result = fHpAlarmFilter.matches(fHppe, e);
-                       } catch (JSONException x) {
-                               // the msg may not be JSON
-                               result = false;
-                               log.error("Failed due to " + x.getMessage());
-                       } catch (Exception x) {
-                               log.error("Error using filter: " + x.getMessage(), x);
-                       }
-               }*/
+               
+               
+                               
+                               
+                       
+                       
+                       
+                               
+                       
+                               
+               
+       
 
                return result;
        }
@@ -534,11 +534,11 @@ public class CambriaOutboundEventStream implements StreamWriter {
        private final Consumer fConsumer;
        private final int fLimit;
        private final int fTimeoutMs;
-       // private final rrNvReadable fSettings;
+       
        private final boolean fPretty;
        private final boolean fWithMeta;
        private int fSent;
-//     private final HpAlarmFilter<HpJsonEvent> fHpAlarmFilter;
+
        //private final HpProcessingEngine<HpJsonEvent> fHppe;
        private DMaaPContext dmaapContext;
        private String responseTransactionId;
@@ -548,7 +548,7 @@ public class CambriaOutboundEventStream implements StreamWriter {
        private ArrayList<Consumer> fKafkaConsumerList;
        private boolean istransType = true;
        // private static final Logger log =
-       // Logger.getLogger(CambriaOutboundEventStream.class);
+       
 
        private static final EELFLogger log = EELFManager.getInstance().getLogger(CambriaOutboundEventStream.class);
 }
\ No newline at end of file

diff --git a/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java b/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java
index 22b60fe..88c5fd9 100644 (file)
--- a/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java
+++ b/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java
@@ -376,7 +376,7 @@ public class EventsServiceImpl implements EventsService {
                String topicNameStd = null;
 
                // topicNameStd=
-               // ctx.getConfigReader().getSettings().getString("enforced.topic.name.AAF");
+               
                topicNameStd = com.att.ajsc.beans.PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop,
                                "enforced.topic.name.AAF");
                String metricTopicname = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,
@@ -404,7 +404,7 @@ public class EventsServiceImpl implements EventsService {
                if (topicNameEnforced || (user == null && null != ctx.getRequest().getHeader("Authorization")
                                && !topic.equalsIgnoreCase(metricTopicname))) {
                        // the topic name will be sent by the client
-                       // String permission = "com.att.dmaap.mr.topic"+"|"+topic+"|"+"pub";
+               
                        DMaaPAAFAuthenticator aaf = new DMaaPAAFAuthenticatorImpl();
                        String permission = aaf.aafPermissionString(topic, "pub");
                        if (!aaf.aafAuthentication(ctx.getRequest(), permission)) {
@@ -486,7 +486,7 @@ public class EventsServiceImpl implements EventsService {
                if (null != batchlen)
                        maxEventBatch = Long.parseLong(batchlen);
                // long maxEventBatch =
-               // ctx.getConfigReader().getSettings().getLong(BATCH_LENGTH, 1024 * 16);
+               
                final LinkedList<Publisher.message> batch = new LinkedList<>();
                // final ArrayList<KeyedMessage<String, String>> kms = new
                // ArrayList<KeyedMessage<String, String>>();

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;