Fix 'Creation date only works with requests that return 1 service (API)'-bug
[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / externalapi / servlet / AssetsDataServlet.java
index b995606..52bc5c4 100644 (file)
@@ -7,9 +7,9 @@
  * 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.
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.externalapi.servlet;
 
+import static org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum.RESOURCE;
+
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.servers.Server;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
+import java.util.Comparator;
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.GET;
 import javax.ws.rs.HeaderParam;
@@ -39,10 +51,17 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.components.impl.ComponentBusinessLogic;
+import org.openecomp.sdc.be.components.impl.ComponentInstanceBusinessLogic;
 import org.openecomp.sdc.be.components.impl.ElementBusinessLogic;
+import org.openecomp.sdc.be.components.impl.ResourceBusinessLogic;
+import org.openecomp.sdc.be.components.impl.ResourceImportManager;
+import org.openecomp.sdc.be.components.impl.ServiceBusinessLogic;
+import org.openecomp.sdc.be.components.impl.aaf.AafPermission;
+import org.openecomp.sdc.be.components.impl.aaf.PermissionAllowed;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
@@ -50,344 +69,332 @@ import org.openecomp.sdc.be.datatypes.enums.FilterKeyEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.ecomp.converters.AssetMetadataConverter;
 import org.openecomp.sdc.be.externalapi.servlet.representation.AssetMetadata;
+import org.openecomp.sdc.be.externalapi.servlet.representation.ServiceAssetMetadata;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.impl.ServletUtils;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
 import org.openecomp.sdc.be.servlets.AbstractValidationsServlet;
 import org.openecomp.sdc.be.servlets.RepresentationUtils;
 import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import org.springframework.stereotype.Controller;
 
 /**
  * This Servlet serves external users for retrieving component metadata.
- * 
- * @author tgitelman
  *
+ * @author tgitelman
  */
-
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
-@Api(value = "Asset Metadata External Servlet", description = "This Servlet serves external users for retrieving component metadata.")
-@Singleton
+@Tag(name = "SDCE-7 APIs")
+@Server(url = "/sdc")
+@Controller
 public class AssetsDataServlet extends AbstractValidationsServlet {
 
-       @Context
-       private HttpServletRequest request;
-
-       private static Logger log = LoggerFactory.getLogger(AssetsDataServlet.class.getName());
-       
-       /**
-        * 
-        * @param requestId
-        * @param instanceIdHeader
-        * @param accept
-        * @param authorization
-        * @param assetType
-        * @param category
-        * @param subCategory
-        * @param distributionStatus
-        * @param resourceType
-        * @return
-        */
-       @GET
-       @Path("/{assetType}")
-       @Produces(MediaType.APPLICATION_JSON)
-       @ApiOperation(value = "Fetch list of assets", httpMethod = "GET", notes = "Returns list of assets")
-       @ApiResponses(value = {
-                       @ApiResponse(code = 200, message = "ECOMP component is authenticated and list of Catalog Assets Metadata is returned", response = AssetMetadata.class, responseContainer="List"),
-                       @ApiResponse(code = 400, message = "Missing  'X-ECOMP-InstanceID'  HTTP header - POL5001"),
-                       @ApiResponse(code = 401, message = "ECOMP component  should authenticate itself  and  to  re-send  again  HTTP  request  with its Basic Authentication credentials - POL5002"),
-                       @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
-                       @ApiResponse(code = 405, message = "Method  Not Allowed  :  Invalid HTTP method type used ( PUT,DELETE,POST will be rejected) - POL4050"),
-                       @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem. ECOMP Component should continue the attempts to get the needed information - POL5000")})
-       public Response getAssetListExternal(
-                       @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
-                       @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
-                       @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
-                       @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
-                       @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType, 
-                       @ApiParam(value = "The filter key (resourceType only for resources)", required = false)@QueryParam("category") String category, 
-                       @ApiParam(value = "The filter key (resourceType only for resources)", required = false)@QueryParam("subCategory") String subCategory, 
-                       @ApiParam(value = "The filter key (resourceType only for resources)", required = false)@QueryParam("distributionStatus") String distributionStatus,
-                       @ApiParam(value = "The filter key (resourceType only for resources)", required = false)@QueryParam("resourceType") String resourceType) {
-
-               Response response = null;
-               ResponseFormat responseFormat = null;
-               String query = request.getQueryString();
-               String requestURI = request.getRequestURI().endsWith("/")?
-                               removeDuplicateSlashSeparator(request.getRequestURI()): request.getRequestURI();
-               String url = request.getMethod() + " " + requestURI;
-               log.debug("Start handle request of {}", url);
-
-               AuditingActionEnum auditingActionEnum = query == null ? AuditingActionEnum.GET_ASSET_LIST : AuditingActionEnum.GET_FILTERED_ASSET_LIST;
-
-               EnumMap<AuditingFieldsKeysEnum, Object> additionalParam = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-               additionalParam.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, instanceIdHeader);
-               additionalParam.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL, query == null ? requestURI : requestURI + "?" + query);
-
-               // Mandatory
-               if (instanceIdHeader == null || instanceIdHeader.isEmpty()) {
-                       log.debug("getAssetList: Missing X-ECOMP-InstanceID header");
-                       responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
-                       getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-                       return buildErrorResponse(responseFormat);
-               }
-
-               try {
-                       ServletContext context = request.getSession().getServletContext();
-                       ElementBusinessLogic elementLogic = getElementBL(context);
-
-                       AssetMetadataConverter assetMetadataUtils = getAssetUtils(context);
-                       Map<FilterKeyEnum, String> filters = new EnumMap<>(FilterKeyEnum.class);
-
-                       if (category != null) {
-                               filters.put(FilterKeyEnum.CATEGORY, category);
-                       }
-                       if (subCategory != null) {
-                               filters.put(FilterKeyEnum.SUB_CATEGORY, subCategory);
-                       }
-                       if (distributionStatus != null) {
-                               filters.put(FilterKeyEnum.DISTRIBUTION_STATUS, distributionStatus);
-                       }
-                       if (resourceType != null) {
-                               ResourceTypeEnum resourceTypeEnum = ResourceTypeEnum.getTypeIgnoreCase(resourceType);
-                               if (resourceTypeEnum == null) {
-                                       log.debug("getAssetList: Asset Fetching Failed. Invalid resource type was received");
-                                       responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);
-                                       getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-                                       return buildErrorResponse(responseFormat);
-                               }
-                               filters.put(FilterKeyEnum.RESOURCE_TYPE, resourceTypeEnum.name());
-                       }
-
-                       Either<List<? extends Component>, ResponseFormat> assetTypeData = elementLogic.getFilteredCatalogComponents(assetType, filters, query);
-
-                       if (assetTypeData.isRight()) {
-                               log.debug("getAssetList: Asset Fetching Failed");
-                               responseFormat = assetTypeData.right().value();
-                               getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-                               return buildErrorResponse(responseFormat);
-                       } else {
-                               log.debug("getAssetList: Asset Fetching Success");
-                               Either<List<? extends AssetMetadata>, ResponseFormat> resMetadata = assetMetadataUtils.convertToAssetMetadata(assetTypeData.left().value(), requestURI, false);
-                               if (resMetadata.isRight()) {
-                                       log.debug("getAssetList: Asset conversion Failed");
-                                       responseFormat = resMetadata.right().value();
-                                       getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-                                       return buildErrorResponse(responseFormat);
-                               }
-                               Object result = RepresentationUtils.toRepresentation(resMetadata.left().value());
-                               responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.OK);
-                               getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-
-                               response = buildOkResponse(responseFormat, result);
-                               return response;
-                       }
-               } catch (Exception e) {
-                       BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Fetch filtered list of assets");
-                       log.debug("getAssetList: Fetch list of assets failed with exception", e);
-                       return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-               }
-       }
-       
-       /**
-        * 
-        * @param requestId
-        * @param instanceIdHeader
-        * @param accept
-        * @param authorization
-        * @param assetType
-        * @param uuid
-        * @return
-        */
-       @GET
-       @Path("/{assetType}/{uuid}/metadata")
-       @Produces(MediaType.APPLICATION_JSON)
-       @ApiOperation(value = "Detailed metadata of asset by uuid", httpMethod = "GET", notes = "Returns detailed metadata of an asset by uuid")
-       @ApiResponses(value = {
-                       @ApiResponse(code = 200, message = "ECOMP component is authenticated and list of Catalog Assets Metadata is returned", response = AssetMetadata.class, responseContainer="List"),
-                       @ApiResponse(code = 400, message = "Missing  'X-ECOMP-InstanceID'  HTTP header - POL5001"),
-                       @ApiResponse(code = 401, message = "ECOMP component  should authenticate itself  and  to  re-send  again  HTTP  request  with its Basic Authentication credentials - POL5002"),
-                       @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
-                       @ApiResponse(code = 404, message = "Error: Requested '%1' (uuid) resource was not found - SVC4063"),
-                       @ApiResponse(code = 405, message = "Method  Not Allowed  :  Invalid HTTP method type used ( PUT,DELETE,POST will be rejected) - POL4050"),
-                       @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem. ECOMP Component should continue the attempts to get the needed information - POL5000")})
-       public Response getAssetSpecificMetadataByUuidExternal(
-                       @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
-                       @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
-                       @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
-                       @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
-                       @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType, 
-                       @ApiParam(value = "The requested asset uuid", required = true)@PathParam("uuid") final String uuid) {
-
-               Response response = null;
-               ResponseFormat responseFormat = null;
-               AuditingActionEnum auditingActionEnum = AuditingActionEnum.GET_ASSET_METADATA;
-               String requestURI = request.getRequestURI();
-               String url = request.getMethod() + " " + requestURI;
-               log.debug("Start handle request of {}", url);
-
-               EnumMap<AuditingFieldsKeysEnum, Object> additionalParam = new EnumMap<>(AuditingFieldsKeysEnum.class);
-               ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
-               additionalParam.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, instanceIdHeader);
-               additionalParam.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL, requestURI);
-               additionalParam.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, uuid);
-               if (componentType == null) {
-                       log.debug("getMetaData: assetType parameter {} is not valid", assetType);
-                       responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);
-                       return buildErrorResponse(responseFormat);
-               }
-               additionalParam.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE, componentType.getValue());
-
-               // Mandatory
-               if (instanceIdHeader == null || instanceIdHeader.isEmpty()) {
-                       log.debug("getAssetList: Missing X-ECOMP-InstanceID header");
-                       responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
-                       getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-                       return buildErrorResponse(responseFormat);
-               }
-
-               try {
-                       ServletContext context = request.getSession().getServletContext();
-                       ElementBusinessLogic elementLogic = getElementBL(context);
-                       AssetMetadataConverter assetMetadataUtils = getAssetUtils(context);
-
-                       Either<List<? extends Component>, ResponseFormat> assetTypeData = elementLogic.getCatalogComponentsByUuidAndAssetType(assetType, uuid);
-
-                       if (assetTypeData.isRight()) {
-                               log.debug("getAssetList: Asset Fetching Failed");
-                               responseFormat = assetTypeData.right().value();
-                               getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-
-                               return buildErrorResponse(responseFormat);
-                       } else {
-                               log.debug("getAssetList: Asset Fetching Success");
-                               additionalParam.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, assetTypeData.left().value().iterator().next().getName());
-                               Either<List<? extends AssetMetadata>, ResponseFormat> resMetadata = assetMetadataUtils.convertToAssetMetadata(assetTypeData.left().value(), requestURI, true);
-                               if (resMetadata.isRight()) {
-                                       log.debug("getAssetList: Asset conversion Failed");
-                                       responseFormat = resMetadata.right().value();
-                                       getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-                                       return buildErrorResponse(responseFormat);
-                               }
-                               Object result = RepresentationUtils.toRepresentation(resMetadata.left().value().iterator().next());
-                               responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.OK);
-                               getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-
-                               response = buildOkResponse(responseFormat, result);
-                               return response;
-                       }
-               } catch (Exception e) {
-                       BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Fetch filtered list of assets");
-                       log.debug("getAssetList: Fetch list of assets failed with exception", e);
-                       return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-               }
-       }
-       
-       /**
-        * 
-        * @param requestId
-        * @param instanceIdHeader
-        * @param accept
-        * @param authorization
-        * @param assetType
-        * @param uuid
-        * @return
-        */
-       @GET
-       @Path("/{assetType}/{uuid}/toscaModel")
-       @Produces(MediaType.APPLICATION_OCTET_STREAM)
-       @ApiOperation(value = "Fetch assets CSAR", httpMethod = "GET", notes = "Returns asset csar", response = String.class)
-       @ApiResponses(value = {
-                       @ApiResponse(code = 200, message = "ECOMP component is authenticated and list of Catalog Assets Metadata is returned", response = String.class),
-                       @ApiResponse(code = 400, message = "Missing  'X-ECOMP-InstanceID'  HTTP header - POL5001"),
-                       @ApiResponse(code = 401, message = "ECOMP component  should authenticate itself  and  to  re-send  again  HTTP  request  with its Basic Authentication credentials - POL5002"),
-                       @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
-                       @ApiResponse(code = 404, message = "Error: Requested '%1' (uuid) resource was not found - SVC4063"),
-                       @ApiResponse(code = 405, message = "Method  Not Allowed  :  Invalid HTTP method type used ( PUT,DELETE,POST will be rejected) - POL4050"),
-                       @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem. ECOMP Component should continue the attempts to get the needed information - POL5000")})
-       public Response getToscaModelExternal(
-                       @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
-                       @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
-                       @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
-                       @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
-                       @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType, 
-                       @ApiParam(value = "The requested asset uuid", required = true)@PathParam("uuid") final String uuid) {
-
-               String url = request.getRequestURI();
-               log.debug("Start handle request of {} {}", request.getMethod(), url);
-               Response response = null;
-               ResponseFormat responseFormat = null;
-               ServletContext context = request.getSession().getServletContext();
-               ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
-               AuditingActionEnum auditingActionEnum = AuditingActionEnum.GET_TOSCA_MODEL;
-               EnumMap<AuditingFieldsKeysEnum, Object> additionalParam = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-               additionalParam.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, instanceIdHeader);
-               additionalParam.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL, url);
-               additionalParam.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, uuid);
-               
-               if (componentType == null) {
-                       log.debug("getToscaModel: assetType parameter {} is not valid", assetType);
-                       responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);
-                       return buildErrorResponse(responseFormat);
-               }
-               additionalParam.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE, componentType.getValue());
-
-
-               if (instanceIdHeader == null || instanceIdHeader.isEmpty()) {
-                       log.debug("getToscaModel: Missing X-ECOMP-InstanceID header");
-                       responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
-                       getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-                       return buildErrorResponse(responseFormat);
-               }
-
-               try {
-                       ComponentBusinessLogic componentBL = getComponentBL(componentType, context);
-
-                       Either<ImmutablePair<String, byte[]>, ResponseFormat> csarArtifact = componentBL.getToscaModelByComponentUuid(componentType, uuid, additionalParam);
-                       if (csarArtifact.isRight()) {
-                               responseFormat = csarArtifact.right().value();
-                               getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-                               response = buildErrorResponse(responseFormat);
-                       } else {
-                               byte[] value = csarArtifact.left().value().getRight();
-                               InputStream is = new ByteArrayInputStream(value);
-                               String contenetMD5 = GeneralUtility.calculateMD5Base64EncodedByByteArray(value);
-                               Map<String, String> headers = new HashMap<>();
-                               headers.put(Constants.CONTENT_DISPOSITION_HEADER, getContentDispositionValue(csarArtifact.left().value().getLeft()));
-                               headers.put(Constants.MD5_HEADER, contenetMD5);
-                               responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.OK);
-                               getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-                               response = buildOkResponse(responseFormat, is, headers);
-                       }
-                       return response;
-
-               } catch (Exception e) {
-                       BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get asset tosca model");
-                       log.debug("falied to get asset tosca model", e);
-                       responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
-                       response = buildErrorResponse(responseFormat);
-                       getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-                       return response;
-               }
-       }
-
-
-       private String removeDuplicateSlashSeparator(String requestUri) {
-               return requestUri.substring(0, requestUri.length()-1);
-       }
-
+    private static final Logger log = Logger.getLogger(AssetsDataServlet.class);
+    private final ElementBusinessLogic elementBL;
+    private final AssetMetadataConverter assetMetadataConverter;
+    private final ServiceBusinessLogic serviceBL;
+    private final ResourceBusinessLogic resourceBL;
+    @Context
+    private HttpServletRequest request;
+
+    @Inject
+    public AssetsDataServlet(ComponentInstanceBusinessLogic componentInstanceBL, ComponentsUtils componentsUtils, ServletUtils servletUtils,
+                             ResourceImportManager resourceImportManager, ElementBusinessLogic elementBL,
+                             AssetMetadataConverter assetMetadataConverter, ServiceBusinessLogic serviceBL,
+                             ResourceBusinessLogic resourceBL) {
+        super(componentInstanceBL, componentsUtils, servletUtils, resourceImportManager);
+        this.elementBL = elementBL;
+        this.assetMetadataConverter = assetMetadataConverter;
+        this.serviceBL = serviceBL;
+        this.resourceBL = resourceBL;
+    }
+
+    @GET
+    @Path("/{assetType}")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "Fetch list of assets", method = "GET", summary = "Returns list of assets", responses = {
+        @ApiResponse(responseCode = "200", description = "ECOMP component is authenticated and list of Catalog Assets Metadata is returned", content = @Content(array = @ArraySchema(schema = @Schema(implementation = AssetMetadata.class)))),
+        @ApiResponse(responseCode = "400", description = "Missing  'X-ECOMP-InstanceID'  HTTP header - POL5001"),
+        @ApiResponse(responseCode = "401", description = "ECOMP component  should authenticate itself  and  to  re-send  again  HTTP  request  with its Basic Authentication credentials - POL5002"),
+        @ApiResponse(responseCode = "403", description = "ECOMP component is not authorized - POL5003"),
+        @ApiResponse(responseCode = "405", description = "Method  Not Allowed  :  Invalid HTTP method type used ( PUT,DELETE,POST will be rejected) - POL4050"),
+        @ApiResponse(responseCode = "500", description = "The GET request failed either due to internal SDC problem. ECOMP Component should continue the attempts to get the needed information - POL5000")})
+    @PermissionAllowed(AafPermission.PermNames.READ_VALUE)
+    public Response getAssetListExternal(
+        @Parameter(description = "X-ECOMP-RequestID header") @HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+        @Parameter(description = "X-ECOMP-InstanceID header", required = true) @HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+        @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<String> additionalMetadataKeysToInclude,
+        @Parameter(description = "The version(s) to filter the result set on\n" +
+            "Syntax: /services?version=(highestMatchingVersionOnly|lessThan|greaterThan|equals)(:=)(value)",
+            examples = {
+                @ExampleObject(
+                    name = "An example request to get each service with highest version",
+                    value = "highestMatchingVersionOnly:true"),
+                @ExampleObject(
+                    name = "An example request to get all services with version less than 2.1",
+                    value = "lessThan:2.1"),
+                @ExampleObject(
+                    name = "An example request to get all services with version equal 2.0",
+                    value = "equals:2.0"),
+                @ExampleObject(
+                    name = "An example request to get all services with version greater than 1.1",
+                    value = "greaterThan:1.1")})
+        @QueryParam("version") String version,
+        @Parameter(description = "The keys of the metadata to include in the entries in the result set. Only applicable when assetType = services\n" +
+            "Only category specific metadata keys are supported\n" +
+            "Syntax: /services?metadata=<KEY1>(:=)<VALUE1>&metadata=<KEY2>(:=)<VALUE2> ...",
+            examples = {
+                @ExampleObject(
+                    name = "An example request to get all services matching following Category Specific Metadata condition 'ETSI Version=3.3.1'",
+                    value = "ETSI Version:3.3.1")})
+        @QueryParam("metadata") List<String> metadata) throws IOException {
+        ResponseFormat responseFormat;
+        final String query = request.getQueryString();
+        final String requestURI =
+            request.getRequestURI().endsWith("/") ? removeDuplicateSlashSeparator(request.getRequestURI()) : request.getRequestURI();
+        final String url = request.getMethod() + " " + requestURI;
+        log.debug("Start handle request of {}", url);
+        final AuditingActionEnum auditingActionEnum = query == null ? AuditingActionEnum.GET_ASSET_LIST : AuditingActionEnum.GET_FILTERED_ASSET_LIST;
+        final String resourceUrl = query == null ? requestURI : requestURI + "?" + query;
+        final DistributionData distributionData = new DistributionData(instanceIdHeader, resourceUrl);
+        // Mandatory
+        if (instanceIdHeader == null || instanceIdHeader.isEmpty()) {
+            log.debug("getAssetList: Missing X-ECOMP-InstanceID header");
+            responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
+            getComponentsUtils().auditExternalGetAssetList(responseFormat, auditingActionEnum, distributionData, requestId);
+            return buildErrorResponse(responseFormat);
+        }
+        try {
+            final Map<FilterKeyEnum, Object> filters = new EnumMap<>(FilterKeyEnum.class);
+            if (category != null) {
+                filters.put(FilterKeyEnum.CATEGORY, category);
+            }
+            if (subCategory != null) {
+                filters.put(FilterKeyEnum.SUB_CATEGORY, subCategory);
+            }
+            if (distributionStatus != null) {
+                filters.put(FilterKeyEnum.DISTRIBUTION_STATUS, distributionStatus);
+            }
+            if (version != null) {
+                filters.put(FilterKeyEnum.VERSION, version);
+            }
+            if (CollectionUtils.isNotEmpty(metadata)) {
+                filters.put(FilterKeyEnum.METADATA, metadata);
+            }
+            if (resourceType != null) {
+                ResourceTypeEnum resourceTypeEnum = ResourceTypeEnum.getTypeIgnoreCase(resourceType);
+                if (resourceTypeEnum == null) {
+                    log.debug("getAssetList: Asset Fetching Failed. Invalid resource type was received");
+                    responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);
+                    getComponentsUtils().auditExternalGetAssetList(responseFormat, auditingActionEnum, distributionData, requestId);
+                    return buildErrorResponse(responseFormat);
+                }
+                filters.put(FilterKeyEnum.RESOURCE_TYPE, resourceTypeEnum.name());
+            }
+            final Either<List<? extends Component>, ResponseFormat> componentList = elementBL.getFilteredCatalogComponents(assetType, filters, query);
+            if (componentList.isRight()) {
+                log.debug("getAssetList: Asset Fetching Failed");
+                responseFormat = componentList.right().value();
+                getComponentsUtils().auditExternalGetAssetList(responseFormat, auditingActionEnum, distributionData, requestId);
+                return buildErrorResponse(responseFormat);
+            } else {
+                log.debug("getAssetList: Asset Fetching Success");
+                final Either<List<? extends AssetMetadata>, ResponseFormat> resMetadata = assetMetadataConverter
+                    .convertToAssetMetadata(componentList.left().value(), requestURI, false, additionalMetadataKeysToInclude);
+                if (resMetadata.isRight()) {
+                    log.debug("getAssetList: Asset conversion Failed");
+                    responseFormat = resMetadata.right().value();
+                    getComponentsUtils().auditExternalGetAssetList(responseFormat, auditingActionEnum, distributionData, requestId);
+                    return buildErrorResponse(responseFormat);
+                }
+                final Object result = RepresentationUtils.toRepresentation(sortIfNeed(resMetadata.left().value(), additionalMetadataKeysToInclude));
+                responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.OK);
+                getComponentsUtils().auditExternalGetAssetList(responseFormat, auditingActionEnum, distributionData, requestId);
+                return buildOkResponse(responseFormat, result);
+            }
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Fetch filtered list of assets");
+            log.debug("getAssetList: Fetch list of assets failed with exception", e);
+            throw e;
+        }
+    }
+
+    /**
+     * @param requestId
+     * @param instanceIdHeader
+     * @param accept
+     * @param authorization
+     * @param assetType
+     * @param uuid
+     * @return
+     */
+    @GET
+    @Path("/{assetType}/{uuid}/metadata")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "Detailed metadata of asset by uuid", method = "GET", summary = "Returns detailed metadata of an asset by uuid", responses = {
+        @ApiResponse(responseCode = "200", description = "ECOMP component is authenticated and list of Catalog Assets Metadata is returned", content = @Content(array = @ArraySchema(schema = @Schema(implementation = AssetMetadata.class)))),
+        @ApiResponse(responseCode = "400", description = "Missing  'X-ECOMP-InstanceID'  HTTP header - POL5001"),
+        @ApiResponse(responseCode = "401", description = "ECOMP component  should authenticate itself  and  to  re-send  again  HTTP  request  with its Basic Authentication credentials - POL5002"),
+        @ApiResponse(responseCode = "403", description = "ECOMP component is not authorized - POL5003"),
+        @ApiResponse(responseCode = "404", description = "Error: Requested '%1' (uuid) resource was not found - SVC4063"),
+        @ApiResponse(responseCode = "405", description = "Method  Not Allowed  :  Invalid HTTP method type used ( PUT,DELETE,POST will be rejected) - POL4050"),
+        @ApiResponse(responseCode = "500", description = "The GET request failed either due to internal SDC problem. ECOMP Component should continue the attempts to get the needed information - POL5000")})
+    @PermissionAllowed(AafPermission.PermNames.READ_VALUE)
+    public Response getAssetSpecificMetadataByUuidExternal(
+        @Parameter(description = "X-ECOMP-RequestID header") @HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+        @Parameter(description = "X-ECOMP-InstanceID header", required = true) @HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+        @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 requested asset uuid", required = true) @PathParam("uuid") final String uuid) throws IOException {
+        ResponseFormat responseFormat = null;
+        AuditingActionEnum auditingActionEnum = AuditingActionEnum.GET_ASSET_METADATA;
+        String requestURI = request.getRequestURI();
+        String url = request.getMethod() + " " + requestURI;
+        log.debug("Start handle request of {}", url);
+        ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
+        ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(componentType.getValue());
+        DistributionData distributionData = new DistributionData(instanceIdHeader, requestURI);
+        // Mandatory
+        if (instanceIdHeader == null || instanceIdHeader.isEmpty()) {
+            log.debug("getAssetList: Missing X-ECOMP-InstanceID header");
+            responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
+            getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData, resourceCommonInfo, requestId, uuid);
+            return buildErrorResponse(responseFormat);
+        }
+        try {
+            final Either<List<? extends Component>, ResponseFormat> assetTypeData = elementBL.getCatalogComponentsByUuidAndAssetType(assetType, uuid);
+            if (assetTypeData.isRight()) {
+                log.debug("getAssetList: Asset Fetching Failed");
+                responseFormat = assetTypeData.right().value();
+                getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData, resourceCommonInfo, requestId, uuid);
+                return buildErrorResponse(responseFormat);
+            }
+            resourceCommonInfo.setResourceName(assetTypeData.left().value().iterator().next().getName());
+            log.debug("getAssetList: Asset Fetching Success");
+            Either<List<? extends AssetMetadata>, ResponseFormat> resMetadata = assetMetadataConverter
+                .convertToAssetMetadata(assetTypeData.left().value(), requestURI, true, null);
+            if (resMetadata.isRight()) {
+                log.debug("getAssetList: Asset conversion Failed");
+                responseFormat = resMetadata.right().value();
+                getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData, resourceCommonInfo, requestId, uuid);
+                return buildErrorResponse(responseFormat);
+            }
+            Object result = RepresentationUtils.toRepresentation(resMetadata.left().value().iterator().next());
+            responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.OK);
+            getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData, resourceCommonInfo, requestId, uuid);
+            return buildOkResponse(responseFormat, result);
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Fetch filtered list of assets");
+            log.debug("getAssetList: Fetch list of assets failed with exception", e);
+            throw e;
+        }
+    }
+
+    private ComponentBusinessLogic getComponentBLByType(ComponentTypeEnum componentTypeEnum) {
+        if (componentTypeEnum.equals(RESOURCE)) {
+            return resourceBL;
+        } else {
+            // Implementation is the same for any ComponentBusinessLogic
+            return serviceBL;
+        }
+    }
+
+    /**
+     * @param requestId
+     * @param instanceIdHeader
+     * @param accept
+     * @param authorization
+     * @param assetType
+     * @param uuid
+     * @return
+     */
+    @GET
+    @Path("/{assetType}/{uuid}/toscaModel")
+    @Produces(MediaType.APPLICATION_OCTET_STREAM)
+    @Operation(description = "Fetch assets CSAR", method = "GET", summary = "Returns asset csar", responses = {
+        @ApiResponse(description = "default response", content = @Content(array = @ArraySchema(schema = @Schema(implementation = String.class)))),
+        @ApiResponse(responseCode = "200", description = "ECOMP component is authenticated and list of Catalog Assets Metadata is returned", content = @Content(array = @ArraySchema(schema = @Schema(implementation = String.class)))),
+        @ApiResponse(responseCode = "400", description = "Missing  'X-ECOMP-InstanceID'  HTTP header - POL5001"),
+        @ApiResponse(responseCode = "401", description = "ECOMP component  should authenticate itself  and  to  re-send  again  HTTP  request  with its Basic Authentication credentials - POL5002"),
+        @ApiResponse(responseCode = "403", description = "ECOMP component is not authorized - POL5003"),
+        @ApiResponse(responseCode = "404", description = "Error: Requested '%1' (uuid) resource was not found - SVC4063"),
+        @ApiResponse(responseCode = "405", description = "Method  Not Allowed  :  Invalid HTTP method type used ( PUT,DELETE,POST will be rejected) - POL4050"),
+        @ApiResponse(responseCode = "500", description = "The GET request failed either due to internal SDC problem. ECOMP Component should continue the attempts to get the needed information - POL5000")})
+    @PermissionAllowed(AafPermission.PermNames.READ_VALUE)
+    public Response getToscaModelExternal(
+        @Parameter(description = "X-ECOMP-RequestID header") @HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+        @Parameter(description = "X-ECOMP-InstanceID header", required = true) @HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+        @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 requested asset uuid", required = true) @PathParam("uuid") final String uuid) {
+        String url = request.getRequestURI();
+        log.debug("Start handle request of {} {}", request.getMethod(), url);
+        ResponseFormat responseFormat = null;
+        ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
+        AuditingActionEnum auditingActionEnum = AuditingActionEnum.GET_TOSCA_MODEL;
+        ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(componentType.getValue());
+        DistributionData distributionData = new DistributionData(instanceIdHeader, url);
+        if (instanceIdHeader == null || instanceIdHeader.isEmpty()) {
+            log.debug("getToscaModel: Missing X-ECOMP-InstanceID header");
+            responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
+            getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData, resourceCommonInfo, requestId, uuid);
+            return buildErrorResponse(responseFormat);
+        }
+        try {
+            ComponentBusinessLogic componentBusinessLogic = getComponentBLByType(componentType);
+            ImmutablePair<String, byte[]> csarArtifact = componentBusinessLogic.getToscaModelByComponentUuid(componentType, uuid, resourceCommonInfo);
+            byte[] value = csarArtifact.getRight();
+            InputStream is = new ByteArrayInputStream(value);
+            String contenetMD5 = GeneralUtility.calculateMD5Base64EncodedByByteArray(value);
+            Map<String, String> headers = new HashMap<>();
+            headers.put(Constants.CONTENT_DISPOSITION_HEADER, getContentDispositionValue(csarArtifact.getLeft()));
+            headers.put(Constants.MD5_HEADER, contenetMD5);
+            responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.OK);
+            getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData, resourceCommonInfo, requestId, uuid);
+            return buildOkResponse(responseFormat, is, headers);
+        } catch (ComponentException e) {
+            responseFormat = e.getResponseFormat();
+            getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData, resourceCommonInfo, requestId, uuid);
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get asset tosca model");
+            log.debug("failed to get asset tosca model", e);
+            Response response = buildErrorResponse(responseFormat);
+            getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData, resourceCommonInfo, requestId, uuid);
+            return response;
+        }
+    }
+
+    private String removeDuplicateSlashSeparator(String requestUri) {
+        return requestUri.substring(0, requestUri.length() - 1);
+    }
+
+    private List<? extends AssetMetadata> sortIfNeed(final List<? extends AssetMetadata> assetMetadataList,
+                                                     final List<String> additionalMetadataKeysToInclude) {
+        if (additionalMetadataKeysToInclude.contains("creationDate")) {
+            assetMetadataList.sort(
+                Comparator.comparing((AssetMetadata am) -> ((ServiceAssetMetadata) am).getAdditionalRequestedMetadata().get("creationDate")));
+        }
+        return assetMetadataList;
+    }
 
 }