Resolved the Critical issue reported by Sonar 65/28665/1
authorrb7147 <rb7147@att.com>
Fri, 19 Jan 2018 15:10:18 +0000 (10:10 -0500)
committerrb7147 <rb7147@att.com>
Fri, 19 Jan 2018 15:10:29 +0000 (10:10 -0500)
Issue-ID: POLICY-521
Change-Id: I2a7072076a1ed0924bfeacd6f3d2b6a910f30338
Signed-off-by: rb7147 <rb7147@att.com>
ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java

index 7db760a..ccc4691 100644 (file)
@@ -27,7 +27,9 @@ import org.onap.portalapp.scheduler.RegistryAdapter;
 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;
@@ -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
@@ -139,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;
        }