Merge changes I6d43e553,I8e07515b,Ida4d83cd,Id70b6f40,Ic9b25d4f, ...

* changes:
  sonar major for commented-out lines
  sonar critical for conditional statement
  sonar minor issue for unused import
  sonar major issue for commented-out lines
  sonar major issue for commented-out lines
  sonar major issue for 2 statements per line

4 files changed, 9 insertions, 6 deletions

diff --git a/src/main/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSender.java b/src/main/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSender.java
index 371f7cc..e5e0807 100644
--- a/src/main/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSender.java
+++ b/src/main/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSender.java
@@ -40,7 +40,7 @@ import com.att.eelf.configuration.EELFManager;
 import com.att.nsa.cambria.constants.CambriaConstants;
 import com.att.nsa.cambria.metrics.publisher.CambriaPublisher;
 import com.att.nsa.cambria.metrics.publisher.DMaaPCambriaClientFactory;
-import com.att.nsa.drumlin.till.nv.rrNvReadable;
+
 import com.att.nsa.metrics.CdmMetricsRegistry;
 import com.att.nsa.metrics.impl.CdmConstant;
 
@@ -83,9 +83,10 @@ public class DMaaPMetricsSender implements Runnable {
 			Setting_CambriaBaseUrl=Setting_CambriaBaseUrl==null?"localhost":Setting_CambriaBaseUrl;
 			
 			String Setting_CambriaTopic=com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,kSetting_CambriaTopic);
-			if(Setting_CambriaTopic==null) Setting_CambriaTopic = "msgrtr.apinode.metrics.dmaap";     
+			if(Setting_CambriaTopic==null) {
+				Setting_CambriaTopic = "msgrtr.apinode.metrics.dmaap";   
+				}
 			
-	//		Setting_CambriaBaseUrl=Setting_CambriaBaseUrl==null?defaultTopic:Setting_CambriaBaseUrl;
 			
 			String Setting_CambriaSendFreqSecs=com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,kSetting_CambriaSendFreqSecs);
 			
diff --git a/src/main/java/com/att/nsa/cambria/backends/Consumer.java b/src/main/java/com/att/nsa/cambria/backends/Consumer.java
index f1b43c2..d4946ba 100644
--- a/src/main/java/com/att/nsa/cambria/backends/Consumer.java
+++ b/src/main/java/com/att/nsa/cambria/backends/Consumer.java
@@ -75,7 +75,7 @@ public interface Consumer
 	 * @param atOffset start with the next message at or after atOffset. -1 means next from last request
 	 * @return the next message, or null if none are waiting
 	 */
-//	Message nextMessage ( long atOffset );
+
 
 	/**
 	 * Close/clean up this consumer
diff --git a/src/main/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCache.java b/src/main/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCache.java
index 748ee62..0d6a74e 100644
--- a/src/main/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCache.java
+++ b/src/main/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCache.java
@@ -46,7 +46,7 @@ import org.apache.curator.utils.ZKPaths;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.NoNodeException;
-//import org.slf4j.Logger;
+
 //import org.slf4j.LoggerFactory;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java b/src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java
index 7875b90..bfd005e 100644
--- a/src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java
+++ b/src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java
@@ -163,7 +163,9 @@ public class TopicServiceImpl implements TopicService {
 		if (null!=t.getOwners ())
 		o.put ( "owner", t.getOwners ().iterator ().next () );
 		if(null!=t.getReaderAcl ())
-		o.put ( "readerAcl", aclToJson ( t.getReaderAcl () ) );
+		{
+			o.put ( "readerAcl", aclToJson ( t.getReaderAcl () ) );
+		}
 		if(null!=t.getWriterAcl ())
 		o.put ( "writerAcl", aclToJson ( t.getWriterAcl () ) );