ComponentCache & ComponentCassandraDao removal

Also removed all classes uses these two.

Change-Id: I6793c3c935ae61c5c65f70d3541c542edf188ab4
Issue-ID: SDC-2389
Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>

13 files changed, 4 insertions, 165 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CassandraHealthCheck.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CassandraHealthCheck.java
index c77877fac4..56cad89569 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CassandraHealthCheck.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CassandraHealthCheck.java
@@ -41,7 +41,6 @@ import java.util.*;
 @Component("cassandra-health-check")
 public class CassandraHealthCheck {
 
-
     private static final Logger log = Logger.getLogger(CassandraHealthCheck.class.getName());
 
     private String localDataCenterName = null;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java
index 18d8688036..ccccd58ce7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java
@@ -66,7 +66,6 @@ import org.openecomp.sdc.be.model.Operation;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.model.cache.ComponentCache;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
 import org.openecomp.sdc.be.resources.data.ComponentMetadataData;
@@ -89,9 +88,6 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
     protected ArtifactsBusinessLogic artifactsBusinessLogic;
 
     @Autowired
-    protected ComponentCache componentCache;
-
-    @Autowired
     private GenericTypeBusinessLogic genericTypeBusinessLogic;
 
 	@Autowired
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ProductBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ProductBusinessLogic.java
index ff532b237d..81c4af8b98 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ProductBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ProductBusinessLogic.java
@@ -24,7 +24,6 @@ package org.openecomp.sdc.be.components.impl;
 
 import fj.data.Either;
 import org.openecomp.sdc.be.components.impl.exceptions.ByActionStatusComponentException;
-import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datamodel.api.CategoryTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
@@ -36,7 +35,6 @@ import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.GroupingDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.be.model.operations.api.ICacheMangerOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
 import org.openecomp.sdc.be.model.operations.utils.ComponentValidationUtils;
@@ -66,9 +64,6 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
     @Autowired
     private ComponentInstanceBusinessLogic componentInstanceBusinessLogic;
 
-    @Autowired
-    private ICacheMangerOperation cacheManagerOperation;
-
     public ProductBusinessLogic() {
         creationRoles = new ArrayList<>();
         updateRoles = new ArrayList<>();
@@ -803,14 +798,6 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
         return null;
     }
 
-    public ICacheMangerOperation getCacheManagerOperation() {
-        return cacheManagerOperation;
-    }
-
-    public void setCacheManagerOperation(ICacheMangerOperation cacheManagerOperation) {
-        this.cacheManagerOperation = cacheManagerOperation;
-    }
-
     @Override
     public Either<UiComponentDataTransfer, ResponseFormat> getUiComponentDataTransferByComponentId(String componentId,
             List<String> dataParamsToReturn) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
index 1fa9051a9a..0118a7943d 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
@@ -129,7 +129,6 @@ import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
 import org.openecomp.sdc.be.model.jsonjanusgraph.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.StorageException;
-import org.openecomp.sdc.be.model.operations.api.ICacheMangerOperation;
 import org.openecomp.sdc.be.model.operations.api.ICapabilityTypeOperation;
 import org.openecomp.sdc.be.model.operations.api.IElementOperation;
 import org.openecomp.sdc.be.model.operations.api.IInterfaceLifecycleOperation;
@@ -202,9 +201,6 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
     private CompositionBusinessLogic compositionBusinessLogic;
 
     @Autowired
-    private ICacheMangerOperation cacheManagerOperation;
-
-    @Autowired
     private ResourceDataMergeBusinessLogic resourceDataMergeBusinessLogic;
 
     @Autowired
@@ -1862,10 +1858,6 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             componentsUtils.auditResource(responseFormat, csarInfo.getModifier(), resource, AuditingActionEnum.IMPORT_RESOURCE);
             throw e;
         }
