diff options
Diffstat (limited to 'catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs')
4 files changed, 7 insertions, 30 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/CheckAndUpdateJob.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/CheckAndUpdateJob.java index 93249c914a..dfc39042bd 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/CheckAndUpdateJob.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/CheckAndUpdateJob.java @@ -80,7 +80,7 @@ public class CheckAndUpdateJob extends Job { } catch (Exception e) { log.debug("an exception was encountered during CheckAndUpdateJob", e); } finally { - daoInfo.getResourceOperation().getTitanGenericDao().commit(); + daoInfo.getToscaOperationFacade().commit(); } return false; } @@ -109,8 +109,7 @@ public class CheckAndUpdateJob extends Job { } else { // update cache // get component from grath - Either<Component, StorageOperationStatus> componentRes = getOperationByType(nodeTypeEnum) - .getComponent(componentId, true); + Either<Component, StorageOperationStatus> componentRes = daoInfo.getToscaOperationFacade().getToscaElement(componentId); if (componentRes.isRight()) { log.debug("failed to get full component:{} from graph status:{}", componentId, componentRes.right().value()); diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/Job.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/Job.java index 4deda8642f..c1fb2e0a7f 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/Job.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/Job.java @@ -55,28 +55,9 @@ public abstract class Job<E> { public abstract E doWork(); - protected IComponentOperation getOperationByType(NodeTypeEnum nodeTypeEnum) { - IComponentOperation operation = null; - switch (nodeTypeEnum) { - case Product: - operation = daoInfo.getProductOperation(); - break; - case Service: - operation = daoInfo.getServiceOperation(); - break; - case Resource: - operation = daoInfo.getResourceOperation(); - break; - default: - log.error("unexpected NodeType received no matching operation found."); - } - return operation; - } - protected Either<ComponentMetadataData, StorageOperationStatus> getComponentMetaData(String componentId, NodeTypeEnum nodeTypeEnum) { - Either<ComponentMetadataData, StorageOperationStatus> metaDataRes = getOperationByType(nodeTypeEnum) - .getComponentByLabelAndId(componentId, nodeTypeEnum, ComponentMetadataData.class); + Either<ComponentMetadataData, StorageOperationStatus> metaDataRes = daoInfo.getToscaOperationFacade().getComponentMetadata(componentId); if (metaDataRes.isRight()) { // in case we cant find the component on graph exit if (StorageOperationStatus.NOT_FOUND.equals(metaDataRes.right().value())) { diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/OverrideJob.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/OverrideJob.java index e9da68ea59..47edae8968 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/OverrideJob.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/OverrideJob.java @@ -47,8 +47,7 @@ public class OverrideJob extends Job { log.trace("override component in cache, componentId:{} of nodeTypeEnum:{} with timestamp:{}.", componentId, nodeTypeEnum, timestamp); // get component from grath - Either<Component, StorageOperationStatus> componentRes = getOperationByType(nodeTypeEnum) - .getComponent(componentId, false); + Either<Component, StorageOperationStatus> componentRes = daoInfo.getToscaOperationFacade().getToscaElement(componentId); if (componentRes.isRight()) { log.debug("failed to get full component:{} from graph status:{}", componentId, componentRes.right().value()); @@ -66,7 +65,7 @@ public class OverrideJob extends Job { } catch (Exception e) { log.debug("an exception was encountered during OverrideJob", e); } finally { - this.daoInfo.getResourceOperation().getTitanGenericDao().commit(); + this.daoInfo.getToscaOperationFacade().commit(); } return false; diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/StoreJob.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/StoreJob.java index 410a56a90e..c282e5dca5 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/StoreJob.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/jobs/StoreJob.java @@ -42,14 +42,12 @@ public class StoreJob extends Job { public Object doWork() { try { log.trace("starting work on job."); - log.trace("store component in cache, componentId:{} of nodeTypeEnum:{} with timestamp:{}.", componentId, - nodeTypeEnum, timestamp); + log.trace("store component in cache, componentId:{} of nodeTypeEnum:{} with timestamp:{}.", componentId, nodeTypeEnum, timestamp); if (!this.daoInfo.getComponentCache().setComponent(component, nodeTypeEnum)) { log.debug("failed to store componentId:{} nodeTypeEnum:", componentId, nodeTypeEnum); return false; } - log.debug("cache successfully updated for componentId:{} nodeTypeEnum:{} timestemp:{}.", componentId, - nodeTypeEnum, timestamp); + log.debug("cache successfully updated for componentId:{} nodeTypeEnum:{} timestemp:{}.", componentId, nodeTypeEnum, timestamp); return true; } catch (Exception e) { |