From a74c4653a91f23d4d627cf8dc7a8a2a63178e251 Mon Sep 17 00:00:00 2001 From: Surendra Reddy Katam Date: Fri, 24 Aug 2018 11:58:01 +0530 Subject: Sonar major issues This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-Vada32hFUzlqc5qg&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java Line No- L26 L51 L55 L66 L82 L86 L112 L120 Change-Id: Ia68a15432466e0042377d5042968b7b213d15057 Issue-ID: DMAAP-641 Signed-off-by: Surendra Reddy Katam --- .../java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java b/src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java index e29403f..b6fcbf5 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java +++ b/src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java @@ -23,7 +23,7 @@ package com.att.dmf.mr.beans; import java.security.Key; -//import org.apache.log4-j.Logger; + import org.springframework.beans.factory.annotation.Autowired; import com.att.dmf.mr.constants.CambriaConstants; @@ -48,11 +48,11 @@ import com.att.nsa.util.rrConvertor; */ public class DMaaPNsaApiDb { - //private rrNvReadable settings; + private DMaaPZkConfigDb cdb; //private static final Logger log = Logger - // .getLogger(DMaaPNsaApiDb.class.toString()); + private static final EELFLogger log = EELFManager.getInstance().getLogger(DMaaPNsaApiDb.class); /** @@ -63,7 +63,7 @@ public class DMaaPNsaApiDb { */ @Autowired public DMaaPNsaApiDb(rrNvReadable settings, DMaaPZkConfigDb cdb) { - //this.setSettings(settings); + this.setCdb(cdb); } /** @@ -79,11 +79,11 @@ public class DMaaPNsaApiDb { missingReqdSetting { // Cambria uses an encrypted api key db - //final String keyBase64 = settings.getString("cambria.secureConfig.key", null); + final String keyBase64 =com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,"cambria.secureConfig.key"); - // final String initVectorBase64 = settings.getString( "cambria.secureConfig.iv", null); + final String initVectorBase64 =com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,"cambria.secureConfig.iv"); // if neither value was provided, don't encrypt api key db if (keyBase64 == null && initVectorBase64 == null) { @@ -109,17 +109,17 @@ public class DMaaPNsaApiDb { * @return * returns settings */ -/* public rrNvReadable getSettings() { - return settings; - }*/ + + + /** * @param settings * set settings */ - /*public void setSettings(rrNvReadable settings) { - this.settings = settings; - }*/ + + + /** * @return -- cgit 1.2.3-korg