Fixing build 30/91530/1
authorWojciech Sliwka <wojciech.sliwka@nokia.com>
Tue, 16 Jul 2019 12:02:03 +0000 (14:02 +0200)
committerWojciech Sliwka <wojciech.sliwka@nokia.com>
Tue, 16 Jul 2019 12:02:03 +0000 (14:02 +0200)
Change-Id: Ia75cdf511e44347294bb646add89b6c1f60f239c
Issue-ID: SDC-2403
Signed-off-by: Wojciech Sliwka <wojciech.sliwka@nokia.com>
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java
asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfigurationTest.java

index 47dd7fd..764e6d9 100644 (file)
@@ -40,6 +40,7 @@ import org.openecomp.sdc.be.dao.JanusGraphClientStrategy;
 import org.openecomp.sdc.be.dao.cassandra.ArtifactCassandraDao;
 import org.openecomp.sdc.be.dao.cassandra.CassandraClient;
 import org.openecomp.sdc.be.dao.config.DAOSpringConfig;
+import org.openecomp.sdc.be.dao.impl.HealingPipelineDao;
 import org.openecomp.sdc.be.dao.janusgraph.JanusGraphClient;
 import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.be.dao.jsongraph.HealingJanusGraphDao;
@@ -219,9 +220,14 @@ public class ValidationToolConfiguration {
         return new VrfObjectFixHandler(janusGraphDao);
     }
 
+    @Bean(name = "healingPipelineDao")
+    public HealingPipelineDao healingPipelineDao(){
+        return new HealingPipelineDao();
+    }
+
     @Bean(name = "janusgraph-dao")
-    public HealingJanusGraphDao healingJanusGraphDao(JanusGraphClient janusGraphClient) {
-        return new HealingJanusGraphDao(janusGraphClient);
+    public HealingJanusGraphDao healingJanusGraphDao(HealingPipelineDao healingPipelineDao, JanusGraphClient janusGraphClient) {
+        return new HealingJanusGraphDao(healingPipelineDao, janusGraphClient);
     }
 
     @Bean
index a6ae4d2..201d307 100644 (file)
@@ -34,6 +34,7 @@ import org.openecomp.sdc.asdctool.impl.validator.tasks.moduleJson.ModuleJsonTask
 import org.openecomp.sdc.be.dao.JanusGraphClientStrategy;
 import org.openecomp.sdc.be.dao.cassandra.ArtifactCassandraDao;
 import org.openecomp.sdc.be.dao.cassandra.CassandraClient;
+import org.openecomp.sdc.be.dao.impl.HealingPipelineDao;
 import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.janusgraph.JanusGraphClient;
 import org.openecomp.sdc.be.model.DerivedNodeTypeResolver;
@@ -209,11 +210,12 @@ public class ValidationToolConfigurationTest {
        public void testJanusGraphDao() {
                ValidationToolConfiguration testSubject;
                JanusGraphClient janusGraphClient = null;
+               HealingPipelineDao healingPipelineDao = null;
                JanusGraphDao result;
 
                // default test
                testSubject = createTestSubject();
-               result = testSubject.healingJanusGraphDao(janusGraphClient);
+               result = testSubject.healingJanusGraphDao(healingPipelineDao, janusGraphClient);
        }
 
        @Test