From 3338a073437dfd2f43c3b2572d7964d98a3bfb08 Mon Sep 17 00:00:00 2001 From: Wojciech Sliwka Date: Tue, 16 Jul 2019 14:02:03 +0200 Subject: Fixing build Change-Id: Ia75cdf511e44347294bb646add89b6c1f60f239c Issue-ID: SDC-2403 Signed-off-by: Wojciech Sliwka --- .../impl/validator/config/ValidationToolConfiguration.java | 10 ++++++++-- .../impl/validator/config/ValidationToolConfigurationTest.java | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java index 47dd7fda0f..764e6d93b1 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java @@ -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 diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfigurationTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfigurationTest.java index a6ae4d2492..201d307cea 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfigurationTest.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfigurationTest.java @@ -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 -- cgit 1.2.3-korg