import com.att.ajsc.common.AjscProvider;
import com.att.ajsc.common.AjscService;
-import org.onap.clamp.clds.client.*;
+
+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.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;
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 {
private ApplicationContext context;
/**
- * Clds Identity databse DataSource configuration
+ * Clds Identity database DataSource configuration
*/
@Bean(name = "cldsDataSource")
- @ConfigurationProperties(prefix = "spring.cldsdatasource")
+ @ConfigurationProperties(prefix = "spring.datasource.cldsdb")
public DataSource cldsDataSource() {
- return DataSourceBuilder
- .create()
- .build();
+ return DataSourceBuilder.create().build();
}
@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;
}
}
@Bean
- public RefProp getRefProp() throws IOException {
+ public RefProp getRefProp() {
return new RefProp();
}
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();
}
@Bean(name = "sdcCatalogServices")
- public SdcCatalogServices getAsdcCatalogServices() {
+ public SdcCatalogServices getSdcCatalogServices() {
return new SdcCatalogServices();
}
+
+ @Bean(name = "dcaeDispatcherServices")
+ public DcaeDispatcherServices getDcaeDispatcherServices() {
+ return new DcaeDispatcherServices();
+ }
+
+ @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