From 79827ecb068e1e33ce28701f5dc59b37ee309b51 Mon Sep 17 00:00:00 2001 From: Tomasz Golabek Date: Fri, 28 Jun 2019 12:17:09 +0200 Subject: Autowired annotation for catalog-be Injection of the properties moved to the constructors/setters replacing field annotations. Change-Id: I766ff67e466bec5a91db1035f29e7f919d32e0ea Issue-ID: SDC-2400 Signed-off-by: Tomasz Golabek --- .../java/org/openecomp/sdc/be/dao/config/JanusGraphSpringConfig.java | 4 ++-- .../openecomp/sdc/be/dao/janusgraph/HealingJanusGraphGenericDao.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'catalog-dao/src') diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/config/JanusGraphSpringConfig.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/config/JanusGraphSpringConfig.java index d609bb1749..5601a79af1 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/config/JanusGraphSpringConfig.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/config/JanusGraphSpringConfig.java @@ -43,8 +43,8 @@ public class JanusGraphSpringConfig { @Bean(name = "janusgraph-generic-dao") @Primary - public HealingJanusGraphGenericDao janusGraphGenericDao(@Qualifier("janusgraph-client") JanusGraphClient janusGraphClient, @Qualifier("healingPipelineDao") HealingPipelineDao healingPipelineDao) { - return new HealingJanusGraphGenericDao(healingPipelineDao, janusGraphClient); + public HealingJanusGraphGenericDao janusGraphGenericDao(@Qualifier("janusgraph-client") JanusGraphClient janusGraphClient) { + return new HealingJanusGraphGenericDao(janusGraphClient); } @Bean(name = "janusgraph-client", initMethod = "createGraph") diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/janusgraph/HealingJanusGraphGenericDao.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/janusgraph/HealingJanusGraphGenericDao.java index 1b643ffa75..bcd36e82f1 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/janusgraph/HealingJanusGraphGenericDao.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/janusgraph/HealingJanusGraphGenericDao.java @@ -39,9 +39,8 @@ public class HealingJanusGraphGenericDao extends JanusGraphGenericDao { private HealingPipelineDao healingPipelineDao; @Autowired - public HealingJanusGraphGenericDao(HealingPipelineDao healingPipelineDao, JanusGraphClient janusGraphClient) { + public HealingJanusGraphGenericDao(JanusGraphClient janusGraphClient) { super(janusGraphClient); - this.healingPipelineDao = healingPipelineDao; } @Override @@ -120,7 +119,7 @@ public class HealingJanusGraphGenericDao extends JanusGraphGenericDao { return super.updateVertex(node, vertex); } - + @Autowired public void setHealingPipelineDao(HealingPipelineDao healingPipelineDao) { this.healingPipelineDao = healingPipelineDao; } -- cgit 1.2.3-korg