From 4567889be798f0ac1798c7e489d6cf4f9951d2a6 Mon Sep 17 00:00:00 2001 From: vasraz Date: Fri, 16 Jun 2023 20:09:40 +0100 Subject: Support additional metadata in external assets api Signed-off-by: Vasyl Razinkov Change-Id: Ibae9ae54f0c5e4751a9ada8ee93f169da3a017ee Issue-ID: SDC-4520 --- .../ecomp/converters/AssetMetadataConverter.java | 165 ++++++++++++--------- .../be/externalapi/servlet/AssetsDataServlet.java | 39 ++--- .../externalapi/servlet/CrudExternalServlet.java | 2 +- .../ServiceAssetDetailedMetadata.java | 3 +- .../representation/ServiceAssetMetadata.java | 3 + 5 files changed, 121 insertions(+), 91 deletions(-) (limited to 'catalog-be/src/main') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/AssetMetadataConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/AssetMetadataConverter.java index 0d43082dc4..bd8b2cb2d9 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/AssetMetadataConverter.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/AssetMetadataConverter.java @@ -19,17 +19,22 @@ */ package org.openecomp.sdc.be.ecomp.converters; -import fj.data.Either; +import java.lang.reflect.Method; import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Optional; +import java.util.stream.Stream; + +import fj.data.Either; import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; -import org.openecomp.sdc.be.distribution.servlet.DistributionCatalogServlet; import org.openecomp.sdc.be.externalapi.servlet.representation.ArtifactMetadata; import org.openecomp.sdc.be.externalapi.servlet.representation.AssetMetadata; import org.openecomp.sdc.be.externalapi.servlet.representation.ResourceAssetDetailedMetadata; @@ -46,6 +51,7 @@ import org.openecomp.sdc.be.model.Service; 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.StorageOperationStatus; +import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode; import org.openecomp.sdc.common.log.wrappers.Logger; import org.openecomp.sdc.exception.ResponseFormat; import org.springframework.beans.factory.annotation.Autowired; @@ -53,7 +59,7 @@ import org.springframework.beans.factory.annotation.Autowired; @org.springframework.stereotype.Component("asset-metadata-utils") public class AssetMetadataConverter { - private static final Logger log = Logger.getLogger(DistributionCatalogServlet.class); + private static final Logger log = Logger.getLogger(AssetMetadataConverter.class); @Autowired protected ToscaOperationFacade toscaOperationFacade; @Autowired @@ -63,13 +69,13 @@ public class AssetMetadataConverter { * Relative asset’s URL. Should be used in REST GET API to download the asset’s CSAR. https://{serverBaseURL}/{csarPath} can be obtained from (HttpServletRequest)request.getServerName() */ public Either, ResponseFormat> convertToAssetMetadata(List componentList, String serverBaseURL, - boolean detailed) { - if (componentList == null || componentList.isEmpty()) { + boolean detailed, final List additionalMetadataKeysToInclude) { + if (CollectionUtils.isEmpty(componentList)) { return Either.left(new LinkedList<>()); } List retResList = new LinkedList<>(); for (Component curr : componentList) { - Either resMetaData = convertToSingleAssetMetadata(curr, serverBaseURL, detailed); + Either resMetaData = convertToSingleAssetMetadata(curr, serverBaseURL, detailed, additionalMetadataKeysToInclude); if (resMetaData.isRight()) { return Either.right(resMetaData.right().value()); } @@ -79,9 +85,10 @@ public class AssetMetadataConverter { } public Either convertToSingleAssetMetadata(T component, String serverBaseURL, - boolean detailed) { + boolean detailed, + final List additionalMetadataKeysToInclude) { ComponentTypeEnum componentType = component.getComponentType(); - Either resMetaData = convertToMetadata(componentType, serverBaseURL, detailed, component); + Either resMetaData = convertToMetadata(componentType, serverBaseURL, detailed, component, additionalMetadataKeysToInclude); if (resMetaData.isRight()) { return Either.right(resMetaData.right().value()); } else { @@ -90,49 +97,46 @@ public class AssetMetadataConverter { } private Either convertToMetadata(ComponentTypeEnum componentType, String serverBaseURL, boolean detailed, - Component curr) { + Component curr, + final List additionalMetadataKeysToInclude) { switch (componentType) { case RESOURCE: - return generateResourceMeatdata(serverBaseURL, detailed, curr); + return generateResourceMetadata(serverBaseURL, detailed, curr); case SERVICE: - return generateServiceMetadata(serverBaseURL, detailed, curr); + return generateServiceMetadata(serverBaseURL, detailed, curr, additionalMetadataKeysToInclude); default: - ResponseFormat responseFormat = componentsUtils.getResponseFormatAdditionalProperty(ActionStatus.COMPONENT_INVALID_CATEGORY); - return Either.right(responseFormat); + return Either.right(componentsUtils.getResponseFormatAdditionalProperty(ActionStatus.COMPONENT_INVALID_CATEGORY)); } } - private Either generateResourceMeatdata(String serverBaseURL, boolean detailed, Component curr) { - AssetMetadata metaData; - metaData = createMetadaObject(detailed, curr.getComponentType()); - metaData = convertToResourceMetadata((ResourceAssetMetadata) metaData, (Resource) curr, serverBaseURL, detailed); + private Either generateResourceMetadata(String serverBaseURL, boolean detailed, Component curr) { + AssetMetadata metaData = createMetadaObject(detailed, curr.getComponentType(), false); + convertToResourceMetadata((ResourceAssetMetadata) metaData, (Resource) curr, serverBaseURL, detailed); if (detailed) { - Either converted = convertToResourceDetailedMetadata( - (ResourceAssetDetailedMetadata) metaData, (Resource) curr, serverBaseURL); + Either converted = convertToResourceDetailedMetadata((ResourceAssetDetailedMetadata) metaData, (Resource) curr); if (converted.isRight()) { ActionStatus storageResponse = componentsUtils.convertFromStorageResponse(converted.right().value(), ComponentTypeEnum.RESOURCE); - ResponseFormat responseFormat = componentsUtils.getResponseFormat(storageResponse); - return Either.right(responseFormat); + return Either.right(componentsUtils.getResponseFormat(storageResponse)); } } return Either.left(metaData); } - private AssetMetadata createMetadaObject(boolean detailed, ComponentTypeEnum type) { + private AssetMetadata createMetadaObject(boolean detailed, ComponentTypeEnum type, boolean additionalMetadataKeysToInclude) { AssetMetadata metaData = null; switch (type) { case SERVICE: - if (!detailed) { - metaData = new ServiceAssetMetadata(); - } else { + if (detailed && !additionalMetadataKeysToInclude) { metaData = new ServiceAssetDetailedMetadata(); + } else { + metaData = new ServiceAssetMetadata(); } break; case RESOURCE: - if (!detailed) { - metaData = new ResourceAssetMetadata(); - } else { + if (detailed) { metaData = new ResourceAssetDetailedMetadata(); + } else { + metaData = new ResourceAssetMetadata(); } break; default: @@ -141,39 +145,37 @@ public class AssetMetadataConverter { return metaData; } - private Either generateServiceMetadata(String serverBaseURL, boolean detailed, Component curr) { - AssetMetadata metaData = createMetadaObject(detailed, curr.getComponentType()); - metaData = convertToServiceAssetMetadata((ServiceAssetMetadata) metaData, (Service) curr, serverBaseURL, detailed); + private Either generateServiceMetadata(String serverBaseURL, boolean detailed, Component curr, final List additionalMetadataKeysToInclude) { + AssetMetadata metaData = createMetadaObject(detailed, curr.getComponentType(), CollectionUtils.isNotEmpty(additionalMetadataKeysToInclude)); + convertToServiceAssetMetadata((ServiceAssetMetadata) metaData, (Service) curr, serverBaseURL, detailed, additionalMetadataKeysToInclude); if (detailed) { Either converted = convertToServiceDetailedMetadata( - (ServiceAssetDetailedMetadata) metaData, (Service) curr); + (ServiceAssetDetailedMetadata) metaData, (Service) curr); if (converted.isRight()) { ActionStatus storageResponse = componentsUtils.convertFromStorageResponse(converted.right().value(), ComponentTypeEnum.RESOURCE); - ResponseFormat responseFormat = componentsUtils.getResponseFormat(storageResponse); - return Either.right(responseFormat); + return Either.right(componentsUtils.getResponseFormat(storageResponse)); } } return Either.left(metaData); } - private U convertToAsset(U asset, T component, String serverBaseURL, boolean detailed) { + private void convertToAsset(U asset, T component, String serverBaseURL, boolean detailed) { asset.setUuid(component.getUUID()); asset.setInvariantUUID(component.getInvariantUUID()); asset.setName(component.getName()); asset.setVersion(component.getVersion()); - if (!detailed) { - asset.setToscaModelURL(serverBaseURL + "/" + component.getUUID() + "/toscaModel"); - } else { - String toscaModelUrl = (new String(serverBaseURL)).replace("metadata", "toscaModel"); + if (detailed) { + String toscaModelUrl = serverBaseURL.replace("metadata", "toscaModel"); asset.setToscaModelURL(toscaModelUrl); + } else { + asset.setToscaModelURL(serverBaseURL + "/" + component.getUUID() + "/toscaModel"); } - return asset; } - private T convertToResourceMetadata(T assetToPopulate, Resource resource, String serverBaseURL, - boolean detailed) { - assetToPopulate = convertToAsset(assetToPopulate, resource, serverBaseURL, detailed); - if (resource.getCategories() != null && !resource.getCategories().isEmpty()) { + private void convertToResourceMetadata(T assetToPopulate, Resource resource, String serverBaseURL, + boolean detailed) { + convertToAsset(assetToPopulate, resource, serverBaseURL, detailed); + if (CollectionUtils.isNotEmpty(resource.getCategories())) { CategoryDefinition categoryDefinition = resource.getCategories().get(0); assetToPopulate.setCategory(categoryDefinition.getName()); assetToPopulate.setSubCategory(categoryDefinition.getSubcategories().get(0).getName()); @@ -181,36 +183,62 @@ public class AssetMetadataConverter { assetToPopulate.setResourceType(resource.getResourceType().name()); assetToPopulate.setLifecycleState(resource.getLifecycleState().name()); assetToPopulate.setLastUpdaterUserId(resource.getLastUpdaterUserId()); - return (T) assetToPopulate; } - private T convertToServiceAssetMetadata(T assetToPopulate, Service service, String serverBaseURL, - boolean detailed) { - assetToPopulate = convertToAsset(assetToPopulate, service, serverBaseURL, detailed); - if (service.getCategories() != null && !service.getCategories().isEmpty()) { + private void convertToServiceAssetMetadata(T assetToPopulate, Service service, String serverBaseURL, + boolean detailed, + final List additionalMetadataKeysToInclude) { + convertToAsset(assetToPopulate, service, serverBaseURL, detailed); + if (CollectionUtils.isNotEmpty(service.getCategories())) { CategoryDefinition categoryDefinition = service.getCategories().get(0); assetToPopulate.setCategory(categoryDefinition.getName()); } assetToPopulate.setLifecycleState(service.getLifecycleState().name()); assetToPopulate.setLastUpdaterUserId(service.getLastUpdaterUserId()); assetToPopulate.setDistributionStatus(service.getDistributionStatus().name()); - return (T) assetToPopulate; + if (CollectionUtils.isNotEmpty(additionalMetadataKeysToInclude)) { + setAdditionalRequestedMetadata((ServiceAssetMetadata) assetToPopulate, service, additionalMetadataKeysToInclude); + } + } + + private void setAdditionalRequestedMetadata(ServiceAssetMetadata assetToPopulate, Service service, List additionalMetadataKeysToInclude) { + final Map additionalRequestedMetadata = new HashMap<>(); + for (final String key : additionalMetadataKeysToInclude) { + Object value = null; + try { + Optional optionalMethod = Stream.of(service.getClass().getMethods()).filter(method -> method.getName().toLowerCase().equals("get" + key.toLowerCase())).findAny(); + if (optionalMethod.isPresent()) { + value = optionalMethod.get().invoke(service); + } + } catch (final Exception e) { + log.warn(EcompLoggerErrorCode.DATA_ERROR, AssetMetadataConverter.class.getSimpleName(), "No such field '{}'", key); + } + if (value == null) { + value = service.getCategorySpecificMetadata().get(key); + } + if (value != null) { + additionalRequestedMetadata.put(key, value.toString()); + } + } + + if (MapUtils.isNotEmpty(additionalRequestedMetadata)) { + assetToPopulate.setAdditionalRequestedMetadata(additionalRequestedMetadata); + } } private Either convertToResourceDetailedMetadata(T assetToPopulate, - Resource resource, - String serverBaseURL) { + Resource resource) { List componentInstances = resource.getComponentInstances(); if (componentInstances != null) { Either, StorageOperationStatus> resourceInstanceMetadata = convertToResourceInstanceMetadata( - componentInstances, ComponentTypeEnum.RESOURCE_PARAM_NAME, resource.getUUID()); + componentInstances, ComponentTypeEnum.RESOURCE_PARAM_NAME, resource.getUUID()); if (resourceInstanceMetadata.isRight()) { return Either.right(resourceInstanceMetadata.right().value()); } assetToPopulate.setResources(resourceInstanceMetadata.left().value()); } Map deploymentArtifacts = resource.getDeploymentArtifacts(); - assetToPopulate = populateResourceWithArtifacts(assetToPopulate, resource, deploymentArtifacts); + populateResourceWithArtifacts(assetToPopulate, resource, deploymentArtifacts); assetToPopulate.setLastUpdaterFullName(resource.getLastUpdaterFullName()); assetToPopulate.setToscaResourceName(resource.getToscaResourceName()); assetToPopulate.setDescription(resource.getDescription()); @@ -222,40 +250,38 @@ public class AssetMetadataConverter { List componentInstances = service.getComponentInstances(); if (componentInstances != null) { Either, StorageOperationStatus> resourceInstanceMetadata = convertToResourceInstanceMetadata( - componentInstances, ComponentTypeEnum.SERVICE_PARAM_NAME, service.getUUID()); + componentInstances, ComponentTypeEnum.SERVICE_PARAM_NAME, service.getUUID()); if (resourceInstanceMetadata.isRight()) { return Either.right(resourceInstanceMetadata.right().value()); } assetToPopulate.setResources(resourceInstanceMetadata.left().value()); } Map deploymentArtifacts = service.getDeploymentArtifacts(); - assetToPopulate = populateServiceWithArtifacts(assetToPopulate, service, deploymentArtifacts); + populateServiceWithArtifacts(assetToPopulate, service, deploymentArtifacts); assetToPopulate.setLastUpdaterFullName(service.getLastUpdaterFullName()); return Either.left(assetToPopulate); } - private T populateResourceWithArtifacts(T asset, Resource resource, - Map artifacts) { + private void populateResourceWithArtifacts(T asset, Resource resource, + Map artifacts) { List artifactMetaList = populateAssetWithArtifacts(resource, artifacts); asset.setArtifacts(artifactMetaList); - return asset; } - private T populateServiceWithArtifacts(T asset, Service service, - Map artifacts) { + private void populateServiceWithArtifacts(T asset, Service service, + Map artifacts) { List artifactMetaList = populateAssetWithArtifacts(service, artifacts); asset.setArtifacts(artifactMetaList); - return asset; } private List populateAssetWithArtifacts(Component component, Map artifacts) { List artifactMetaList = new LinkedList<>(); - if (artifacts != null) { + if (MapUtils.isNotEmpty(artifacts)) { Collection artefactDefList = artifacts.values(); for (ArtifactDefinition artifactDefinition : artefactDefList) { - if (artifactDefinition.getEsId() != null && !artifactDefinition.getEsId().isEmpty()) { + if (StringUtils.isNotBlank(artifactDefinition.getEsId())) { ArtifactMetadata convertedArtifactMetadata = convertToArtifactMetadata(artifactDefinition, - ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUUID(), null); + ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUUID(), null); artifactMetaList.add(convertedArtifactMetadata); } } @@ -270,11 +296,10 @@ public class AssetMetadataConverter { ArtifactMetadata metadata = new ArtifactMetadata(); metadata.setArtifactName(artifact.getArtifactName()); metadata.setArtifactType(artifact.getArtifactType()); - if (resourceInstanceName == null || resourceInstanceName.isEmpty()) { + if (StringUtils.isBlank(resourceInstanceName)) { metadata.setArtifactURL(String.format(COMPONENT_ARTIFACT_URL, componentType, componentUUID, artifact.getArtifactUUID())); } else { - metadata.setArtifactURL( - String.format(RESOURCE_INSTANCE_ARTIFACT_URL, componentType, componentUUID, resourceInstanceName, artifact.getArtifactUUID())); + metadata.setArtifactURL(String.format(RESOURCE_INSTANCE_ARTIFACT_URL, componentType, componentUUID, resourceInstanceName, artifact.getArtifactUUID())); } metadata.setArtifactDescription(artifact.getDescription()); metadata.setArtifactTimeout(artifact.getTimeout() != null && artifact.getTimeout() > 0 ? artifact.getTimeout() : null); @@ -288,7 +313,7 @@ public class AssetMetadataConverter { } private Either, StorageOperationStatus> convertToResourceInstanceMetadata( - List componentInstances, String componentType, String componentUUID) { + List componentInstances, String componentType, String componentUUID) { List retList = new LinkedList<>(); Map> uuidDuplicatesMap = new HashMap<>(); for (ComponentInstance componentInstance : componentInstances) { @@ -322,7 +347,7 @@ public class AssetMetadataConverter { Collection values = componentInstance.getDeploymentArtifacts().values(); for (ArtifactDefinition artifactDefinition : values) { ArtifactMetadata converted = convertToArtifactMetadata(artifactDefinition, componentType, componentUUID, - componentInstance.getNormalizedName()); + componentInstance.getNormalizedName()); artifactMetaList.add(converted); } metadata.setArtifacts(artifactMetaList); diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java index cce2f12343..e5b2a94584 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java @@ -96,23 +96,23 @@ import org.springframework.stereotype.Controller; public class AssetsDataServlet extends AbstractValidationsServlet { private static final Logger log = Logger.getLogger(AssetsDataServlet.class); - private final ElementBusinessLogic elementBusinessLogic; + private final ElementBusinessLogic elementBL; private final AssetMetadataConverter assetMetadataConverter; - private final ServiceBusinessLogic serviceBusinessLogic; - private final ResourceBusinessLogic resourceBusinessLogic; + private final ServiceBusinessLogic serviceBL; + private final ResourceBusinessLogic resourceBL; @Context private HttpServletRequest request; @Inject public AssetsDataServlet(ComponentInstanceBusinessLogic componentInstanceBL, ComponentsUtils componentsUtils, ServletUtils servletUtils, - ResourceImportManager resourceImportManager, ElementBusinessLogic elementBusinessLogic, - AssetMetadataConverter assetMetadataConverter, ServiceBusinessLogic serviceBusinessLogic, - ResourceBusinessLogic resourceBusinessLogic) { + ResourceImportManager resourceImportManager, ElementBusinessLogic elementBL, + AssetMetadataConverter assetMetadataConverter, ServiceBusinessLogic serviceBL, + ResourceBusinessLogic resourceBL) { super(componentInstanceBL, componentsUtils, servletUtils, resourceImportManager); - this.elementBusinessLogic = elementBusinessLogic; + this.elementBL = elementBL; this.assetMetadataConverter = assetMetadataConverter; - this.serviceBusinessLogic = serviceBusinessLogic; - this.resourceBusinessLogic = resourceBusinessLogic; + this.serviceBL = serviceBL; + this.resourceBL = resourceBL; } @GET @@ -132,10 +132,13 @@ public class AssetsDataServlet extends AbstractValidationsServlet { @Parameter(description = "Determines the format of the body of the response") @HeaderParam(value = Constants.ACCEPT_HEADER) String accept, @Parameter(description = "The username and password", required = true) @HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization, @Parameter(description = "The requested asset type", schema = @Schema(allowableValues = {"resources", "services"}), required = true) @PathParam("assetType") final String assetType, + @Parameter(description = "The category to filter the result set on") @QueryParam("category") String category, @Parameter(description = "The sub category to filter the result set on. Only applicable when assetType = resources") @QueryParam("subCategory") String subCategory, @Parameter(description = "The distribution status to filter the result set on") @QueryParam("distributionStatus") String distributionStatus, @Parameter(description = "The resource type to filter the result set on. Only applicable when assetType = resources") @QueryParam("resourceType") String resourceType, + @Parameter(description = "Additional metadata keys to include in the response, not all keys are supported.\nSupported keys: lastUpdateDate, creationDate, description, uniqueId and category specific metadata keys") + @QueryParam("include") List additionalMetadataKeysToInclude, @Parameter(description = "The version(s) to filter the result set on\n" + "Syntax: /services?version=(highestMatchingVersionOnly|lessThan|greaterThan|equals)(:=)(value)", examples = { @@ -202,17 +205,16 @@ public class AssetsDataServlet extends AbstractValidationsServlet { } filters.put(FilterKeyEnum.RESOURCE_TYPE, resourceTypeEnum.name()); } - Either, ResponseFormat> assetTypeData - = elementBusinessLogic.getFilteredCatalogComponents(assetType, filters, query); - if (assetTypeData.isRight()) { + final Either, ResponseFormat> componentList = elementBL.getFilteredCatalogComponents(assetType, filters, query); + if (componentList.isRight()) { log.debug("getAssetList: Asset Fetching Failed"); - responseFormat = assetTypeData.right().value(); + responseFormat = componentList.right().value(); getComponentsUtils().auditExternalGetAssetList(responseFormat, auditingActionEnum, distributionData, requestId); return buildErrorResponse(responseFormat); } else { log.debug("getAssetList: Asset Fetching Success"); Either, ResponseFormat> resMetadata = assetMetadataConverter - .convertToAssetMetadata(assetTypeData.left().value(), requestURI, false); + .convertToAssetMetadata(componentList.left().value(), requestURI, false, additionalMetadataKeysToInclude); if (resMetadata.isRight()) { log.debug("getAssetList: Asset conversion Failed"); responseFormat = resMetadata.right().value(); @@ -276,8 +278,7 @@ public class AssetsDataServlet extends AbstractValidationsServlet { return buildErrorResponse(responseFormat); } try { - Either, ResponseFormat> assetTypeData = elementBusinessLogic - .getCatalogComponentsByUuidAndAssetType(assetType, uuid); + final Either, ResponseFormat> assetTypeData = elementBL.getCatalogComponentsByUuidAndAssetType(assetType, uuid); if (assetTypeData.isRight()) { log.debug("getAssetList: Asset Fetching Failed"); responseFormat = assetTypeData.right().value(); @@ -287,7 +288,7 @@ public class AssetsDataServlet extends AbstractValidationsServlet { resourceCommonInfo.setResourceName(assetTypeData.left().value().iterator().next().getName()); log.debug("getAssetList: Asset Fetching Success"); Either, ResponseFormat> resMetadata = assetMetadataConverter - .convertToAssetMetadata(assetTypeData.left().value(), requestURI, true); + .convertToAssetMetadata(assetTypeData.left().value(), requestURI, true, null); if (resMetadata.isRight()) { log.debug("getAssetList: Asset conversion Failed"); responseFormat = resMetadata.right().value(); @@ -307,10 +308,10 @@ public class AssetsDataServlet extends AbstractValidationsServlet { private ComponentBusinessLogic getComponentBLByType(ComponentTypeEnum componentTypeEnum) { if (componentTypeEnum.equals(RESOURCE)) { - return resourceBusinessLogic; + return resourceBL; } else { // Implementation is the same for any ComponentBusinessLogic - return serviceBusinessLogic; + return serviceBL; } } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java index b0ec4e5727..6d94ff6471 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java @@ -434,7 +434,7 @@ public class CrudExternalServlet extends AbstractValidationsServlet { ResponseFormat responseFormat; Response response; Either resMetadata = assetMetadataUtils - .convertToSingleAssetMetadata(resource, request.getRequestURL().toString(), true); + .convertToSingleAssetMetadata(resource, request.getRequestURL().toString(), true, null); if (resMetadata.isRight()) { log.debug("Asset conversion Failed"); responseFormat = resMetadata.right().value(); diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/representation/ServiceAssetDetailedMetadata.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/representation/ServiceAssetDetailedMetadata.java index 1610eceeca..ce606501b0 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/representation/ServiceAssetDetailedMetadata.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/representation/ServiceAssetDetailedMetadata.java @@ -19,10 +19,11 @@ */ package org.openecomp.sdc.be.externalapi.servlet.representation; -import java.util.List; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter public class ServiceAssetDetailedMetadata extends ServiceAssetMetadata { diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/representation/ServiceAssetMetadata.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/representation/ServiceAssetMetadata.java index ee3978c961..f97207f40d 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/representation/ServiceAssetMetadata.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/representation/ServiceAssetMetadata.java @@ -22,6 +22,8 @@ package org.openecomp.sdc.be.externalapi.servlet.representation; import lombok.Getter; import lombok.Setter; +import java.util.Map; + @Getter @Setter public class ServiceAssetMetadata extends AssetMetadata { @@ -30,4 +32,5 @@ public class ServiceAssetMetadata extends AssetMetadata { private String lifecycleState; private String lastUpdaterUserId; private String distributionStatus; + private Map additionalRequestedMetadata; } -- cgit 1.2.3-korg