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

1 files changed, 4 insertions, 3 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);