@Bean
HealingJanusGraphDao janusGraphDao() {
- this.janusGraphDao = new HealingJanusGraphDao(janusGraphClient());
+ this.janusGraphDao = new HealingJanusGraphDao(healingPipelineDao(),janusGraphClient());
return janusGraphDao;
}
@Bean
HealingJanusGraphDao janusGraphDao() {
- janusGraphDao = new HealingJanusGraphDao(janusGraphClient());
+ janusGraphDao = new HealingJanusGraphDao(healingPipelineDao(), janusGraphClient());
return janusGraphDao;
}
@Bean(name = "janusgraph-generic-dao")
@Primary
- public HealingJanusGraphGenericDao janusGraphGenericDao(@Qualifier("janusgraph-client") JanusGraphClient janusGraphClient) {
- return new HealingJanusGraphGenericDao(janusGraphClient);
+ public HealingJanusGraphGenericDao janusGraphGenericDao(@Qualifier("janusgraph-client") JanusGraphClient janusGraphClient, @Qualifier("healingPipelineDao") HealingPipelineDao healingPipelineDao) {
+ return new HealingJanusGraphGenericDao(healingPipelineDao, janusGraphClient);
}
@Bean(name = "janusgraph-client", initMethod = "createGraph")
@Component("janusgraph-generic-dao")
public class HealingJanusGraphGenericDao extends JanusGraphGenericDao {
- @Autowired
private HealingPipelineDao healingPipelineDao;
- public HealingJanusGraphGenericDao(JanusGraphClient janusGraphClient) {
+ @Autowired
+ public HealingJanusGraphGenericDao(HealingPipelineDao healingPipelineDao, JanusGraphClient janusGraphClient) {
super(janusGraphClient);
+ this.healingPipelineDao = healingPipelineDao;
}
@Override
@Component("janusgraph-dao")
public class HealingJanusGraphDao extends JanusGraphDao {
-
- @Autowired
private HealingPipelineDao healingPipelineDao;
- public HealingJanusGraphDao(JanusGraphClient janusGraphClient) {
+ @Autowired
+ public HealingJanusGraphDao(HealingPipelineDao healingPipelineDao, JanusGraphClient janusGraphClient) {
super(janusGraphClient);
+ this.healingPipelineDao = healingPipelineDao;
}
@Override
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.Mockito;
+import org.openecomp.sdc.be.dao.impl.HealingPipelineDao;
import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
import org.openecomp.sdc.be.dao.janusgraph.JanusGraphClient;
import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
import java.util.*;
import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
public class PropertyOperationTest extends ModelTestBase {
- HealingJanusGraphGenericDao janusGraphGenericDao = Mockito.mock(HealingJanusGraphGenericDao.class);
+ HealingJanusGraphGenericDao janusGraphGenericDao = mock(HealingJanusGraphGenericDao.class);
PropertyOperation propertyOperation = new PropertyOperation(janusGraphGenericDao, null);
}
private PropertyOperation createTestSubject() {
- return new PropertyOperation(new HealingJanusGraphGenericDao(new JanusGraphClient()), null);
+ return new PropertyOperation(new HealingJanusGraphGenericDao(mock(HealingPipelineDao.class), new JanusGraphClient()), null);
}