Code Improvement

[clamp.git] / src / main / java / org / onap / clamp / clds / config / CldsConfiguration.java

diff --git a/src/main/java/org/onap/clamp/clds/config/CldsConfiguration.java b/src/main/java/org/onap/clamp/clds/config/CldsConfiguration.java
index 19c9164..6b7d337 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/config/CldsConfiguration.java
+++ b/src/main/java/org/onap/clamp/clds/config/CldsConfiguration.java
@@ -23,7 +23,9 @@
 
 package org.onap.clamp.clds.config;
 
-import java.io.IOException;
+import com.att.ajsc.common.AjscProvider;
+import com.att.ajsc.common.AjscService;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,21 +35,20 @@ import javax.xml.transform.TransformerConfigurationException;
 import org.onap.clamp.clds.client.CldsEventDelegate;
 import org.onap.clamp.clds.client.DcaeDispatcherServices;
 import org.onap.clamp.clds.client.DcaeInventoryServices;
-import org.onap.clamp.clds.client.DcaeReqDelegate;
-import org.onap.clamp.clds.client.DcaeReqDeleteDelegate;
+import org.onap.clamp.clds.client.HolmesPolicyDelegate;
+import org.onap.clamp.clds.client.HolmesPolicyDeleteDelegate;
 import org.onap.clamp.clds.client.OperationalPolicyDelegate;
 import org.onap.clamp.clds.client.OperationalPolicyDeleteDelegate;
 import org.onap.clamp.clds.client.PolicyClient;
 import org.onap.clamp.clds.client.SdcCatalogServices;
 import org.onap.clamp.clds.client.SdcSendReqDelegate;
-import org.onap.clamp.clds.client.StringMatchPolicyDelegate;
-import org.onap.clamp.clds.client.StringMatchPolicyDeleteDelegate;
 import org.onap.clamp.clds.client.TcaPolicyDelegate;
 import org.onap.clamp.clds.client.TcaPolicyDeleteDelegate;
 import org.onap.clamp.clds.dao.CldsDao;
 import org.onap.clamp.clds.model.refprop.RefProp;
 import org.onap.clamp.clds.transform.XslTransformer;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.ApplicationContext;
@@ -55,9 +56,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 
-import com.att.ajsc.common.AjscProvider;
-import com.att.ajsc.common.AjscService;
-
 @Configuration
 @Profile("clamp-default")
 public class CldsConfiguration {
@@ -66,7 +64,7 @@ public class CldsConfiguration {
     private ApplicationContext context;
 
     /**
-     * Clds Identity databse DataSource configuration
+     * Clds Identity database DataSource configuration
      */
     @Bean(name = "cldsDataSource")
     @ConfigurationProperties(prefix = "spring.datasource.cldsdb")
@@ -85,9 +83,9 @@ public class CldsConfiguration {
     }
 
     @Bean(name = "cldsDao")
-    public CldsDao getCldsDao() {
+    public CldsDao getCldsDao(@Qualifier("cldsDataSource") DataSource dataSource) {
         CldsDao cldsDao = new CldsDao();
-        cldsDao.setDataSource(cldsDataSource());
+        cldsDao.setDataSource(dataSource);
         return cldsDao;
     }
 
@@ -99,7 +97,7 @@ public class CldsConfiguration {
     }
 
     @Bean
-    public RefProp getRefProp() throws IOException {
+    public RefProp getRefProp() {
         return new RefProp();
     }
 
@@ -113,21 +111,11 @@ public class CldsConfiguration {
         return new CldsEventDelegate();
     }
 
-    @Bean(name = "dcaeReqDelegate")
-    public DcaeReqDelegate getDcaeReqDelegate() {
-        return new DcaeReqDelegate();
-    }
-
     @Bean(name = "sdcSendReqDelegate")
     public SdcSendReqDelegate getSdcSendReqDelegate() {
         return new SdcSendReqDelegate();
     }
 
-    @Bean(name = "dcaeReqDeleteDelegate")
-    public DcaeReqDeleteDelegate getDcaeReqDeleteDelegate() {
-        return new DcaeReqDeleteDelegate();
-    }
-
     @Bean(name = "operationalPolicyDelegate")
     public OperationalPolicyDelegate getOperationalPolicyDelegate() {
         return new OperationalPolicyDelegate();
@@ -138,16 +126,6 @@ public class CldsConfiguration {
         return new OperationalPolicyDeleteDelegate();
     }
 
-    @Bean(name = "stringMatchPolicyDelegate")
-    public StringMatchPolicyDelegate getStringMatchPolicyDelegate() {
-        return new StringMatchPolicyDelegate();
-    }
-
-    @Bean(name = "stringMatchPolicyDeleteDelegate")
-    public StringMatchPolicyDeleteDelegate getStringMatchPolicyDeleteDelegate() {
-        return new StringMatchPolicyDeleteDelegate();
-    }
-
     @Bean(name = "sdcCatalogServices")
     public SdcCatalogServices getSdcCatalogServices() {
         return new SdcCatalogServices();
@@ -173,4 +151,14 @@ public class CldsConfiguration {
         return new TcaPolicyDeleteDelegate();
     }
 
+    @Bean(name = "holmesPolicyDelegate")
+    public HolmesPolicyDelegate getHolmesPolicyDelegate() {
+        return new HolmesPolicyDelegate();
+    }
+
+    @Bean(name = "holmesPolicyDeleteDelegate")
+    public HolmesPolicyDeleteDelegate getHolmesPolicyDeleteDelegate() {
+        return new HolmesPolicyDeleteDelegate();
+    }
+
 }
\ No newline at end of file