X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fconfig%2FCldsConfiguration.java;h=0c73ac71fdc5c67048aabfb4a9db6fa17335cdbd;hb=434170f50621917a7fb2cbe7c7b01c4b29a8211e;hp=814d2c6ad44779b08e12dc8c0aadf256b8444cff;hpb=5e9feb2a8e360b82dc2b6e4145e0fd847d2924ce;p=clamp.git

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 814d2c6a..0c73ac71 100644
--- a/src/main/java/org/onap/clamp/clds/config/CldsConfiguration.java
+++ b/src/main/java/org/onap/clamp/clds/config/CldsConfiguration.java
@@ -25,56 +25,69 @@ package org.onap.clamp.clds.config;
 
 import com.att.ajsc.common.AjscProvider;
 import com.att.ajsc.common.AjscService;
-import org.onap.clamp.clds.client.*;
+
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.sql.DataSource;
+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.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.TcaPolicyDelegate;
+import org.onap.clamp.clds.client.TcaPolicyDeleteDelegate;
+import org.onap.clamp.clds.client.req.SdcReq;
 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.boot.autoconfigure.jdbc.DataSourceBuilder;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 
-import javax.sql.DataSource;
-import javax.xml.transform.TransformerConfigurationException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
 @Configuration
 @Profile("clamp-default")
 public class CldsConfiguration {
-
     @Autowired
     private ApplicationContext context;
 
     /**
-     * Clds Identity databse DataSource configuration
+     * Clds Identity database DataSource configuration
+     * 
+     * @return
      */
     @Bean(name = "cldsDataSource")
-    @ConfigurationProperties(prefix = "spring.cldsdatasource")
+    @ConfigurationProperties(prefix = "spring.datasource.cldsdb")
     public DataSource cldsDataSource() {
-        return DataSourceBuilder
-                .create()
-                .build();
+        return new EncodedPasswordBasicDataSource();
     }
 
     @Bean(name = "jaxrsProviders")
-    public List jaxrsProviders() {
+    public List<?> jaxrsProviders() {
         return new ArrayList(context.getBeansWithAnnotation(AjscProvider.class).values());
     }
 
     @Bean(name = "jaxrsServices")
-    public List jaxrsServices() {
+    public List<?> jaxrsServices() {
         return new ArrayList(context.getBeansWithAnnotation(AjscService.class).values());
     }
 
     @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;
     }
 
@@ -86,10 +99,15 @@ public class CldsConfiguration {
     }
 
     @Bean
-    public RefProp getRefProp() throws IOException {
+    public RefProp getRefProp() {
         return new RefProp();
     }
 
+    @Bean
+    public SdcReq getSdcReq() {
+        return new SdcReq();
+    }
+
     @Bean
     public PolicyClient getPolicyClient() {
         return new PolicyClient();
@@ -100,21 +118,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();
@@ -125,18 +133,38 @@ public class CldsConfiguration {
         return new OperationalPolicyDeleteDelegate();
     }
 
-    @Bean(name = "stringMatchPolicyDelegate")
-    public StringMatchPolicyDelegate getStringMatchPolicyDelegate() {
-        return new StringMatchPolicyDelegate();
+    @Bean(name = "sdcCatalogServices")
+    public SdcCatalogServices getSdcCatalogServices() {
+        return new SdcCatalogServices();
     }
 
-    @Bean(name = "stringMatchPolicyDeleteDelegate")
-    public StringMatchPolicyDeleteDelegate getStringMatchPolicyDeleteDelegate() {
-        return new StringMatchPolicyDeleteDelegate();
+    @Bean(name = "dcaeDispatcherServices")
+    public DcaeDispatcherServices getDcaeDispatcherServices() {
+        return new DcaeDispatcherServices();
     }
 
-    @Bean(name = "sdcCatalogServices")
-    public SdcCatalogServices getAsdcCatalogServices() {
-        return new SdcCatalogServices();
+    @Bean(name = "dcaeInventoryServices")
+    public DcaeInventoryServices getDcaeInventoryServices() {
+        return new DcaeInventoryServices();
+    }
+
+    @Bean(name = "tcaPolicyDelegate")
+    public TcaPolicyDelegate getTcaPolicyDelegate() {
+        return new TcaPolicyDelegate();
+    }
+
+    @Bean(name = "tcaPolicyDeleteDelegate")
+    public TcaPolicyDeleteDelegate getTcaPolicyDeleteDelegate() {
+        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