Remove field injection in catalog-dao

Change-Id: I24c3a898fa34491e80074944614722fbb3085515
Issue-ID: SDC-2398
Signed-off-by: Wojciech Sliwka <wojciech.sliwka@nokia.com>

5 files changed, 25 insertions, 2 deletions

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/ArtifactCassandraDaoMock.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/ArtifactCassandraDaoMock.java
index 290ba07883..1e913ed798 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/ArtifactCassandraDaoMock.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/ArtifactCassandraDaoMock.java
@@ -1,12 +1,18 @@
 package org.openecomp.sdc.be.components.path.beans;
 
 import org.openecomp.sdc.be.dao.cassandra.ArtifactCassandraDao;
+import org.openecomp.sdc.be.dao.cassandra.CassandraClient;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 
 @Component("artifact-cassandra-dao")
 public class ArtifactCassandraDaoMock extends ArtifactCassandraDao {
+
+    public ArtifactCassandraDaoMock(CassandraClient cassandraClient) {
+        super(cassandraClient);
+    }
+
     @PostConstruct
     @Override
     public void init() {
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/AuditCassandraDaoMock.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/AuditCassandraDaoMock.java
index c4885e1f07..ce50d586b5 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/AuditCassandraDaoMock.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/AuditCassandraDaoMock.java
@@ -1,6 +1,7 @@
 package org.openecomp.sdc.be.components.path.beans;
 
 import org.openecomp.sdc.be.dao.cassandra.AuditCassandraDao;
+import org.openecomp.sdc.be.dao.cassandra.CassandraClient;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -8,6 +9,10 @@ import javax.annotation.PostConstruct;
 @Component("audit-cassandra-dao")
 public class AuditCassandraDaoMock extends AuditCassandraDao{
 
+    public AuditCassandraDaoMock(CassandraClient cassandraClient) {
+        super(cassandraClient);
+    }
+
     @PostConstruct
     public void init() {
 
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/ComponentCassandraDaoMock.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/ComponentCassandraDaoMock.java
index 6a9731e86d..65d4219aa7 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/ComponentCassandraDaoMock.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/ComponentCassandraDaoMock.java
@@ -3,6 +3,7 @@ package org.openecomp.sdc.be.components.path.beans;
 import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.cassandra.CassandraClient;
 import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus;
 import org.openecomp.sdc.be.dao.cassandra.ComponentCacheAccessor;
 import org.openecomp.sdc.be.dao.cassandra.ComponentCassandraDao;
@@ -20,8 +21,8 @@ public class ComponentCassandraDaoMock  extends ComponentCassandraDao {
         public static Integer DEFAULT_FETCH_SIZE = 500;
         private ComponentCacheAccessor componentCacheAccessor;
 
-        public ComponentCassandraDaoMock() {
-            super();
+        public ComponentCassandraDaoMock(CassandraClient cassandraClient) {
+            super(cassandraClient);
         }
 
         @PostConstruct
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/EnvironmentCassandraDaoMock.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/EnvironmentCassandraDaoMock.java
index 2d7b1ad287..3ddda8a987 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/EnvironmentCassandraDaoMock.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/EnvironmentCassandraDaoMock.java
@@ -1,5 +1,6 @@
 package org.openecomp.sdc.be.components.path.beans;
 
+import org.openecomp.sdc.be.dao.cassandra.CassandraClient;
 import org.openecomp.sdc.be.dao.cassandra.OperationalEnvironmentDao;
 import org.springframework.stereotype.Component;
 
@@ -7,6 +8,11 @@ import javax.annotation.PostConstruct;
 
 @Component("operational-environment-dao")
 public class EnvironmentCassandraDaoMock extends OperationalEnvironmentDao {
+
+    public EnvironmentCassandraDaoMock(CassandraClient cassandraClient) {
+        super(cassandraClient);
+    }
+
     @PostConstruct
     @Override
     public void init() {
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/SdcSchemaFilesCassandraDaoMock.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/SdcSchemaFilesCassandraDaoMock.java
index 4e0105f067..a4d634ae56 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/SdcSchemaFilesCassandraDaoMock.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/SdcSchemaFilesCassandraDaoMock.java
@@ -1,5 +1,6 @@
 package org.openecomp.sdc.be.components.path.beans;
 
+import org.openecomp.sdc.be.dao.cassandra.CassandraClient;
 import org.openecomp.sdc.be.dao.cassandra.SdcSchemaFilesCassandraDao;
 import org.springframework.stereotype.Component;
 
@@ -8,6 +9,10 @@ import javax.annotation.PostConstruct;
 @Component("sdc-schema-files-cassandra-dao")
 public class SdcSchemaFilesCassandraDaoMock extends SdcSchemaFilesCassandraDao {
 
+    public SdcSchemaFilesCassandraDaoMock(CassandraClient cassandraClient) {
+        super(cassandraClient);
+    }
+
     @PostConstruct
     @Override
     public void init() {