fixes for sonar vulnerabilities

[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 ab74e9c..aebca34 100644 (file)
--- a/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java
+++ b/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java
@@ -112,6 +112,7 @@ public class ConfigurationReader {
         * @throws ServletException
         * @throws KafkaConsumerCacheException
         * @throws ConfigDbException 
+        * @throws KeyExistsException 
         */
        @Autowired
        public ConfigurationReader(@Qualifier("propertyReader") rrNvReadable settings,
@@ -128,7 +129,7 @@ public class ConfigurationReader {
                         */
                        @Qualifier("dMaaPAuthenticatorImpl") DMaaPAuthenticator<NsaSimpleApiKey> fSecurityManager
                        )
-                                       throws missingReqdSetting, invalidSettingValue, ServletException, KafkaConsumerCacheException, ConfigDbException {
+                                       throws missingReqdSetting, invalidSettingValue, ServletException, KafkaConsumerCacheException, ConfigDbException, KeyExistsException {
                
                this.fMetrics = fMetrics;
                this.zk = zk;
@@ -158,7 +159,7 @@ public class ConfigurationReader {
        }
 
        protected void servletSetup()
-                       throws rrNvReadable.missingReqdSetting, rrNvReadable.invalidSettingValue, ServletException, ConfigDbException {
+                       throws rrNvReadable.missingReqdSetting, rrNvReadable.invalidSettingValue, ServletException, ConfigDbException, KeyExistsException {
                try {
 
                        fMetrics.toJson();
@@ -169,23 +170,16 @@ public class ConfigurationReader {
                                                
                                                if ( adminSecret != null && adminSecret.length () > 0 )
                                                {
-                                                       try
-                                                       {
                                                                
                                                                final NsaApiDb<NsaSimpleApiKey> adminDb = new BaseNsaApiDbImpl<NsaSimpleApiKey> ( new MemConfigDb(), new NsaSimpleApiKeyFactory() );
                                                                adminDb.createApiKey ( "admin", adminSecret );
-                                                               //nsaSecurityManager.addAuthenticator ( new OriginalUebAuthenticator<NsaSimpleApiKey> ( adminDb, 10*60*1000 ) );
+                                                       
                                                        fSecurityManager.addAuthenticator ( new DMaaPOriginalUebAuthenticator<NsaSimpleApiKey> ( adminDb, 10*60*1000 ) );
-                                                       }
                                                
-                                                       catch ( KeyExistsException e )
-                                                       {
-                                                               throw new RuntimeException ( "This key can't exist in a fresh in-memory DB!", e );
-                                                       }
                                                }
                                        
                        // setup a backend
-                       //final String type = settings.getString(CambriaConstants.kBrokerType, CambriaConstants.kBrokerType_Kafka);
+                       
                         String type = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,CambriaConstants.kBrokerType);
                        if (type==null) type = CambriaConstants.kBrokerType_Kafka;
                        if (CambriaConstants.kBrokerType_Kafka.equalsIgnoreCase(type)) {