Resolved the Critical issue reported by Sonar

[policy/engine.git] / ONAP-SDK-APP / src / main / java / org / onap / portalapp / conf / ExternalAppConfig.java

diff --git a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index 15a6c76..ccc4691 100644 (file)
--- a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
+++ b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
@@ -24,13 +24,15 @@ import java.util.List;
 
 import org.onap.portalapp.login.LoginStrategyImpl;
 import org.onap.portalapp.scheduler.RegistryAdapter;
-import org.openecomp.portalsdk.core.auth.LoginStrategy;
-import org.openecomp.portalsdk.core.conf.AppConfig;
-import org.openecomp.portalsdk.core.conf.Configurable;
-import org.openecomp.portalsdk.core.objectcache.AbstractCacheManager;
-import org.openecomp.portalsdk.core.service.DataAccessService;
-import org.openecomp.portalsdk.core.util.CacheManager;
-import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.onap.portalsdk.core.auth.LoginStrategy;
+import org.onap.portalsdk.core.conf.AppConfig;
+import org.onap.portalsdk.core.conf.Configurable;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.objectcache.AbstractCacheManager;
+import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
+import org.onap.portalsdk.core.service.DataAccessService;
+import org.onap.portalsdk.core.util.CacheManager;
+import org.onap.portalsdk.core.util.SystemProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -47,7 +49,7 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 
 /**
- * ONAP Portal SDK sample application. ONAP Portal SDK core AppConfig class to
+ * ONAP Portal SDK sample application. Extends core AppConfig class to
  * reuse interceptors, view resolvers and other features defined there.
  */
 @Configuration
@@ -59,6 +61,8 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 @EnableScheduling
 public class ExternalAppConfig extends AppConfig implements Configurable {
 
+       EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ExternalAppConfig.class);
+       
        private RegistryAdapter schedulerRegistryAdapter;
 
        @Configuration
@@ -67,24 +71,27 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
        }
 
        /**
-        * @see org.openecomp.portalsdk.core.conf.AppConfig#viewResolver()
+        * @see org.onap.portalsdk.core.conf.AppConfig#viewResolver()
         */
+       @Override
        public ViewResolver viewResolver() {
                return super.viewResolver();
        }
 
        /**
-        * @see org.openecomp.portalsdk.core.conf.AppConfig#addResourceHandlers(ResourceHandlerRegistry)
+        * @see org.onap.portalsdk.core.conf.AppConfig#addResourceHandlers(ResourceHandlerRegistry)
         * 
         * @param registry
         */
+       @Override
        public void addResourceHandlers(ResourceHandlerRegistry registry) {
                super.addResourceHandlers(registry);
        }
 
        /**
-        * @see org.openecomp.portalsdk.core.conf.AppConfig#dataAccessService()
+        * @see org.onap.portalsdk.core.conf.AppConfig#dataAccessService()
         */
+       @Override
        public DataAccessService dataAccessService() {
                // Echo the JDBC URL to assist developers when starting the app.
                System.out.println("ExternalAppConfig: " + SystemProperties.DB_CONNECTIONURL + " is "
@@ -98,6 +105,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
         * 
         * @return List of String, size 1
         */
+       @Override
        public List<String> addTileDefinitions() {
                List<String> definitions = new ArrayList<>();
                definitions.add("/WEB-INF/defs/definitions.xml");
@@ -135,11 +143,16 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
         */
        // @Bean // ANNOTATION COMMENTED OUT
        // APPLICATIONS REQUIRING QUARTZ SHOULD RESTORE ANNOTATION
-       public SchedulerFactoryBean schedulerFactoryBean() throws Exception {
+       public SchedulerFactoryBean schedulerFactoryBean(){
                SchedulerFactoryBean scheduler = new SchedulerFactoryBean();
                scheduler.setTriggers(schedulerRegistryAdapter.getTriggers());
                scheduler.setConfigLocation(appApplicationContext.getResource("WEB-INF/conf/quartz.properties"));
-               scheduler.setDataSource(dataSource());
+               try {
+                       scheduler.setDataSource(dataSource());
+               } catch (Exception e) {
+                       logger.error("Exception occured While Setting DataSource for schedulerfactorybean"+e);
+                       return null;
+               }
                return scheduler;
        }
 
@@ -155,7 +168,6 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
 
        @Bean
        public LoginStrategy loginStrategy() {
-
                return new LoginStrategyImpl();
        }
 }