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
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 42afbb7..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
@@ -77,7 +77,6 @@
boolean setEnable=true;
if (cambriaSetting!=null && cambriaSetting.equals("false") )
setEnable= false;
- //System.out.println(setEnable+"XXXXXXXXXXXXXXXX");
if (setEnable) {
String Setting_CambriaBaseUrl=com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,kSetting_CambriaEnabled);
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 5da397c..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
@@ -239,7 +239,9 @@
//final long freq = fSettings.getLong(kSetting_SweepEverySeconds, kDefault_SweepEverySeconds);
long freq = kDefault_SweepEverySeconds;
String strkSetting_SweepEverySeconds = AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,kSetting_SweepEverySeconds);
- if(null==strkSetting_SweepEverySeconds) strkSetting_SweepEverySeconds = kDefault_SweepEverySeconds+"";
+ if(null==strkSetting_SweepEverySeconds) {
+ strkSetting_SweepEverySeconds = kDefault_SweepEverySeconds+"";
+ }
freq = Long.parseLong(strkSetting_SweepEverySeconds);