From e3fce28a055f2476407e58d54e83044928f8e9c5 Mon Sep 17 00:00:00 2001
From: Sahani Ravindrana Naik <sn00552219@techmahindra.com>
Date: Thu, 3 May 2018 16:40:47 +0530
Subject: sonar major issue for 2 statements per line

At most one statement is allowed per line, but 2 statements were found on this line
Sonar Link:
https://sonar.onap.org/project/issues?assignees=Sahani_Naik&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-VaZ932hFUzlqc5lz&resolved=false
Location:
src/main/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSender.java
Line No-87

Change-Id: I55b8452eda65d5b3fdedd87fa68326d60d9cd457
Issue-ID: DMAAP-454
Signed-off-by: Sahani Ravindrana Naik <sn00552219@techmahindra.com>
---
 .../com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSender.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

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 2959f41..55cb91e 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
@@ -84,9 +84,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";     
-			
-	//		Setting_CambriaBaseUrl=Setting_CambriaBaseUrl==null?defaultTopic:Setting_CambriaBaseUrl;
+			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);
 			
-- 
cgit 


From 4ef5ce6a441e6d7983cb3e06c2739a0b7581f5b1 Mon Sep 17 00:00:00 2001
From: Sahani Ravindrana Naik <sn00552219@techmahindra.com>
Date: Thu, 3 May 2018 17:13:31 +0530
Subject: sonar major issue for commented-out lines

This block of commented-out lines of code should be removed
Sonar Link:
https://sonar.onap.org/project/issues?assignees=Sahani_Naik&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&resolved=false
Location:
src/main/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSender.java
Line No-89

Change-Id: Ic9b25d4f38fe8ffb7584a3662895b1488d572da0
Issue-ID: DMAAP-457
Signed-off-by: Sahani Ravindrana Naik <sn00552219@techmahindra.com>
---
 .../java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSender.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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 55cb91e..2d3d5cc 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
@@ -87,7 +87,7 @@ public class DMaaPMetricsSender implements Runnable {
 			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);
 			
-- 
cgit 


From 6ef67c5a2e01142ebea14f1fd980ae6162350e03 Mon Sep 17 00:00:00 2001
From: Sahani Ravindrana Naik <sn00552219@techmahindra.com>
Date: Fri, 4 May 2018 09:52:59 +0530
Subject: sonar major issue for commented-out lines

This block of commented-out lines of code should be removed
Sonar Link:
https://sonar.onap.org/project/issues?assignees=Sahani_Naik&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr
Location:
src/main/java/com/att/nsa/cambria/backends/Consumer.java
Line No-78

Change-Id: Id70b6f40b95917690ac78f1cc387cd779cfe3d6a
Issue-ID: DMAAP-459
Signed-off-by: Sahani Ravindrana Naik <sn00552219@techmahindra.com>
---
 src/main/java/com/att/nsa/cambria/backends/Consumer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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
-- 
cgit 


From 80e23bfeb220115b582cfa0d1bce9fbcb6129947 Mon Sep 17 00:00:00 2001
From: Sahani Ravindrana Naik <sn00552219@techmahindra.com>
Date: Mon, 7 May 2018 17:14:56 +0530
Subject: sonar minor issue for unused import

Remove this unused import 'com.att.nsa.drumlin.till.nv.rrNvReadable'
Sonar Link:
https://sonar.onap.org/project/issues?assignees=Sahani_Naik&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&resolved=false
Location:
src/main/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSender.java
Line No-43

Change-Id: Ida4d83cde56c0765debc27f6765dce1ad4ef03a4
Issue-ID: DMAAP-468
Signed-off-by: Sahani Ravindrana Naik <sn00552219@techmahindra.com>
---
 .../java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSender.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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 2d3d5cc..42afbb7 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;
 
-- 
cgit 


From a8d86dd9661d7e57616fa1835860937affb56cb3 Mon Sep 17 00:00:00 2001
From: Sahani Ravindrana Naik <sn00552219@techmahindra.com>
Date: Wed, 9 May 2018 11:55:42 +0530
Subject: sonar critical for conditional statement

This line will not be executed conditionally; only the first line of this 2-line block will be. The rest will execute unconditionally
Sonar Link:
https://sonar.onap.org/project/issues?assignees=Sahani_Naik&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&resolved=false
Location:
src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java
Line No-166

Change-Id: I8e07515bb42960205f7f4982d99184cf946402ac
Issue-ID: DMAAP-480
Signed-off-by: Sahani Ravindrana Naik <sn00552219@techmahindra.com>
---
 src/main/java/com/att/nsa/cambria/service/impl/TopicServiceImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

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 () ) );
 	
-- 
cgit 


From ded629b01beb6a824793e13de97cf6a4d9e51a7a Mon Sep 17 00:00:00 2001
From: Sahani Ravindrana Naik <sn00552219@techmahindra.com>
Date: Wed, 9 May 2018 12:19:20 +0530
Subject: sonar major for commented-out lines

This block of commented-out lines of code should be removed
Sonar Link:
https://sonar.onap.org/project/issues?assignees=Sahani_Naik&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&resolved=false
Location:
src/main/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCache.java
Line No-49

Change-Id: I6d43e55351c18bdbedae87a17fa2eb5f78ebd3a1
Issue-ID: DMAAP-481
Signed-off-by: Sahani Ravindrana Naik <sn00552219@techmahindra.com>
---
 .../java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCache.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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 a9d0d9b..5da397c 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;
-- 
cgit