-        // add the created node types to the cache although they are not in the
-        // graph.
-        csarInfo.getCreatedNodes().values().stream()
-                .forEach(p -> cacheManagerOperation.storeComponentInCache(p, NodeTypeEnum.Resource));
     }
 
     private Either<Resource, ResponseFormat> handleVfCsarArtifacts(Resource resource, CsarInfo csarInfo,
@@ -5221,14 +5213,6 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         }
     }
 
-    public ICacheMangerOperation getCacheManagerOperation() {
-        return cacheManagerOperation;
-    }
-
-    public void setCacheManagerOperation(ICacheMangerOperation cacheManagerOperation) {
-        this.cacheManagerOperation = cacheManagerOperation;
-    }
-
     @Override
 	public Either<UiComponentDataTransfer, ResponseFormat> getUiComponentDataTransferByComponentId(String resourceId,
 																								   List<String> dataParamsToReturn) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java
index df56ccc1e4..7f4ec46714 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java
@@ -120,7 +120,6 @@ import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ForwardingPathOperation;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.NodeFilterOperation;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
-import org.openecomp.sdc.be.model.operations.api.ICacheMangerOperation;
 import org.openecomp.sdc.be.model.operations.api.IElementOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
@@ -159,14 +158,15 @@ import javax.servlet.http.HttpServletRequest;
 @org.springframework.stereotype.Component("serviceBusinessLogic")
 public class ServiceBusinessLogic extends ComponentBusinessLogic {
 
-    private static final String CHANGE_SERVICE_DISTRIBUTION = "Change Service Distribution";
+  private static final String CHANGE_SERVICE_DISTRIBUTION = "Change Service Distribution";
 	private static final String THE_SERVICE_WITH_SYSTEM_NAME_LOCKED = "The service with system name {} locked. ";
 	private static final String FAILED_TO_LOCK_SERVICE_RESPONSE_IS = "Failed to lock service {}. Response is {}. ";
 	private static final String AUDIT_BEFORE_SENDING_RESPONSE = "audit before sending response";
 	private static final Logger log = Logger.getLogger(ServiceBusinessLogic.class);
-    private static final String INITIAL_VERSION = "0.1";
-    private static final String STATUS_SUCCESS_200 = "200";
+  private static final String INITIAL_VERSION = "0.1";
+  private static final String STATUS_SUCCESS_200 = "200";
 	private static final String STATUS_DEPLOYED = "DEPLOYED";
+
     @Autowired
     private IDistributionEngine distributionEngine;
     @Autowired
@@ -174,8 +174,6 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     @Autowired
     private ComponentInstanceBusinessLogic componentInstanceBusinessLogic;
     @Autowired
-    private ICacheMangerOperation cacheManagerOperation;
-    @Autowired
     private ServiceDistributionValidation serviceDistributionValidation;
 
     @Autowired
@@ -2440,14 +2438,6 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         return Either.left(componentInstances);
     }
 
