diff options
Diffstat (limited to 'catalog-dao/src/main/java/org/openecomp/sdc/be/dao/config/DAOSpringConfig.java')
-rw-r--r-- | catalog-dao/src/main/java/org/openecomp/sdc/be/dao/config/DAOSpringConfig.java | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/config/DAOSpringConfig.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/config/DAOSpringConfig.java index c5f066bb4b..99979bac0c 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/config/DAOSpringConfig.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/config/DAOSpringConfig.java @@ -20,34 +20,22 @@ package org.openecomp.sdc.be.dao.config; -import org.openecomp.sdc.be.dao.DAOTitanStrategy; -import org.openecomp.sdc.be.dao.TitanClientStrategy; -import org.openecomp.sdc.be.dao.titan.TitanGenericDao; -import org.openecomp.sdc.be.dao.titan.TitanGraphClient; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; +import org.springframework.context.annotation.Import; @Configuration +@Import({TitanSpringConfig.class}) +@ComponentScan({ + "org.openecomp.sdc.be.dao.cassandra", + "org.openecomp.sdc.be.dao.neo4j", + "org.openecomp.sdc.be.dao.es", + "org.openecomp.sdc.be.dao.impl", + "org.openecomp.sdc.be.resources.impl" + }) public class DAOSpringConfig { - @Bean(name = "titan-generic-dao") - @Primary - public TitanGenericDao titanGenericDao(@Qualifier("titan-client") TitanGraphClient titanGraphClient) { - return new TitanGenericDao(titanGraphClient); - } - - @Bean(name = "titan-client", initMethod = "createGraph") - @Primary - public TitanGraphClient titanGraphClient(@Qualifier("dao-client-strategy") TitanClientStrategy titanClientStrategy) { - return new TitanGraphClient(titanClientStrategy); - } - - @Bean(name = "dao-client-strategy") - public TitanClientStrategy titanClientStrategy() { - return new DAOTitanStrategy(); - } + |