From 335d13c0e57ae61148b7a0871c5c9e46f768cd93 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 13 Aug 2017 16:51:44 +0300 Subject: [SDC-235] rebase code Change-Id: Iea503188e521fa3846f580ced7c1c4fce303abe5 Signed-off-by: Michael Lando --- .../sdc/be/model/jsontitan/operations/ToscaOperationFacade.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'catalog-model/src/main/java/org/openecomp') diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacade.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacade.java index e3ed9d6471..3cc80eaf36 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacade.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaOperationFacade.java @@ -1782,12 +1782,11 @@ public class ToscaOperationFacade { return (currentTemplateNameChecked != null && currentTemplateNameChecked.equalsIgnoreCase(templateNameCurrent)) ? Either.left(true) : Either.left(false); } - public Either, StorageOperationStatus> fetchByResourceType(String resourceType) { - + public Either, StorageOperationStatus> fetchMetaDataByResourceType(String resourceType, ComponentParametersView filterBy) { Map props = new EnumMap<>(GraphPropertyEnum.class); props.put(GraphPropertyEnum.RESOURCE_TYPE, resourceType); props.put(GraphPropertyEnum.IS_HIGHEST_VERSION, true); - Either, TitanOperationStatus> resourcesByTypeEither = titanDao.getByCriteria(null, props); + Either, TitanOperationStatus> resourcesByTypeEither = titanDao.getByCriteria(null, props, JsonParseFlagEnum.ParseMetadata); if (resourcesByTypeEither.isRight()) { return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(resourcesByTypeEither.right().value())); @@ -1797,11 +1796,10 @@ public class ToscaOperationFacade { List components = new ArrayList<>(); for (GraphVertex vertex : vertexList) { - components.add(getToscaElementByOperation(vertex).left().value()); + components.add(getToscaElementByOperation(vertex, filterBy).left().value()); } return Either.left(components); - } public void commit() { -- cgit 1.2.3-korg