-    public ICacheMangerOperation getCacheManagerOperation() {
-        return cacheManagerOperation;
-    }
-
-    public void setCacheManagerOperation(ICacheMangerOperation cacheManagerOperation) {
-        this.cacheManagerOperation = cacheManagerOperation;
-    }
-
     public void setForwardingPathOperation(ForwardingPathOperation forwardingPathOperation) {
         this.forwardingPathOperation = forwardingPathOperation;
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java
index befca2480a..c7376d352b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java
@@ -41,7 +41,6 @@ import org.openecomp.sdc.be.model.jsonjanusgraph.operations.NodeTemplateOperatio
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaElementLifecycleOperation;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.jsonjanusgraph.utils.ModelConverter;
-import org.openecomp.sdc.be.model.operations.api.ICacheMangerOperation;
 import org.openecomp.sdc.be.model.operations.api.IGraphLockOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.CapabilityOperation;
@@ -102,9 +101,6 @@ public class LifecycleBusinessLogic {
     private ToscaExportHandler toscaExportUtils;
 
     @Autowired
-    ICacheMangerOperation cacheManagerOperation;
-
-    @Autowired
     ToscaOperationFacade toscaOperationFacade;
     
     @Autowired
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/BaseServiceBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/BaseServiceBusinessLogicTest.java
index 49455c2b66..e569499f82 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/BaseServiceBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/BaseServiceBusinessLogicTest.java
@@ -46,7 +46,6 @@ import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ForwardingPathOperat
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.IElementOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.openecomp.sdc.be.model.operations.impl.CacheMangerOperation;
 import org.openecomp.sdc.be.model.operations.impl.GraphLockOperation;
 import org.openecomp.sdc.be.resources.data.auditing.ResourceAdminEvent;
 import org.openecomp.sdc.be.user.Role;
@@ -83,7 +82,6 @@ public abstract class BaseServiceBusinessLogicTest {
     GraphLockOperation graphLockOperation = Mockito.mock(GraphLockOperation.class);
     JanusGraphDao mockJanusGraphDao = Mockito.mock(JanusGraphDao.class);
     ToscaOperationFacade toscaOperationFacade = Mockito.mock(ToscaOperationFacade.class);
-    CacheMangerOperation cacheManager = Mockito.mock(CacheMangerOperation.class);
     GenericTypeBusinessLogic genericTypeBusinessLogic = Mockito.mock(GenericTypeBusinessLogic.class);
     ForwardingPathOperation forwardingPathOperation  = Mockito.mock(ForwardingPathOperation.class);
 
@@ -162,7 +160,6 @@ public abstract class BaseServiceBusinessLogicTest {
         bl.setGenericTypeBusinessLogic(genericTypeBusinessLogic);
         bl.setComponentsUtils(componentsUtils);
         bl.setCassandraAuditingDao(auditingDao);
-        bl.setCacheManagerOperation(cacheManager);
         bl.setForwardingPathOperation(forwardingPathOperation);
         bl.setToscaOperationFacade(toscaOperationFacade);
         mockAuditingDaoLogic();
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogicTest.java
index 5844047784..06f74c10e8 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogicTest.java
@@ -70,7 +70,6 @@ import org.openecomp.sdc.be.model.operations.api.ICapabilityTypeOperation;
 import org.openecomp.sdc.be.model.operations.api.IElementOperation;
 import org.openecomp.sdc.be.model.operations.api.IInterfaceLifecycleOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.openecomp.sdc.be.model.operations.impl.CacheMangerOperation;
 import org.openecomp.sdc.be.model.operations.impl.CsarOperation;
 import org.openecomp.sdc.be.model.operations.impl.GraphLockOperation;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
@@ -175,7 +174,6 @@ public class ResourceBusinessLogicTest {
     CsarBusinessLogic csarBusinessLogic = new CsarBusinessLogic();
     Map<String, DataTypeDefinition> emptyDataTypes = new HashMap<>();
     private GenericTypeBusinessLogic genericTypeBusinessLogic = Mockito.mock(GenericTypeBusinessLogic.class);
-    CacheMangerOperation cacheManager = Mockito.mock(CacheMangerOperation.class);
     List<Resource> reslist;
 
     public ResourceBusinessLogicTest() {
@@ -257,7 +255,6 @@ public class ResourceBusinessLogicTest {
         bl.setPropertyOperation(propertyOperation);
         bl.setJanusGraphGenericDao(mockJanusGraphDao);
         bl.setApplicationDataTypeCache(applicationDataTypeCache);
-        bl.setCacheManagerOperation(cacheManager);
         bl.setGenericTypeBusinessLogic(genericTypeBusinessLogic);
         toscaOperationFacade.setNodeTypeOperation(nodeTypeOperation);
         toscaOperationFacade.setTopologyTemplateOperation(topologyTemplateOperation);
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogicTest.java
index c8e3fd9a22..05ca32cbbc 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogicTest.java
@@ -47,7 +47,6 @@ import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.IElementOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.openecomp.sdc.be.model.operations.impl.CacheMangerOperation;
 import org.openecomp.sdc.be.model.operations.impl.GraphLockOperation;
 import org.openecomp.sdc.be.resources.data.auditing.DistributionDeployEvent;
 import org.openecomp.sdc.be.resources.data.auditing.DistributionNotificationEvent;
@@ -93,7 +92,6 @@ public class ServiceBusinessLogicTest {
     private GraphLockOperation graphLockOperation = Mockito.mock(GraphLockOperation.class);
     private JanusGraphDao mockJanusGraphDao = Mockito.mock(JanusGraphDao.class);
     private ToscaOperationFacade toscaOperationFacade = Mockito.mock(ToscaOperationFacade.class);
-    private CacheMangerOperation cacheManager = Mockito.mock(CacheMangerOperation.class);
     private GenericTypeBusinessLogic genericTypeBusinessLogic = Mockito.mock(GenericTypeBusinessLogic.class);
     private UserValidations userValidations = Mockito.mock(UserValidations.class);
     private ResourceAdminEvent auditArchive1 = Mockito.mock(ResourceAdminEvent.class);
@@ -171,7 +169,6 @@ public class ServiceBusinessLogicTest {
         bl.setGenericTypeBusinessLogic(genericTypeBusinessLogic);
         bl.setComponentsUtils(componentsUtils);
         bl.setCassandraAuditingDao(auditingDao);
-        bl.setCacheManagerOperation(cacheManager);
         bl.setUserValidations(userValidations);
 
         mockAuditingDaoLogic();
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
deleted file mode 100644
index cbe341230d..0000000000
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/beans/ComponentCassandraDaoMock.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-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;
-import org.openecomp.sdc.be.resources.data.ComponentCacheData;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-@Component("component-cassandra-dao")
-public class ComponentCassandraDaoMock  extends ComponentCassandraDao {
-
-        public static Integer DEFAULT_FETCH_SIZE = 500;
-        private ComponentCacheAccessor componentCacheAccessor;
-
-        public ComponentCassandraDaoMock(CassandraClient cassandraClient) {
-            super(cassandraClient);
-        }
-
-        @PostConstruct
-        public void init() {
-
-        }
-
-        public Either<List<ComponentCacheData>, ActionStatus> getComponents(List<String> ids) {
-
-            return null;
-        }
-
-        public Either<List<ComponentCacheData>, ActionStatus> getAllComponentIdTimeAndType() {
-            return null;
-        }
-
-
-        public Either<ComponentCacheData, ActionStatus> getComponent(String id) {
-
-            return null;
-        }
-
-        public CassandraOperationStatus saveComponent(ComponentCacheData componentCacheData) {
-            return null;
-           }
-
-
-        public Either<Boolean, CassandraOperationStatus> isTableEmpty(String tableName) {
-            return null;
-        }
-
-
-        public Either<ImmutablePair<List<ComponentCacheData>, Set<String>>, ActionStatus> getComponents(
-                Map<String, Long> idToTimestampMap) {
-
-            return null;
-        }
-
-        public CassandraOperationStatus deleteComponent(String id) {
-            return null;
-        }
-
-    }
-
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java
index 96eeaaf464..8036213f1e 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java
@@ -54,7 +54,6 @@ import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.*;
 import org.openecomp.sdc.be.model.jsonjanusgraph.utils.IdMapper;
-import org.openecomp.sdc.be.model.operations.api.ICacheMangerOperation;
 import org.openecomp.sdc.be.model.operations.api.IGraphLockOperation;
 import org.openecomp.sdc.be.model.operations.impl.OperationUtils;
 import org.openecomp.sdc.be.servlets.exception.ComponentExceptionMapper;
@@ -111,7 +110,6 @@ public class ExternalRefServletTest extends JerseyTest {
     private static final AccessValidations accessValidationsMock = Mockito.mock(AccessValidations.class);
     private static final ComponentLocker componentLocker = Mockito.mock(ComponentLocker.class);
     private static final HealingJanusGraphGenericDao janusGraphGenericDao = Mockito.mock(HealingJanusGraphGenericDao.class);
-    private static final ICacheMangerOperation cacheManagerOperation = Mockito.mock(ICacheMangerOperation.class);
     private static final IGraphLockOperation graphLockOperation = Mockito.mock(IGraphLockOperation.class);
 
     private static final String COMPONENT_ID = "ci-MyComponentName";
@@ -226,11 +224,6 @@ public class ExternalRefServletTest extends JerseyTest {
         }
 
         @Bean
-        ICacheMangerOperation cacheMangerOperation() {
-            return cacheManagerOperation;
-        }
-
-        @Bean
         HealingJanusGraphDao janusGraphDao() {
             this.janusGraphDao = new HealingJanusGraphDao(healingPipelineDao(),janusGraphClient());
             return janusGraphDao;
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ArchiveEndpointTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ArchiveEndpointTest.java
index fc7ee951b8..50cd2570b9 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ArchiveEndpointTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ArchiveEndpointTest.java
@@ -82,7 +82,6 @@ import org.openecomp.sdc.be.model.jsonjanusgraph.operations.NodeTemplateOperatio
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.NodeTypeOperation;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.TopologyTemplateOperation;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
-import org.openecomp.sdc.be.model.operations.api.ICacheMangerOperation;
 import org.openecomp.sdc.be.model.operations.api.IGraphLockOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.servlets.exception.ComponentExceptionMapper;
@@ -124,7 +123,6 @@ public class ArchiveEndpointTest extends JerseyTest {
     private static final HealingJanusGraphGenericDao
         janusGraphGenericDao = mock(HealingJanusGraphGenericDao.class);
     private static final HealingPipelineDao HEALING_PIPELINE_DAO = mock(HealingPipelineDao.class);
-    private static final ICacheMangerOperation cacheManagerOperation = mock(ICacheMangerOperation.class);
     private static GraphVertex serviceVertex;
     private static GraphVertex resourceVertex;
     private static GraphVertex resourceVertexVspArchived;
@@ -206,11 +204,6 @@ public class ArchiveEndpointTest extends JerseyTest {
         }
 
         @Bean
-        ICacheMangerOperation cacheMangerOperation() {
-            return cacheManagerOperation;
-        }
-
-        @Bean
         HealingJanusGraphDao janusGraphDao() {
             janusGraphDao = new HealingJanusGraphDao(healingPipelineDao(), janusGraphClient());
             return janusGraphDao;
diff --git a/catalog-be/src/test/resources/paths/path-context.xml b/catalog-be/src/test/resources/paths/path-context.xml
index 8f6dea21a7..b0312f8b92 100644
--- a/catalog-be/src/test/resources/paths/path-context.xml
+++ b/catalog-be/src/test/resources/paths/path-context.xml
@@ -81,7 +81,6 @@ Modifications copyright (c) 2018 Nokia
   <bean id="asset-metadata-utils" class="org.openecomp.sdc.be.ecomp.converters.AssetMetadataConverter" />
   <bean id="janusgraph-client" class="org.openecomp.sdc.be.components.path.beans.InMemoryJanusGraphClient" />
   <bean class="org.openecomp.sdc.be.dao.config.DAOSpringConfig"/>
-  <bean id="component-cassandra-dao" class="org.openecomp.sdc.be.components.path.beans.ComponentCassandraDaoMock" />
   <bean id="cassandra-client" class="org.openecomp.sdc.be.components.path.beans.CassandraClientMock" />
   <bean id="audit-cassandra-dao" class="org.openecomp.sdc.be.components.path.beans.AuditCassandraDaoMock" />
   <bean id="artifact-cassandra-dao" class="org.openecomp.sdc.be.components.path.beans.ArtifactCassandraDaoMock" />