Removal of useless files & bugfix

[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 eee1791..a6baa96 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/config/CldsConfiguration.java
+++ b/src/main/java/org/onap/clamp/clds/config/CldsConfiguration.java
@@ -35,8 +35,8 @@ 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;
@@ -50,6 +50,7 @@ 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;
@@ -65,7 +66,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")
@@ -84,9 +85,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;
     }
 
@@ -112,21 +113,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();
@@ -172,4 +163,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