Sonar Major issues

[dmaap/messagerouter/msgrtr.git] / src / main / java / com / att / dmf / mr / utils / ConfigurationReader.java

diff --git a/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java b/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java
index dd1e4eb..ab74e9c 100644 (file)
--- a/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java
+++ b/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java
@@ -55,7 +55,7 @@ import com.att.nsa.drumlin.till.nv.rrNvReadable.invalidSettingValue;
 import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;
 import com.att.nsa.limits.Blacklist;
 import com.att.nsa.security.NsaAuthenticatorService;
-//import com.att.nsa.security.authenticators.OriginalUebAuthenticator;
+
 import com.att.nsa.security.db.BaseNsaApiDbImpl;
 import com.att.nsa.security.db.NsaApiDb;
 import com.att.nsa.security.db.NsaApiDb.KeyExistsException;
@@ -70,7 +70,7 @@ import com.att.nsa.security.db.simple.NsaSimpleApiKeyFactory;
 @Component
 public class ConfigurationReader {
 
-//     private rrNvReadable settings;
+
        private Broker1 fMetaBroker;
        private ConsumerFactory fConsumerFactory;
        private Publisher fPublisher;
@@ -78,7 +78,7 @@ public class ConfigurationReader {
        @Autowired
        private DMaaPCambriaLimiter fRateLimiter;
        private NsaApiDb<NsaSimpleApiKey> fApiKeyDb;
-       /* private DMaaPTransactionObjDB<DMaaPTransactionObj> fTranDb; */
+       
        private DMaaPAuthenticator<NsaSimpleApiKey> fSecurityManager;
        private NsaAuthenticatorService<NsaSimpleApiKey> nsaSecurityManager;
        private static CuratorFramework curator;
@@ -90,7 +90,7 @@ public class ConfigurationReader {
        private Emailer fEmailer;
 
        private static final EELFLogger log = EELFManager.getInstance().getLogger(ConfigurationReader.class);
-       //private static final Logger log = Logger.getLogger(ConfigurationReader.class.toString());
+       
 
        /**
         * constructor to initialize all the values
@@ -129,7 +129,7 @@ public class ConfigurationReader {
                        @Qualifier("dMaaPAuthenticatorImpl") DMaaPAuthenticator<NsaSimpleApiKey> fSecurityManager
                        )
                                        throws missingReqdSetting, invalidSettingValue, ServletException, KafkaConsumerCacheException, ConfigDbException {
-               //this.settings = settings;
+               
                this.fMetrics = fMetrics;
                this.zk = zk;
                this.fConfigDb = fConfigDb;
@@ -137,18 +137,18 @@ public class ConfigurationReader {
                ConfigurationReader.curator = curator;
                this.fConsumerFactory = fConsumerFactory;
                this.fMetaBroker = fMetaBroker;
-               //System.out.println("SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSs  " + fMetaBroker);
+               
                this.q = q;
                this.mmb = mmb;
                this.fApiKeyDb = fApiKeyDb;
-               /* this.fTranDb = fTranDb; */
+               
                this.fSecurityManager = fSecurityManager;
                
                long allowedtimeSkewMs=600000L;
                String strallowedTimeSkewM= com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,"authentication.allowedTimeSkewMs");
                if(null!=strallowedTimeSkewM)allowedtimeSkewMs= Long.parseLong(strallowedTimeSkewM);
                                
-       //      boolean requireSecureChannel = true;
+       
                //String strrequireSecureChannel= com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,"aauthentication.requireSecureChannel");
                //if(strrequireSecureChannel!=null)requireSecureChannel=Boolean.parseBoolean(strrequireSecureChannel);
                //this.nsaSecurityManager = new NsaAuthenticatorService<NsaSimpleApiKey>(this.fApiKeyDb, settings.getLong("authentication.allowedTimeSkewMs", 600000L), settings.getBoolean("authentication.requireSecureChannel", true));
@@ -164,9 +164,9 @@ public class ConfigurationReader {
                        fMetrics.toJson();
                        fMetrics.setupCambriaSender();
                        // add the admin authenticator
-                               //              final String adminSecret = settings.getString ( CambriaConstants.kSetting_AdminSecret, null );
+                       
                                                final String adminSecret = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,CambriaConstants.kSetting_AdminSecret);
-                                               //adminSecret = "fe3cCompound";
+                                               
                                                if ( adminSecret != null && adminSecret.length () > 0 )
                                                {
                                                        try