1 files changed, 724 insertions, 770 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ServiceServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ServiceServlet.java
index 8e71775e14..eb015791ac 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ServiceServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ServiceServlet.java
@@ -1,770 +1,724 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.be.servlets;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.reflect.TypeToken;
-import com.jcabi.aspects.Loggable;
-import fj.data.Either;
-import io.swagger.v3.oas.annotations.OpenAPIDefinition;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.info.Info;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import org.apache.http.HttpStatus;
-import org.openecomp.sdc.be.components.impl.ComponentInstanceBusinessLogic;
-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.lifecycle.LifecycleChangeInfoWithAction;
-import org.openecomp.sdc.be.config.BeEcompErrorManager;
-import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.datamodel.ServiceRelations;
-import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
-import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.impl.ServletUtils;
-import org.openecomp.sdc.be.model.DistributionStatusEnum;
-import org.openecomp.sdc.be.model.GroupInstanceProperty;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.user.UserBusinessLogic;
-import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.Wrapper;
-import org.openecomp.sdc.common.log.wrappers.Logger;
-import org.openecomp.sdc.exception.ResponseFormat;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
-@Path("/v1/catalog")
-@OpenAPIDefinition(info = @Info(title = "Service Catalog", description = "Service Servlet"))
-@Singleton
-public class ServiceServlet extends AbstractValidationsServlet {
-
-    private static final Logger log = Logger.getLogger(ServiceServlet.class);
-    private final ServiceBusinessLogic serviceBusinessLogic;
-    private final ResourceBusinessLogic resourceBusinessLogic;
-
-    @Inject
-    public ServiceServlet(UserBusinessLogic userBusinessLogic,
-        ComponentInstanceBusinessLogic componentInstanceBL,
-        ComponentsUtils componentsUtils, ServletUtils servletUtils,
-        ResourceImportManager resourceImportManager,
-        ServiceBusinessLogic serviceBusinessLogic,
-        ResourceBusinessLogic resourceBusinessLogic) {
-        super(userBusinessLogic, componentInstanceBL, componentsUtils, servletUtils, resourceImportManager);
-        this.serviceBusinessLogic = serviceBusinessLogic;
-        this.resourceBusinessLogic = resourceBusinessLogic;
-    }
-
-    @POST
-    @Path("/services")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @Operation(description = "Create Service", method = "POST", summary = "Returns created service",
-            responses = @ApiResponse(
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Service.class)))))
-    @ApiResponses(value = {@ApiResponse(responseCode = "201", description = "Service created"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),
-            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
-            @ApiResponse(responseCode = "409", description = "Service already exist")})
-    public Response createService(@Parameter(description = "Service object to be created", required = true) String data,
-            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-
-        String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
-
-        User modifier = new User();
-        modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
-
-        Response response = null;
-        try {
-            Either<Service, ResponseFormat> convertResponse = parseToService(data, modifier);
-            if (convertResponse.isRight()) {
-                log.debug("failed to parse service");
-                response = buildErrorResponse(convertResponse.right().value());
-                return response;
-            }
-
-            Service service = convertResponse.left().value();
-            Either<Service, ResponseFormat> actionResponse = serviceBusinessLogic.createService(service, modifier);
-
-            if (actionResponse.isRight()) {
-                log.debug("Failed to create service");
-                response = buildErrorResponse(actionResponse.right().value());
-                return response;
-            }
-
-            Object result = RepresentationUtils.toRepresentation(actionResponse.left().value());
-            response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.CREATED), result);
-            return response;
-
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Create Service");
-            log.debug("create service failed with exception", e);
-            response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-            return response;
-        }
-    }
-
-    public Either<Service, ResponseFormat> parseToService(String serviceJson, User user) {
-        return getComponentsUtils().convertJsonToObjectUsingObjectMapper(serviceJson, user, Service.class, AuditingActionEnum.CREATE_RESOURCE, ComponentTypeEnum.SERVICE);
-    }
-
-    @GET
-    @Path("/services/validate-name/{serviceName}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @Operation(description = "validate service name", method = "GET",
-            summary = "checks if the chosen service name is available ", responses = @ApiResponse(
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Response.class)))))
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service found"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation")})
-    public Response validateServiceName(@PathParam("serviceName") final String serviceName,
-            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-        String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
-
-        // get modifier id
-        User modifier = new User();
-        modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
-        Response response = null;
-        try {
-            Either<Map<String, Boolean>, ResponseFormat> actionResponse =
-                    serviceBusinessLogic.validateServiceNameExists(serviceName, userId);
-
-            if (actionResponse.isRight()) {
-                log.debug("failed to get validate service name");
-                response = buildErrorResponse(actionResponse.right().value());
-                return response;
-            }
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK),
-                    actionResponse.left().value());
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Validate Service Name");
-            log.debug("validate service name failed with exception", e);
-            return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-        }
-    }
-
-    @GET
-    @Path("/audit-records/{componentType}/{componentUniqueId}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @Operation(description = "get component audit records", method = "GET",
-            summary = "get audit records for a service or a resource", responses = @ApiResponse(
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Response.class)))))
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service found"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation")})
-    public Response getComponentAuditRecords(@PathParam("componentType") final String componentType,
-            @PathParam("componentUniqueId") final String componentUniqueId, @Context final HttpServletRequest request,
-            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-        init();
-        ServletContext context = request.getSession().getServletContext();
-        String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
-
-        User modifier = new User();
-        modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
-        Wrapper<Response> responseWrapper = new Wrapper<>();
-        Wrapper<String> uuidWrapper = new Wrapper<>();
-        Wrapper<String> versionWrapper = new Wrapper<>();
-        Wrapper<User> userWrapper = new Wrapper<>();
-        Wrapper<ComponentTypeEnum> componentWrapper = new Wrapper<>();
-        try {
-            validateUserExist(responseWrapper, userWrapper, userId);
-
-            if (responseWrapper.isEmpty()) {
-                validateComponentType(responseWrapper, componentWrapper, componentType);
-            }
-
-            if (responseWrapper.isEmpty()) {
-                fillUUIDAndVersion(responseWrapper, uuidWrapper, versionWrapper, userWrapper.getInnerElement(),
-                        componentWrapper.getInnerElement(), componentUniqueId, context);
-            }
-
-            if (responseWrapper.isEmpty()) {
-                Either<List<Map<String, Object>>, ResponseFormat> eitherServiceAudit =
-                        serviceBusinessLogic.getComponentAuditRecords(versionWrapper.getInnerElement(),
-                                uuidWrapper.getInnerElement(), userId);
-
-                if (eitherServiceAudit.isRight()) {
-                    Response errorResponse = buildErrorResponse(eitherServiceAudit.right().value());
-                    responseWrapper.setInnerElement(errorResponse);
-                } else {
-                    List<Map<String, Object>> auditRecords = eitherServiceAudit.left().value();
-                    Response okResponse =
-                            buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), auditRecords);
-                    responseWrapper.setInnerElement(okResponse);
-
-                }
-            }
-
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Validate Service Name");
-            log.debug("get Service Audit Records failed with exception", e);
-            Response errorResponse =
-                    buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-            responseWrapper.setInnerElement(errorResponse);
-        }
-        return responseWrapper.getInnerElement();
-    }
-
-    private void fillUUIDAndVersion(Wrapper<Response> responseWrapper, Wrapper<String> uuidWrapper, Wrapper<String> versionWrapper, User user, final ComponentTypeEnum componentTypeEnum, final String componentUniqueId, ServletContext context) {
-
-        if (componentTypeEnum == ComponentTypeEnum.RESOURCE) {
-            Either<Resource, ResponseFormat> eitherResource = resourceBusinessLogic.getResource(componentUniqueId, user);
-            if (eitherResource.isLeft()) {
-                uuidWrapper.setInnerElement(eitherResource.left().value().getUUID());
-                versionWrapper.setInnerElement(eitherResource.left().value().getVersion());
-            } else {
-                responseWrapper.setInnerElement(buildErrorResponse(eitherResource.right().value()));
-            }
-
-        } else {
-            Either<Service, ResponseFormat> eitherService = serviceBusinessLogic.getService(componentUniqueId, user);
-            if (eitherService.isLeft()) {
-                uuidWrapper.setInnerElement(eitherService.left().value().getUUID());
-                versionWrapper.setInnerElement(eitherService.left().value().getVersion());
-            } else {
-                responseWrapper.setInnerElement(buildErrorResponse(eitherService.right().value()));
-
-            }
-        }
-    }
-
-    @DELETE
-    @Path("/services/{serviceId}")
-    public Response deleteService(@PathParam("serviceId") final String serviceId, @Context final HttpServletRequest request) {
-        String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
-
-        // get modifier id
-        String userId = request.getHeader(Constants.USER_ID_HEADER);
-        User modifier = new User();
-        modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
-
-        Response response = null;
-
-        try {
-            String serviceIdLower = serviceId.toLowerCase();
-            ResponseFormat actionResponse = serviceBusinessLogic.deleteService(serviceIdLower, modifier);
-
-            if (actionResponse.getStatus() != HttpStatus.SC_NO_CONTENT) {
-                log.debug("failed to delete service");
-                response = buildErrorResponse(actionResponse);
-                return response;
-            }
-            response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.NO_CONTENT), null);
-            return response;
-
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Delete Service");
-            log.debug("delete service failed with exception", e);
-            response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-            return response;
-
-        }
-    }
-
-    @DELETE
-    @Path("/services/{serviceName}/{version}")
-    public Response deleteServiceByNameAndVersion(@PathParam("serviceName") final String serviceName, @PathParam("version") final String version, @Context final HttpServletRequest request) {
-        String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
-
-        // get modifier id
-        String userId = request.getHeader(Constants.USER_ID_HEADER);
-        User modifier = new User();
-        modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
-
-        Response response = null;
-
-        try {
-            ResponseFormat actionResponse = serviceBusinessLogic.deleteServiceByNameAndVersion(serviceName, version, modifier);
-
-            if (actionResponse.getStatus() != HttpStatus.SC_NO_CONTENT) {
-                log.debug("failed to delete service");
-                response = buildErrorResponse(actionResponse);
-                return response;
-            }
-            response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.NO_CONTENT), null);
-            return response;
-
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Delete Service");
-            log.debug("delete service failed with exception", e);
-            response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-            return response;
-
-        }
-    }
-
-    @PUT
-    @Path("/services/{serviceId}/metadata")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @Operation(description = "Update Service Metadata", method = "PUT", summary = "Returns updated service",
-            responses = @ApiResponse(
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Service.class)))))
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service Updated"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),
-            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    public Response updateServiceMetadata(@PathParam("serviceId") final String serviceId,
-            @Parameter(description = "Service object to be Updated", required = true) String data,
-            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-
-        ServletContext context = request.getSession().getServletContext();
-        String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
-
-        User modifier = new User();
-        modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
-
-        Response response = null;
-
-        try {
-            String serviceIdLower = serviceId.toLowerCase();
-
-            Either<Service, ResponseFormat> convertResponse = parseToService(data, modifier);
-            if (convertResponse.isRight()) {
-                log.debug("failed to parse service");
-                response = buildErrorResponse(convertResponse.right().value());
-                return response;
-            }
-            Service updatedService = convertResponse.left().value();
-            Either<Service, ResponseFormat> actionResponse =
-                    serviceBusinessLogic.updateServiceMetadata(serviceIdLower, updatedService, modifier);
-
-            if (actionResponse.isRight()) {
-                log.debug("failed to update service");
-                response = buildErrorResponse(actionResponse.right().value());
-                return response;
-            }
-
-            Service service = actionResponse.left().value();
-            Object result = RepresentationUtils.toRepresentation(service);
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
-
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Update Service Metadata");
-            log.debug("update service metadata failed with exception", e);
-            response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-            return response;
-
-        }
-    }
-    /**
-     * updates group instance property values
-     * Note, than in case of group instance updated successfully, related resourceInstance and containing component modification time will be updated
-     * @param serviceId
-     * @param componentInstanceId
-     * @param groupInstanceId
-     * @param data
-     * @param request
-     * @param userId
-     * @return
-     */
-    @PUT
-    @Path("/{containerComponentType}/{serviceId}/resourceInstance/{componentInstanceId}/groupInstance/{groupInstanceId}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @Operation(description = "Update Group Instance Property Values", method = "PUT",
-            summary = "Returns updated group instance", responses = @ApiResponse(
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Service.class)))))
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Group Instance Property Values Updated"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),
-            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    public Response updateGroupInstancePropertyValues(@PathParam("serviceId") final String serviceId,
-            @PathParam("componentInstanceId") final String componentInstanceId,
-            @PathParam("groupInstanceId") final String groupInstanceId,
-            @Parameter(description = "Group instance object to be Updated", required = true) String data,
-            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-
-        Response response = null;
-        String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
-
-        User modifier = new User();
-        modifier.setUserId(userId);
-        log.debug("modifier id is {}",userId);
-
-        Either<List<GroupInstanceProperty>, ResponseFormat> actionResponse = null;
-        try {
-            List<GroupInstanceProperty> updatedProperties;
-            Type listType = new TypeToken<ArrayList<GroupInstanceProperty>>(){}.getType();
-            ArrayList<GroupInstanceProperty> newProperties = gson.fromJson(data, listType);
-            if (newProperties == null) {
-                actionResponse = Either.right(getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT));
-            }
-            if(actionResponse == null){
-                log.debug("Start handle update group instance property values request. Received group instance is {}", groupInstanceId);
-                actionResponse = serviceBusinessLogic.updateGroupInstancePropertyValues(modifier, serviceId, componentInstanceId, groupInstanceId, newProperties);
-                if(actionResponse.isRight()){
-                    actionResponse = Either.right(actionResponse.right().value());
-                }
-            }
-            if(actionResponse.isLeft()){
-                updatedProperties = actionResponse.left().value();
-                ObjectMapper mapper = new ObjectMapper();
-                String result = mapper.writeValueAsString(updatedProperties);
-                response =  buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
-            }
-            else{
-                response = buildErrorResponse(actionResponse.right().value());
-            }
-        } catch (Exception e) {
-            log.error("Exception occured during update Group Instance property values: {}", e.getMessage(), e);
-            response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-        }
-        return response;
-    }
-
-    @GET
-    @Path("/services/{serviceId}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @Operation(description = "Retrieve Service", method = "GET", summary = "Returns service according to serviceId",
-            responses = @ApiResponse(
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Service.class)))))
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service found"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),
-            @ApiResponse(responseCode = "404", description = "Service not found")})
-    public Response getServiceById(@PathParam("serviceId") final String serviceId,
-            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-
-        String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
-
-        // get modifier id
-        User modifier = new User();
-        modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
-
-        Response response = null;
-        try {
-            String serviceIdLower = serviceId.toLowerCase();
-            log.debug("get service with id {}", serviceId);
-            Either<Service, ResponseFormat> actionResponse = serviceBusinessLogic.getService(serviceIdLower, modifier);
-
-            if (actionResponse.isRight()) {
-                log.debug("failed to get service");
-                response = buildErrorResponse(actionResponse.right().value());
-                return response;
-            }
-
-            Service service = actionResponse.left().value();
-            Object result = RepresentationUtils.toRepresentation(service);
-
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
-
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get Service");
-            log.debug("get service failed with exception", e);
-            return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-
-        }
-    }
-
-    @GET
-    @Path("/services/serviceName/{serviceName}/serviceVersion/{serviceVersion}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @Operation(description = "Retrieve Service", method = "GET",
-            summary = "Returns service according to name and version", responses = @ApiResponse(
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Service.class)))))
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service found"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),
-            @ApiResponse(responseCode = "404", description = "Service not found")})
-    public Response getServiceByNameAndVersion(@PathParam("serviceName") final String serviceName,
-            @PathParam("serviceVersion") final String serviceVersion, @Context final HttpServletRequest request,
-            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-
-        // get modifier id
-        User modifier = new User();
-        modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
-
-        Response response = null;
-        try {
-            Either<Service, ResponseFormat> actionResponse = serviceBusinessLogic.getServiceByNameAndVersion(serviceName, serviceVersion, userId);
-
-            if (actionResponse.isRight()) {
-                response = buildErrorResponse(actionResponse.right().value());
-                return response;
-            }
-
-            Service service = actionResponse.left().value();
-            Object result = RepresentationUtils.toRepresentation(service);
-
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
-
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get Service by name and version");
-            log.debug("get service failed with exception", e);
-            return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-
-        }
-    }
-
-    @POST
-    @Path("/services/{serviceId}/distribution-state/{state}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @Operation(description = "Update Service Distribution State", method = "POST",
-            summary = "service with the changed distribution status")
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service distribution state changed"),
-            @ApiResponse(responseCode = "409", description = "Restricted operation"),
-            @ApiResponse(responseCode = "403", description = "Service is not available for distribution"),
-            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
-            @ApiResponse(responseCode = "404", description = "Requested service was not found"),
-            @ApiResponse(responseCode = "500", description = "Internal Server Error. Please try again later.")})
-    public Response updateServiceDistributionState(
-            @Parameter(description = "DistributionChangeInfo - get comment out of body",
-                    required = true) LifecycleChangeInfoWithAction jsonChangeInfo,
-            @PathParam("serviceId") final String serviceId,
-            @Parameter(schema = @Schema(allowableValues = {"approve", "reject"}),
-                    required = true) @PathParam("state") final String state,
-            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-
-        String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
-
-        User modifier = new User();
-        modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
-
-        Response response = null;
-        try {
-            Either<Service, ResponseFormat> actionResponse = serviceBusinessLogic.changeServiceDistributionState(serviceId, state, jsonChangeInfo, modifier);
-
-            if (actionResponse.isRight()) {
-                log.debug("failed to Update Service Distribution State");
-                response = buildErrorResponse(actionResponse.right().value());
-                return response;
-            }
-            Service service = actionResponse.left().value();
-            Object result = RepresentationUtils.toRepresentation(service);
-
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Update Service Distribution State");
-            log.debug("updateServiceDistributionState failed with exception", e);
-            response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-            return response;
-        }
-    }
-
-    @POST
-    @Path("/services/{serviceId}/distribution/{env}/activate")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @Operation(description = "Activate distribution", method = "POST", summary = "activate distribution")
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK"),
-            @ApiResponse(responseCode = "409",
-                    description = "Service cannot be distributed due to missing deployment artifacts"),
-            @ApiResponse(responseCode = "404", description = "Requested service was not found"),
-            @ApiResponse(responseCode = "500", description = "Internal Server Error. Please try again later.")})
-    public Response activateDistribution(@PathParam("serviceId") final String serviceId,
-            @PathParam("env") final String env, @Context final HttpServletRequest request,
-            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-
-        String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
-
-        User modifier = new User();
-        modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
-
-        Response response = null;
-        try {
-            Either<Service, ResponseFormat> distResponse = serviceBusinessLogic.activateDistribution(serviceId, env, modifier, request);
-
-            if (distResponse.isRight()) {
-                log.debug("failed to activate service distribution");
-                response = buildErrorResponse(distResponse.right().value());
-                return response;
-            }
-            Service service = distResponse.left().value();
-            Object result = RepresentationUtils.toRepresentation(service);
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Activate Distribution");
-            log.debug("activate distribution failed with exception", e);
-            response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-            return response;
-        }
-    }
-
-    @POST
-    @Path("/services/{serviceId}/distribution/{did}/markDeployed")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @Operation(description = "Mark distribution as deployed", method = "POST",
-            summary = "relevant audit record will be created")
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service was marked as deployed"),
-            @ApiResponse(responseCode = "409", description = "Restricted operation"),
-            @ApiResponse(responseCode = "403", description = "Service is not available"),
-            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
-            @ApiResponse(responseCode = "404", description = "Requested service was not found"),
-            @ApiResponse(responseCode = "500", description = "Internal Server Error. Please try again later.")})
-    public Response markDistributionAsDeployed(@PathParam("serviceId") final String serviceId,
-            @PathParam("did") final String did, @Context final HttpServletRequest request,
-            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-
-        String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
-
-        User modifier = new User();
-        modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
-
-        Response response = null;
-        try {
-            Either<Service, ResponseFormat> distResponse = serviceBusinessLogic.markDistributionAsDeployed(serviceId, did, modifier);
-
-            if (distResponse.isRight()) {
-                log.debug("failed to mark distribution as deployed");
-                response = buildErrorResponse(distResponse.right().value());
-                return response;
-            }
-            Service service = distResponse.left().value();
-            Object result = RepresentationUtils.toRepresentation(service);
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Mark Distribution As Deployed");
-            log.debug("mark distribution as deployed failed with exception", e);
-            response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-            return response;
-        }
-    }
-
-    @POST
-    @Path("/services/{serviceId}/tempUrlToBeDeleted")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "500", description = "Internal Server Error. Please try again later.") })
-    public Response tempUrlToBeDeleted(@PathParam("serviceId") final String serviceId, @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-
-        ServletContext context = request.getSession().getServletContext();
-        String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
-
-        User modifier = new User();
-        modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
-
-        Response response;
-        try {
-            Service service = (serviceBusinessLogic.getService(serviceId, modifier)).left().value();
-            Either<Service, ResponseFormat> res = serviceBusinessLogic.updateDistributionStatusForActivation(service, modifier, DistributionStatusEnum.DISTRIBUTED);
-
-            if (res.isRight()) {
-                response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-            }
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), null);
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("tempUrlToBeDeleted");
-            log.debug("failed with exception", e);
-            response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-            return response;
-        }
-    }
-
-
-    @GET
-    @Path("/services/{serviceId}/linksMap")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @Operation(description = "Retrieve Service component relations map", method = "GET",
-            summary = "Returns service components relations",responses = @ApiResponse(
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = ServiceRelations.class)))))
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service found"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),
-            @ApiResponse(responseCode = "404", description = "Service not found")})
-    public Response getServiceComponentRelationMap(@PathParam("serviceId") final String serviceId,
-            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-
-        String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
-
-        // get modifier id
-        User modifier = new User();
-        modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
-
-        Response response = null;
-        try {
-            String serviceIdLower = serviceId.toLowerCase();
-            log.debug("get service components relations with id {}", serviceId);
-            Either<ServiceRelations, ResponseFormat> actionResponse = serviceBusinessLogic.getServiceComponentsRelations(serviceIdLower, modifier);
-
-            if (actionResponse.isRight()) {
-                log.debug("failed to get service relations data");
-                response = buildErrorResponse(actionResponse.right().value());
-                return response;
-            }
-
-            ServiceRelations serviceRelations = actionResponse.left().value();
-            Object result = RepresentationUtils.toRepresentation(serviceRelations);
-
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
-
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get Service");
-            log.debug("get service relations data failed with exception", e);
-            return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-
-        }
-    }
-
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.be.servlets;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.reflect.TypeToken;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.Api;
+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.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import org.apache.http.HttpStatus;
+import org.openecomp.sdc.be.components.impl.ComponentInstanceBusinessLogic;
+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.ByResponseFormatComponentException;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datamodel.ServiceRelations;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.impl.ServletUtils;
+import org.openecomp.sdc.be.model.DistributionStatusEnum;
+import org.openecomp.sdc.be.model.GroupInstanceProperty;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.user.UserBusinessLogic;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.elements.LoggerSupportability;
+import org.openecomp.sdc.common.log.enums.LoggerSupportabilityActions;
+import org.openecomp.sdc.common.log.enums.StatusCode;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.exception.ResponseFormat;
+import org.springframework.stereotype.Controller;
+
+import javax.inject.Inject;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
+@Path("/v1/catalog")
+@Api(value = "Service Catalog", description = "Service Servlet")
+@Controller
+public class ServiceServlet extends AbstractValidationsServlet {
+
+    private static final Logger log = Logger.getLogger(ServiceServlet.class);
+    private static final LoggerSupportability loggerSupportability = LoggerSupportability.getLogger(ServiceServlet.class.getName());
+
+    private static final String START_HANDLE_REQUEST_OF = "Start handle request of {}";
+    private static final String MODIFIER_ID_IS = "modifier id is {}";
+
+    private final ServiceBusinessLogic serviceBusinessLogic;
+
+    @Inject
+    public ServiceServlet(UserBusinessLogic userBusinessLogic,
+        ComponentInstanceBusinessLogic componentInstanceBL,
+        ComponentsUtils componentsUtils, ServletUtils servletUtils,
+        ResourceImportManager resourceImportManager,
+        ServiceBusinessLogic serviceBusinessLogic,
+        ResourceBusinessLogic resourceBusinessLogic) {
+        super(userBusinessLogic, componentInstanceBL, componentsUtils, servletUtils, resourceImportManager);
+        this.serviceBusinessLogic = serviceBusinessLogic;
+    }
+
+    @POST
+    @Path("/services")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "Create Service", method = "POST", summary = "Returns created service",
+            responses = @ApiResponse(
+                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Service.class)))))
+    @ApiResponses(value = {@ApiResponse(responseCode = "201", description = "Service created"),
+            @ApiResponse(responseCode = "403", description = "Restricted operation"),
+            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
+            @ApiResponse(responseCode = "409", description = "Service already exist")})
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response createService(@Parameter(description = "Service object to be created", required = true) String data,
+            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug(START_HANDLE_REQUEST_OF, url);
+        User modifier = new User();
+        modifier.setUserId(userId);
+        log.debug(MODIFIER_ID_IS, userId);
+        loggerSupportability.log(LoggerSupportabilityActions.CREATE_SERVICE,StatusCode.STARTED,"Starting to create a service by user {} ",userId);
+
+        validateNotEmptyBody(data);
+        Either<Service, ResponseFormat> convertResponse = parseToService(data, modifier);
+        if (convertResponse.isRight()) {
+            throw new ByResponseFormatComponentException(convertResponse.right().value());
+        }
+
+        Service service = convertResponse.left().value();
+        Either<Service, ResponseFormat> actionResponse = serviceBusinessLogic.createService(service, modifier);
+
+        if (actionResponse.isRight()) {
+            log.debug("Failed to create service");
+            throw new ByResponseFormatComponentException(actionResponse.right().value());
+        }
+
+        loggerSupportability.log(LoggerSupportabilityActions.CREATE_SERVICE,service.getComponentMetadataForSupportLog(),StatusCode.COMPLETE,"Service {} has been created by user {} ",service.getName(), userId );
+
+        return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.CREATED), actionResponse.left().value());
+    }
+
+    public Either<Service, ResponseFormat> parseToService(String serviceJson, User user) {
+        return getComponentsUtils().convertJsonToObjectUsingObjectMapper(serviceJson, user, Service.class, AuditingActionEnum.CREATE_RESOURCE, ComponentTypeEnum.SERVICE);
+    }
+
+    @GET
+    @Path("/services/validate-name/{serviceName}")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "validate service name", method = "GET",
+            summary = "checks if the chosen service name is available ", responses = @ApiResponse(
+                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Response.class)))))
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service found"),
+            @ApiResponse(responseCode = "403", description = "Restricted operation")})
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response validateServiceName(@PathParam("serviceName") final String serviceName,
+            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug(START_HANDLE_REQUEST_OF, url);
+
+        // get modifier id
+        User modifier = new User();
+        modifier.setUserId(userId);
+        log.debug(MODIFIER_ID_IS, userId);
+        Response response = null;
+        try {
+            Either<Map<String, Boolean>, ResponseFormat> actionResponse =
+                    serviceBusinessLogic.validateServiceNameExists(serviceName, userId);
+
+            if (actionResponse.isRight()) {
+                log.debug("failed to get validate service name");
+                response = buildErrorResponse(actionResponse.right().value());
+                return response;
+            }
+            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), actionResponse.left().value());
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Validate Service Name");
+            log.debug("validate service name failed with exception", e);
+            throw e;
+        }
+    }
+
+    @GET
+    @Path("/audit-records/{componentType}/{componentUniqueId}")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "get component audit records", method = "GET",
+            summary = "get audit records for a service or a resource", responses = @ApiResponse(
+                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Response.class)))))
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service found"),
+            @ApiResponse(responseCode = "403", description = "Restricted operation")})
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response getComponentAuditRecords(@PathParam("componentType") final String componentType,
+            @PathParam("componentUniqueId") final String componentUniqueId, @Context final HttpServletRequest request,
+            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+        init();
+        ServletContext context = request.getSession().getServletContext();
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug(START_HANDLE_REQUEST_OF, url);
+
+        User modifier = new User();
+        modifier.setUserId(userId);
+        log.debug(MODIFIER_ID_IS, userId);
+        Wrapper<Response> responseWrapper = new Wrapper<>();
+        Wrapper<String> uuidWrapper = new Wrapper<>();
+        Wrapper<String> versionWrapper = new Wrapper<>();
+        Wrapper<User> userWrapper = new Wrapper<>();
+        try {
+            validateUserExist(responseWrapper, userWrapper, userId);
+
+            if (responseWrapper.isEmpty()) {
+                fillUUIDAndVersion(responseWrapper, uuidWrapper, versionWrapper, userWrapper.getInnerElement(), validateComponentType(componentType), componentUniqueId, context);
+            }
+
+            if (responseWrapper.isEmpty()) {
+                Either<List<Map<String, Object>>, ResponseFormat> eitherServiceAudit = serviceBusinessLogic.getComponentAuditRecords(versionWrapper.getInnerElement(), uuidWrapper.getInnerElement(), userId);
+
+                if (eitherServiceAudit.isRight()) {
+                    Response errorResponse = buildErrorResponse(eitherServiceAudit.right().value());
+                    responseWrapper.setInnerElement(errorResponse);
+                } else {
+                    List<Map<String, Object>> auditRecords = eitherServiceAudit.left().value();
+                    Response okResponse = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), auditRecords);
+                    responseWrapper.setInnerElement(okResponse);
+
+                }
+            }
+
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Validate Service Name");
+            log.debug("get Service Audit Records failed with exception", e);
+            throw e;
+        }
+        return responseWrapper.getInnerElement();
+    }
+
+    private void fillUUIDAndVersion(Wrapper<Response> responseWrapper, Wrapper<String> uuidWrapper, Wrapper<String> versionWrapper, User user, final ComponentTypeEnum componentTypeEnum, final String componentUniqueId, ServletContext context) {
+
+        if (componentTypeEnum == ComponentTypeEnum.RESOURCE) {
+            Either<Resource, ResponseFormat> eitherResource = getResourceBL(context).getResource(componentUniqueId, user);
+            if (eitherResource.isLeft()) {
+                uuidWrapper.setInnerElement(eitherResource.left().value().getUUID());
+                versionWrapper.setInnerElement(eitherResource.left().value().getVersion());
+            } else {
+                responseWrapper.setInnerElement(buildErrorResponse(eitherResource.right().value()));
+            }
+
+        } else {
+            Either<Service, ResponseFormat> eitherService = getServiceBL(context).getService(componentUniqueId, user);
+            if (eitherService.isLeft()) {
+                uuidWrapper.setInnerElement(eitherService.left().value().getUUID());
+                versionWrapper.setInnerElement(eitherService.left().value().getVersion());
+            } else {
+                responseWrapper.setInnerElement(buildErrorResponse(eitherService.right().value()));
+
+            }
+        }
+    }
+
+    @DELETE
+    @Path("/services/{serviceId}")
+    @Operation(description = "Delete Service", method = "DELETE", summary = "Return no content", responses = @ApiResponse(
+            content = @Content(array = @ArraySchema(schema = @Schema(implementation = Service.class)))))
+    @ApiResponses(value = { @ApiResponse(responseCode = "204", description = "Service deleted"),
+            @ApiResponse(responseCode = "403", description = "Restricted operation"),
+            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
+            @ApiResponse(responseCode = "404", description = "Service not found") })
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response deleteService(@PathParam("serviceId") final String serviceId, @Context final HttpServletRequest request) {
+        ServletContext context = request.getSession().getServletContext();
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug(START_HANDLE_REQUEST_OF, url);
+
+        // get modifier id
+        String userId = request.getHeader(Constants.USER_ID_HEADER);
+        User modifier = new User();
+        modifier.setUserId(userId);
+        log.debug(MODIFIER_ID_IS, userId);
+        Response response = null;
+        try {
+            String serviceIdLower = serviceId.toLowerCase();
+            loggerSupportability.log(LoggerSupportabilityActions.DELETE_SERVICE, StatusCode.STARTED,"Starting to delete service {} by user {} ",serviceIdLower, userId);
+            ServiceBusinessLogic businessLogic = getServiceBL(context);
+            ResponseFormat actionResponse = businessLogic.deleteService(serviceIdLower, modifier);
+            if (actionResponse.getStatus() != HttpStatus.SC_NO_CONTENT) {
+                log.debug("failed to delete service");
+                response = buildErrorResponse(actionResponse);
+                return response;
+            }
+            response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.NO_CONTENT), null);
+            loggerSupportability.log(LoggerSupportabilityActions.DELETE_SERVICE,StatusCode.COMPLETE,"Ended deleting service {} by user {}",serviceIdLower, userId);
+            return response;
+
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Delete Service");
+            log.debug("delete service failed with exception", e);
+            throw e;
+        }
+    }
+
+    @DELETE
+    @Path("/services/{serviceName}/{version}")
+    @Operation(description = "Delete Service By Name And Version", method = "DELETE", summary = "Returns no content", responses = @ApiResponse(
+            content = @Content(array = @ArraySchema(schema = @Schema(implementation = Resource.class)))))
+    @ApiResponses(value = { @ApiResponse(responseCode = "204", description = "Service deleted"),
+            @ApiResponse(responseCode = "403", description = "Restricted operation"),
+            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
+            @ApiResponse(responseCode = "404", description = "Service not found") })
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response deleteServiceByNameAndVersion(@PathParam("serviceName") final String serviceName,
+                                                  @PathParam("version") final String version,
+                                                  @Context final HttpServletRequest request) {
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug(START_HANDLE_REQUEST_OF, url);
+
+        // get modifier id
+        String userId = request.getHeader(Constants.USER_ID_HEADER);
+        User modifier = new User();
+        modifier.setUserId(userId);
+        log.debug(MODIFIER_ID_IS, userId);
+
+        Response response = null;
+
+        try {
+            ResponseFormat actionResponse = serviceBusinessLogic.deleteServiceByNameAndVersion(serviceName, version, modifier);
+
+            if (actionResponse.getStatus() != HttpStatus.SC_NO_CONTENT) {
+                log.debug("failed to delete service");
+                response = buildErrorResponse(actionResponse);
+                return response;
+            }
+            response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.NO_CONTENT), null);
+            return response;
+
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Delete Service");
+            log.debug("delete service failed with exception", e);
+            throw e;
+        }
+    }
+
+    @PUT
+    @Path("/services/{serviceId}/metadata")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "Update Service Metadata", method = "PUT", summary = "Returns updated service",
+            responses = @ApiResponse(
+                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Service.class)))))
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service Updated"),
+            @ApiResponse(responseCode = "403", description = "Restricted operation"),
+            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response updateServiceMetadata(@PathParam("serviceId") final String serviceId,
+            @Parameter(description = "Service object to be Updated", required = true) String data,
+            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) throws IOException {
+
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug(START_HANDLE_REQUEST_OF, url);
+
+        User modifier = new User();
+        modifier.setUserId(userId);
+        log.debug(MODIFIER_ID_IS, userId);
+
+        Response response = null;
+
+        try {
+            String serviceIdLower = serviceId.toLowerCase();
+
+            Either<Service, ResponseFormat> convertResponse = parseToService(data, modifier);
+            if (convertResponse.isRight()) {
+                log.debug("failed to parse service");
+                response = buildErrorResponse(convertResponse.right().value());
+                return response;
+            }
+            Service updatedService = convertResponse.left().value();
+            Either<Service, ResponseFormat> actionResponse = serviceBusinessLogic.updateServiceMetadata(serviceIdLower, updatedService, modifier);
+
+            if (actionResponse.isRight()) {
+                log.debug("failed to update service");
+                response = buildErrorResponse(actionResponse.right().value());
+                return response;
+            }
+
+            Service service = actionResponse.left().value();
+            Object result = RepresentationUtils.toRepresentation(service);
+            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
+
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Update Service Metadata");
+            log.debug("update service metadata failed with exception", e);
+            throw e;
+        }
+    }
+    /**
+     * updates group instance property values
+     * Note, than in case of group instance updated successfully, related resourceInstance and containing component modification time will be updated
+     * @param serviceId
+     * @param componentInstanceId
+     * @param groupInstanceId
+     * @param data
+     * @param request
+     * @param userId
+     * @return
+     */
+    @PUT
+    @Path("/{containerComponentType}/{serviceId}/resourceInstance/{componentInstanceId}/groupInstance/{groupInstanceId}")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "Update Group Instance Property Values", method = "PUT",
+            summary = "Returns updated group instance", responses = @ApiResponse(
+                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Service.class)))))
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Group Instance Property Values Updated"),
+            @ApiResponse(responseCode = "403", description = "Restricted operation"),
+            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response updateGroupInstancePropertyValues(@PathParam("serviceId") final String serviceId,
+            @PathParam("componentInstanceId") final String componentInstanceId,
+            @PathParam("groupInstanceId") final String groupInstanceId,
+            @Parameter(description = "Group instance object to be Updated", required = true) String data,
+            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) throws JsonProcessingException {
+
+        Response response = null;
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug(START_HANDLE_REQUEST_OF, url);
+
+        User modifier = new User();
+        modifier.setUserId(userId);
+        log.debug(MODIFIER_ID_IS,userId);
+
+        Either<List<GroupInstanceProperty>, ResponseFormat> actionResponse = null;
+        try {
+            List<GroupInstanceProperty> updatedProperties;
+            Type listType = new TypeToken<ArrayList<GroupInstanceProperty>>(){}.getType();
+            ArrayList<GroupInstanceProperty> newProperties = gson.fromJson(data, listType);
+            if (newProperties == null) {
+                actionResponse = Either.right(getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT));
+            }
+            if(actionResponse == null){
+                log.debug("Start handle update group instance property values request. Received group instance is {}", groupInstanceId);
+                actionResponse = serviceBusinessLogic.updateGroupInstancePropertyValues(modifier, serviceId, componentInstanceId, groupInstanceId, newProperties);
+                if(actionResponse.isRight()){
+                    actionResponse = Either.right(actionResponse.right().value());
+                }
+            }
+            if(actionResponse.isLeft()){
+                updatedProperties = actionResponse.left().value();
+                ObjectMapper mapper = new ObjectMapper();
+                String result = mapper.writeValueAsString(updatedProperties);
+                response =  buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
+            }
+            else{
+                response = buildErrorResponse(actionResponse.right().value());
+            }
+        } catch (Exception e) {
+            log.error("Exception occured during update Group Instance property values: {}", e.getMessage(), e);
+            throw e;
+        }
+        return response;
+    }
+
+    @GET
+    @Path("/services/{serviceId}")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "Retrieve Service", method = "GET", summary = "Returns service according to serviceId",
+            responses = @ApiResponse(
+                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Service.class)))))
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service found"),
+            @ApiResponse(responseCode = "403", description = "Restricted operation"),
+            @ApiResponse(responseCode = "404", description = "Service not found")})
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response getServiceById(@PathParam("serviceId") final String serviceId,
+            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) throws IOException {
+
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug(START_HANDLE_REQUEST_OF, url);
+
+        // get modifier id
+        User modifier = new User();
+        modifier.setUserId(userId);
+        log.debug(MODIFIER_ID_IS, userId);
+
+        Response response = null;
+        try {
+            String serviceIdLower = serviceId.toLowerCase();
+            log.debug("get service with id {}", serviceId);
+            Either<Service, ResponseFormat> actionResponse = serviceBusinessLogic.getService(serviceIdLower, modifier);
+
+            if (actionResponse.isRight()) {
+                log.debug("failed to get service");
+                response = buildErrorResponse(actionResponse.right().value());
+                return response;
+            }
+
+            Service service = actionResponse.left().value();
+            Object result = RepresentationUtils.toRepresentation(service);
+
+            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
+
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get Service");
+            log.debug("get service failed with exception", e);
+            throw e;
+        }
+    }
+
+    @GET
+    @Path("/services/serviceName/{serviceName}/serviceVersion/{serviceVersion}")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "Retrieve Service", method = "GET",
+            summary = "Returns service according to name and version", responses = @ApiResponse(
+                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Service.class)))))
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service found"),
+            @ApiResponse(responseCode = "403", description = "Restricted operation"),
+            @ApiResponse(responseCode = "404", description = "Service not found")})
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response getServiceByNameAndVersion(@PathParam("serviceName") final String serviceName,
+            @PathParam("serviceVersion") final String serviceVersion, @Context final HttpServletRequest request,
+            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) throws IOException {
+
+        // get modifier id
+        User modifier = new User();
+        modifier.setUserId(userId);
+        log.debug(MODIFIER_ID_IS, userId);
+
+        Response response = null;
+        try {
+            Either<Service, ResponseFormat> actionResponse = serviceBusinessLogic.getServiceByNameAndVersion(serviceName, serviceVersion, userId);
+
+            if (actionResponse.isRight()) {
+                response = buildErrorResponse(actionResponse.right().value());
+                return response;
+            }
+
+            Service service = actionResponse.left().value();
+            Object result = RepresentationUtils.toRepresentation(service);
+
+            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
+
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get Service by name and version");
+            log.debug("get service failed with exception", e);
+            throw e;
+        }
+    }
+
+    @POST
+    @Path("/services/{serviceId}/distribution/{env}/activate")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "Activate distribution", method = "POST", summary = "activate distribution")
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK"),
+            @ApiResponse(responseCode = "409",
+                    description = "Service cannot be distributed due to missing deployment artifacts"),
+            @ApiResponse(responseCode = "404", description = "Requested service was not found"),
+            @ApiResponse(responseCode = "500", description = "Internal Server Error. Please try again later.")})
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response activateDistribution(@PathParam("serviceId") final String serviceId,
+            @PathParam("env") final String env, @Context final HttpServletRequest request,
+            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) throws IOException {
+
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug(START_HANDLE_REQUEST_OF, url);
+
+        User modifier = new User();
+        modifier.setUserId(userId);
+        log.debug(MODIFIER_ID_IS, userId);
+
+        Response response = null;
+        Either<Service, ResponseFormat> distResponse = serviceBusinessLogic.activateDistribution(serviceId, env, modifier, request);
+
+        if (distResponse.isRight()) {
+            log.debug("failed to activate service distribution");
+            response = buildErrorResponse(distResponse.right().value());
+            return response;
+        }
+        Service service = distResponse.left().value();
+        Object result = null;
+        try {
+            result = RepresentationUtils.toRepresentation(service);
+        } catch (IOException e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Activate Distribution");
+            log.debug("activate distribution failed with exception", e);
+            throw e;
+        }
+        return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
+    }
+
+    @POST
+    @Path("/services/{serviceId}/distribution/{did}/markDeployed")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "Mark distribution as deployed", method = "POST",
+            summary = "relevant audit record will be created")
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service was marked as deployed"),
+            @ApiResponse(responseCode = "409", description = "Restricted operation"),
+            @ApiResponse(responseCode = "403", description = "Service is not available"),
+            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
+            @ApiResponse(responseCode = "404", description = "Requested service was not found"),
+            @ApiResponse(responseCode = "500", description = "Internal Server Error. Please try again later.")})
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response markDistributionAsDeployed(@PathParam("serviceId") final String serviceId,
+            @PathParam("did") final String did, @Context final HttpServletRequest request,
+            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) throws IOException {
+
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug(START_HANDLE_REQUEST_OF, url);
+
+        User modifier = new User();
+        modifier.setUserId(userId);
+        log.debug(MODIFIER_ID_IS, userId);
+
+        Response response = null;
+        try {
+            Either<Service, ResponseFormat> distResponse = serviceBusinessLogic.markDistributionAsDeployed(serviceId, did, modifier);
+
+            if (distResponse.isRight()) {
+                log.debug("failed to mark distribution as deployed");
+                response = buildErrorResponse(distResponse.right().value());
+                return response;
+            }
+            Service service = distResponse.left().value();
+            Object result = RepresentationUtils.toRepresentation(service);
+            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Mark Distribution As Deployed");
+            log.debug("mark distribution as deployed failed with exception", e);
+            throw e;
+        }
+    }
+
+    @POST
+    @Path("/services/{serviceId}/tempUrlToBeDeleted")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "500", description = "Internal Server Error. Please try again later.") })
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response tempUrlToBeDeleted(@PathParam("serviceId") final String serviceId, @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+
+        ServletContext context = request.getSession().getServletContext();
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug(START_HANDLE_REQUEST_OF, url);
+
+        User modifier = new User();
+        modifier.setUserId(userId);
+        log.debug(MODIFIER_ID_IS, userId);
+
+        Response response;
+        try {
+            Service service = (serviceBusinessLogic.getService(serviceId, modifier)).left().value();
+            Either<Service, ResponseFormat> res = serviceBusinessLogic.updateDistributionStatusForActivation(service, modifier, DistributionStatusEnum.DISTRIBUTED);
+
+            if (res.isRight()) {
+                response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
+            }
+            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), null);
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("tempUrlToBeDeleted");
+            log.debug("failed with exception", e);
+            throw e;
+        }
+    }
+
+
+    @GET
+    @Path("/services/{serviceId}/linksMap")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "Retrieve Service component relations map", method = "GET",
+            summary = "Returns service components relations",responses = @ApiResponse(
+                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = ServiceRelations.class)))))
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Service found"),
+            @ApiResponse(responseCode = "403", description = "Restricted operation"),
+            @ApiResponse(responseCode = "404", description = "Service not found")})
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response getServiceComponentRelationMap(@PathParam("serviceId") final String serviceId,
+                                                   @Context final HttpServletRequest request,
+                                                   @HeaderParam(value = Constants.USER_ID_HEADER) String userId) throws IOException {
+
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug(START_HANDLE_REQUEST_OF, url);
+
+        // get modifier id
+        User modifier = new User();
+        modifier.setUserId(userId);
+        log.debug(MODIFIER_ID_IS, userId);
+
+        Response response = null;
+        try {
+            String serviceIdLower = serviceId.toLowerCase();
+            log.debug("get service components relations with id {}", serviceId);
+            Either<ServiceRelations, ResponseFormat> actionResponse = serviceBusinessLogic.getServiceComponentsRelations(serviceIdLower, modifier);
+
+            if (actionResponse.isRight()) {
+                log.debug("failed to get service relations data");
+                response = buildErrorResponse(actionResponse.right().value());
+                return response;
+            }
+
+            ServiceRelations serviceRelations = actionResponse.left().value();
+            Object result = RepresentationUtils.toRepresentation(serviceRelations);
+
+            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
+
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get Service");
+            log.debug("get service relations data failed with exception", e);
+            throw e;
+        }
+    }
+
+}