diff options
Diffstat (limited to 'catalog-model/src/main/java/org/openecomp/sdc/be/model/cache')
5 files changed, 28 insertions, 32 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationCache.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationCache.java index e9b7f7a2e5..e70ab0ec63 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationCache.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationCache.java @@ -21,14 +21,14 @@ package org.openecomp.sdc.be.model.cache; import fj.data.Either; -import org.openecomp.sdc.be.dao.titan.TitanOperationStatus; +import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus; import java.util.Map; public interface ApplicationCache<T> { - public abstract Either<Map<String, T>, TitanOperationStatus> getAll(); + public abstract Either<Map<String, T>, JanusGraphOperationStatus> getAll(); - public abstract Either<T, TitanOperationStatus> get(String uniqueId); + public abstract Either<T, JanusGraphOperationStatus> get(String uniqueId); } diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationDataTypeCache.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationDataTypeCache.java index 94992111d3..fb49762736 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationDataTypeCache.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ApplicationDataTypeCache.java @@ -28,7 +28,7 @@ import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity; import org.openecomp.sdc.be.config.Configuration.ApplicationL1CacheConfig; import org.openecomp.sdc.be.config.Configuration.ApplicationL1CacheInfo; import org.openecomp.sdc.be.config.ConfigurationManager; -import org.openecomp.sdc.be.dao.titan.TitanOperationStatus; +import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus; import org.openecomp.sdc.be.datatypes.elements.DataTypeDataDefinition; import org.openecomp.sdc.be.model.DataTypeDefinition; import org.openecomp.sdc.be.model.operations.impl.PropertyOperation; @@ -146,7 +146,7 @@ public class ApplicationDataTypeCache implements ApplicationCache<DataTypeDefini } } - private Either<Map<String, DataTypeDefinition>, TitanOperationStatus> getAllDataTypesFromGraph() { + private Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> getAllDataTypesFromGraph() { return propertyOperation .getAllDataTypes(); @@ -154,7 +154,7 @@ public class ApplicationDataTypeCache implements ApplicationCache<DataTypeDefini } @Override - public Either<Map<String, DataTypeDefinition>, TitanOperationStatus> getAll() { + public Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> getAll() { try { @@ -171,7 +171,7 @@ public class ApplicationDataTypeCache implements ApplicationCache<DataTypeDefini } @Override - public Either<DataTypeDefinition, TitanOperationStatus> get(String uniqueId) { + public Either<DataTypeDefinition, JanusGraphOperationStatus> get(String uniqueId) { try { r.lock(); @@ -202,12 +202,12 @@ public class ApplicationDataTypeCache implements ApplicationCache<DataTypeDefini Long start = System.currentTimeMillis(); log.trace("Start fetching all data types from db"); - Either<List<DataTypeData>, TitanOperationStatus> allDataTypeNodes = propertyOperation.getAllDataTypeNodes(); + Either<List<DataTypeData>, JanusGraphOperationStatus> allDataTypeNodes = propertyOperation.getAllDataTypeNodes(); Long end = System.currentTimeMillis(); log.trace("Finish fetching all data types from db. Took {} Milliseconds", (end - start)); if (allDataTypeNodes.isRight()) { - TitanOperationStatus status = allDataTypeNodes.right().value(); - if (status != TitanOperationStatus.OK) { + JanusGraphOperationStatus status = allDataTypeNodes.right().value(); + if (status != JanusGraphOperationStatus.OK) { log.debug("ApplicationDataTypesCache - Failed to fetch all data types nodes"); BeEcompErrorManager.getInstance().logInternalConnectionError("FetchDataTypes", "Failed to fetch data types from graph(cache)", ErrorSeverity.INFO); @@ -251,7 +251,7 @@ public class ApplicationDataTypeCache implements ApplicationCache<DataTypeDefini "Failed to run refresh data types job", ErrorSeverity.INFO); } finally { try { - propertyOperation.getTitanGenericDao().commit(); + propertyOperation.getJanusGraphGenericDao().commit(); } catch (Exception e) { log.trace("Failed to commit ApplicationDataTypeCache", e); } @@ -301,11 +301,11 @@ public class ApplicationDataTypeCache implements ApplicationCache<DataTypeDefini private void replaceAllData() { - Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypes = propertyOperation + Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> allDataTypes = propertyOperation .getAllDataTypes(); if (allDataTypes.isRight()) { - TitanOperationStatus status = allDataTypes.right().value(); + JanusGraphOperationStatus status = allDataTypes.right().value(); log.debug("Failed to fetch all data types from db. Status is {}", status); } else { diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ComponentCache.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ComponentCache.java index b17a66434a..0fea33e8e5 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ComponentCache.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/ComponentCache.java @@ -37,7 +37,7 @@ import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; import org.openecomp.sdc.be.model.*; -import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade; +import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade; import org.openecomp.sdc.be.resources.data.ComponentCacheData; import org.openecomp.sdc.common.log.wrappers.Logger; import org.openecomp.sdc.common.util.SerializationUtils; @@ -54,10 +54,6 @@ import java.util.stream.Collectors; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; -import java.util.function.Function; -import java.util.stream.Collectors; @org.springframework.stereotype.Component("component-cache") public class ComponentCache { diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/DaoInfo.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/DaoInfo.java index 4880afee81..85a7f2ec59 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/DaoInfo.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/DaoInfo.java @@ -20,7 +20,7 @@ package org.openecomp.sdc.be.model.cache; -import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade; +import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade; public class DaoInfo { private ToscaOperationFacade toscaOperationFacade; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/SyncWorker.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/SyncWorker.java index 7af806f55c..cd78063780 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/SyncWorker.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/SyncWorker.java @@ -22,7 +22,7 @@ package org.openecomp.sdc.be.model.cache.workers; import fj.data.Either; import org.openecomp.sdc.be.dao.api.ActionStatus; -import org.openecomp.sdc.be.dao.titan.TitanOperationStatus; +import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; import org.openecomp.sdc.be.model.Component; import org.openecomp.sdc.be.model.operations.impl.CacheMangerOperation; @@ -85,7 +85,7 @@ public class SyncWorker implements Runnable, IWorker { log.debug("sync worker:{} encounered an exception", workerName); log.debug("exception", e); } finally { - this.cacheMangerOperation.getTitanGenericDao().commit(); + this.cacheMangerOperation.getJanusGraphGenericDao().commit(); } } @@ -97,11 +97,11 @@ public class SyncWorker implements Runnable, IWorker { private void clearCacheRecords() { cacheIdAndTimeMap.forEach((k, v) -> { try { - Either<ComponentMetadataData, TitanOperationStatus> componentFromGraphRes = getComponentMetaData(k, + Either<ComponentMetadataData, JanusGraphOperationStatus> componentFromGraphRes = getComponentMetaData(k, NodeTypeEnum.getByName(v.getType())); if (componentFromGraphRes.isRight()) { - TitanOperationStatus error = componentFromGraphRes.right().value(); - if (TitanOperationStatus.NOT_FOUND.equals(error)) { + JanusGraphOperationStatus error = componentFromGraphRes.right().value(); + if (JanusGraphOperationStatus.NOT_FOUND.equals(error)) { long delay = System.currentTimeMillis() - v.getModificationTime().getTime(); if (delay > updateDelayInMilliseconds) { this.cacheMangerOperation.deleteComponentInCache(k, v.getModificationTime().getTime(), @@ -148,11 +148,11 @@ public class SyncWorker implements Runnable, IWorker { private void syncCacheByComponentType(NodeTypeEnum nodeTypeEnum) { if (!this.shutdown) { log.trace("syncCache records of type:{} .", nodeTypeEnum); - Either<List<ComponentMetadataData>, TitanOperationStatus> getAllResult = getAllComponentsMetaData( + Either<List<ComponentMetadataData>, JanusGraphOperationStatus> getAllResult = getAllComponentsMetaData( nodeTypeEnum); List<ComponentMetadataData> componentList = new ArrayList<>(); - if (getAllResult.isRight() && !TitanOperationStatus.NOT_FOUND.equals(getAllResult.right().value())) { - log.debug("error while trying to get all components of type:{} TitanOperationStatus:{}.", nodeTypeEnum, + if (getAllResult.isRight() && !JanusGraphOperationStatus.NOT_FOUND.equals(getAllResult.right().value())) { + log.debug("error while trying to get all components of type:{} JanusGraphOperationStatus:{}.", nodeTypeEnum, getAllResult.right().value()); return; } @@ -243,9 +243,9 @@ public class SyncWorker implements Runnable, IWorker { * @return a list of retrieved nodes matching the given type or not found in * case no nodes were found or error in case of failure */ - private Either<List<ComponentMetadataData>, TitanOperationStatus> getAllComponentsMetaData( + private Either<List<ComponentMetadataData>, JanusGraphOperationStatus> getAllComponentsMetaData( NodeTypeEnum nodeTypeEnum) { - return this.cacheMangerOperation.getTitanGenericDao().getByCriteria(nodeTypeEnum, null, + return this.cacheMangerOperation.getJanusGraphGenericDao().getByCriteria(nodeTypeEnum, null, ComponentMetadataData.class); } @@ -259,9 +259,9 @@ public class SyncWorker implements Runnable, IWorker { * @return the meta dat of the component or the error encountered during the * get */ - private Either<ComponentMetadataData, TitanOperationStatus> getComponentMetaData(String uid, - NodeTypeEnum nodeTypeEnum) { - return this.cacheMangerOperation.getTitanGenericDao().getNode(UniqueIdBuilder.getKeyByNodeType(nodeTypeEnum), + private Either<ComponentMetadataData, JanusGraphOperationStatus> getComponentMetaData(String uid, + NodeTypeEnum nodeTypeEnum) { + return this.cacheMangerOperation.getJanusGraphGenericDao().getNode(UniqueIdBuilder.getKeyByNodeType(nodeTypeEnum), uid, ComponentMetadataData.class); } } |