Catalog alignment
[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / servlets / AttributeServlet.java
index 1ed1e40..aad7f1a 100644 (file)
-/*-\r
- * ============LICENSE_START=======================================================\r
- * SDC\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.openecomp.sdc.be.servlets;\r
-\r
-import javax.inject.Inject;\r
-import javax.inject.Singleton;\r
-import javax.servlet.ServletContext;\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.ws.rs.Consumes;\r
-import javax.ws.rs.DELETE;\r
-import javax.ws.rs.HeaderParam;\r
-import javax.ws.rs.POST;\r
-import javax.ws.rs.PUT;\r
-import javax.ws.rs.Path;\r
-import javax.ws.rs.PathParam;\r
-import javax.ws.rs.Produces;\r
-import javax.ws.rs.core.Context;\r
-import javax.ws.rs.core.MediaType;\r
-import javax.ws.rs.core.Response;\r
-import org.openecomp.sdc.be.components.impl.AttributeBusinessLogic;\r
-import org.openecomp.sdc.be.components.impl.ComponentInstanceBusinessLogic;\r
-import org.openecomp.sdc.be.components.impl.ResourceImportManager;\r
-import org.openecomp.sdc.be.config.BeEcompErrorManager;\r
-import org.openecomp.sdc.be.dao.api.ActionStatus;\r
-import org.openecomp.sdc.be.impl.ComponentsUtils;\r
-import org.openecomp.sdc.be.impl.ServletUtils;\r
-import org.openecomp.sdc.be.model.PropertyDefinition;\r
-import org.openecomp.sdc.be.model.User;\r
-import org.openecomp.sdc.be.user.UserBusinessLogic;\r
-import org.openecomp.sdc.common.api.Constants;\r
-import org.openecomp.sdc.common.datastructure.Wrapper;\r
-import org.openecomp.sdc.common.log.wrappers.Logger;\r
-import org.openecomp.sdc.exception.ResponseFormat;\r
-import com.google.gson.Gson;\r
-import com.google.gson.GsonBuilder;\r
-import com.jcabi.aspects.Loggable;\r
-import fj.data.Either;\r
-import io.swagger.v3.oas.annotations.OpenAPIDefinition;\r
-import io.swagger.v3.oas.annotations.Operation;\r
-import io.swagger.v3.oas.annotations.Parameter;\r
-import io.swagger.v3.oas.annotations.info.Info;\r
-import io.swagger.v3.oas.annotations.media.ArraySchema;\r
-import io.swagger.v3.oas.annotations.media.Content;\r
-import io.swagger.v3.oas.annotations.media.Schema;\r
-import io.swagger.v3.oas.annotations.responses.ApiResponse;\r
-import io.swagger.v3.oas.annotations.responses.ApiResponses;\r
-\r
-/**\r
- * Web Servlet for actions on Attributes\r
- * \r
- * @author mshitrit\r
- *\r
- */\r
-@Loggable(prepend = true, value = Loggable.DEBUG, trim = false)\r
-@Path("/v1/catalog")\r
-@OpenAPIDefinition(info = @Info(title = "Resource Attribute Servlet", description = "Resource Attribute Servlet"))\r
-@Singleton\r
-public class AttributeServlet extends AbstractValidationsServlet {\r
-    private static final Logger log = Logger.getLogger(AttributeServlet.class);\r
-\r
-    @Inject\r
-    public AttributeServlet(UserBusinessLogic userBusinessLogic,\r
-        ComponentInstanceBusinessLogic componentInstanceBL,\r
-        ComponentsUtils componentsUtils, ServletUtils servletUtils,\r
-        ResourceImportManager resourceImportManager) {\r
-        super(userBusinessLogic, componentInstanceBL, componentsUtils, servletUtils, resourceImportManager);\r
-    }\r
-\r
-    /**\r
-     * Creates new Attribute on a resource with given resource ID\r
-     *\r
-     * @param resourceId\r
-     * @param data\r
-     * @param request\r
-     * @param userId\r
-     * @return\r
-     */\r
-    @POST\r
-    @Path("resources/{resourceId}/attributes")\r
-    @Consumes(MediaType.APPLICATION_JSON)\r
-    @Produces(MediaType.APPLICATION_JSON)\r
-    @Operation(description = "Create Resource Attribute", method = "POST",\r
-            summary = "Returns created resource attribute", responses = @ApiResponse(\r
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Response.class)))))\r
-    @ApiResponses(value = {@ApiResponse(responseCode = "201", description = "Resource property created"),\r
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),\r
-            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),\r
-            @ApiResponse(responseCode = "409", description = "Resource attribute already exist")})\r
-    public Response createAttribute(\r
-            @Parameter(description = "resource id to update with new attribute",\r
-                    required = true) @PathParam("resourceId") final String resourceId,\r
-            @Parameter(description = "Resource attribute to be created", required = true) String data,\r
-            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {\r
-\r
-        ServletContext context = request.getSession().getServletContext();\r
-\r
-        String url = request.getMethod() + " " + request.getRequestURI();\r
-        log.debug("Start handle request of {} modifier id is {} data is {}", url, userId, data);\r
-\r
-        try {\r
-            Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();\r
-            Wrapper<PropertyDefinition> attributesWrapper = new Wrapper<>();\r
-            // convert json to AttributeDefinition\r
-\r
-            buildAttributeFromString(data, attributesWrapper, errorWrapper);\r
-            if (errorWrapper.isEmpty()) {\r
-                AttributeBusinessLogic businessLogic =\r
-                        getClassFromWebAppContext(context, () -> AttributeBusinessLogic.class);\r
-                Either<PropertyDefinition, ResponseFormat> createAttribute =\r
-                        businessLogic.createAttribute(resourceId, attributesWrapper.getInnerElement(), userId);\r
-                if (createAttribute.isRight()) {\r
-                    errorWrapper.setInnerElement(createAttribute.right().value());\r
-                } else {\r
-                    attributesWrapper.setInnerElement(createAttribute.left().value());\r
-                }\r
-            }\r
-\r
-            Response response;\r
-            if (!errorWrapper.isEmpty()) {\r
-                log.info("Failed to create Attribute. Reason - ", errorWrapper.getInnerElement());\r
-                response = buildErrorResponse(errorWrapper.getInnerElement());\r
-            } else {\r
-                PropertyDefinition createdAttDef = attributesWrapper.getInnerElement();\r
-                log.debug("Attribute {} created successfully with id {}", createdAttDef.getName(),\r
-                        createdAttDef.getUniqueId());\r
-                ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.CREATED);\r
-                response = buildOkResponse(responseFormat, RepresentationUtils.toRepresentation(createdAttDef));\r
-            }\r
-\r
-            return response;\r
-\r
-        } catch (Exception e) {\r
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Create Attribute");\r
-            log.debug("create property failed with exception", e);\r
-            ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);\r
-            return buildErrorResponse(responseFormat);\r
-\r
-        }\r
-    }\r
-\r
-    /**\r
-     * Updates existing Attribute with given attributeID on a resource with given resourceID\r
-     *\r
-     * @param resourceId\r
-     * @param attributeId\r
-     * @param data\r
-     * @param request\r
-     * @param userId\r
-     * @return\r
-     */\r
-    @PUT\r
-    @Path("resources/{resourceId}/attributes/{attributeId}")\r
-    @Consumes(MediaType.APPLICATION_JSON)\r
-    @Produces(MediaType.APPLICATION_JSON)\r
-    @Operation(description = "Update Resource Attribute", method = "PUT", summary = "Returns updated attribute",\r
-            responses = @ApiResponse(\r
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Response.class)))))\r
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Resource attribute updated"),\r
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),\r
-            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})\r
-    public Response updateAttribute(\r
-            @Parameter(description = "resource id to update with new attribute",\r
-                    required = true) @PathParam("resourceId") final String resourceId,\r
-            @Parameter(description = "attribute id to update",\r
-                    required = true) @PathParam("attributeId") final String attributeId,\r
-            @Parameter(description = "Resource attribute to update", required = true) String data,\r
-            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {\r
-\r
-        ServletContext context = request.getSession().getServletContext();\r
-\r
-        String url = request.getMethod() + " " + request.getRequestURI();\r
-        log.debug("Start handle request of {}", url);\r
-\r
-        // get modifier id\r
-        User modifier = new User();\r
-        modifier.setUserId(userId);\r
-        log.debug("modifier id is {}", userId);\r
-\r
-        try {\r
-            // convert json to PropertyDefinition\r
-            Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();\r
-            Wrapper<PropertyDefinition> attributesWrapper = new Wrapper<>();\r
-            // convert json to AttributeDefinition\r
-\r
-            buildAttributeFromString(data, attributesWrapper, errorWrapper);\r
-\r
-            if (errorWrapper.isEmpty()) {\r
-                AttributeBusinessLogic businessLogic =\r
-                        getClassFromWebAppContext(context, () -> AttributeBusinessLogic.class);\r
-                Either<PropertyDefinition, ResponseFormat> eitherUpdateAttribute = businessLogic\r
-                        .updateAttribute(resourceId, attributeId, attributesWrapper.getInnerElement(), userId);\r
-                // update property\r
-                if (eitherUpdateAttribute.isRight()) {\r
-                    errorWrapper.setInnerElement(eitherUpdateAttribute.right().value());\r
-                } else {\r
-                    attributesWrapper.setInnerElement(eitherUpdateAttribute.left().value());\r
-                }\r
-            }\r
-\r
-            Response response;\r
-            if (!errorWrapper.isEmpty()) {\r
-                log.info("Failed to update Attribute. Reason - ", errorWrapper.getInnerElement());\r
-                response = buildErrorResponse(errorWrapper.getInnerElement());\r
-            } else {\r
-                PropertyDefinition updatedAttribute = attributesWrapper.getInnerElement();\r
-                log.debug("Attribute id {} updated successfully ", updatedAttribute.getUniqueId());\r
-                ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.OK);\r
-                response = buildOkResponse(responseFormat, RepresentationUtils.toRepresentation(updatedAttribute));\r
-            }\r
-\r
-            return response;\r
-\r
-        } catch (Exception e) {\r
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Update Attribute");\r
-            log.debug("update attribute failed with exception", e);\r
-            ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);\r
-            return buildErrorResponse(responseFormat);\r
-\r
-        }\r
-    }\r
-\r
-    /**\r
-     * Deletes existing Attribute with given attributeID on a resource with given resourceID\r
-     *\r
-     * @param resourceId\r
-     * @param attributeId\r
-     * @param request\r
-     * @param userId\r
-     * @return\r
-     */\r
-    @DELETE\r
-    @Path("resources/{resourceId}/attributes/{attributeId}")\r
-    @Consumes(MediaType.APPLICATION_JSON)\r
-    @Produces(MediaType.APPLICATION_JSON)\r
-    @Operation(description = "Create Resource Attribute", method = "DELETE", summary = "Returns deleted attribute",\r
-            responses = @ApiResponse(\r
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Response.class)))))\r
-    @ApiResponses(value = {@ApiResponse(responseCode = "204", description = "deleted attribute"),\r
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),\r
-            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),\r
-            @ApiResponse(responseCode = "404", description = "Resource property not found")})\r
-    public Response deleteAttribute(\r
-            @Parameter(description = "resource id of attribute",\r
-                    required = true) @PathParam("resourceId") final String resourceId,\r
-            @Parameter(description = "Attribute id to delete",\r
-                    required = true) @PathParam("attributeId") final String attributeId,\r
-            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {\r
-\r
-        ServletContext context = request.getSession().getServletContext();\r
-\r
-        String url = request.getMethod() + " " + request.getRequestURI();\r
-        log.debug("Start handle request of {}", url);\r
-        log.debug("modifier id is {}", userId);\r
-\r
-        try {\r
-\r
-            // delete the property\r
-            AttributeBusinessLogic businessLogic =\r
-                    getClassFromWebAppContext(context, () -> AttributeBusinessLogic.class);\r
-            Either<PropertyDefinition, ResponseFormat> eitherAttribute =\r
-                    businessLogic.deleteAttribute(resourceId, attributeId, userId);\r
-            if (eitherAttribute.isRight()) {\r
-                log.debug("Failed to delete Attribute. Reason - ", eitherAttribute.right().value());\r
-                return buildErrorResponse(eitherAttribute.right().value());\r
-            }\r
-            PropertyDefinition attributeDefinition = eitherAttribute.left().value();\r
-            String name = attributeDefinition.getName();\r
-\r
-            log.debug("Attribute {} deleted successfully with id {}", name, attributeDefinition.getUniqueId());\r
-            ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.NO_CONTENT);\r
-            return buildOkResponse(responseFormat, RepresentationUtils.toRepresentation(attributeDefinition));\r
-\r
-        } catch (Exception e) {\r
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Delete Attribute");\r
-            log.debug("delete attribute failed with exception", e);\r
-            ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);\r
-            return buildErrorResponse(responseFormat);\r
-\r
-        }\r
-    }\r
-\r
-    private void buildAttributeFromString(String data, Wrapper<PropertyDefinition> attributesWrapper,\r
-            Wrapper<ResponseFormat> errorWrapper) {\r
-        try {\r
-            Gson gson = new GsonBuilder().setPrettyPrinting().create();\r
-            final PropertyDefinition attribute = gson.fromJson(data, PropertyDefinition.class);\r
-            if (attribute == null) {\r
-                log.info("Attribute content is invalid - {}", data);\r
-                ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);\r
-                errorWrapper.setInnerElement(responseFormat);\r
-            } else {\r
-                attributesWrapper.setInnerElement(attribute);\r
-            }\r
-\r
-        } catch (Exception e) {\r
-            ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);\r
-            errorWrapper.setInnerElement(responseFormat);\r
-            log.debug("Attribute content is invalid - {}", data, e);\r
-            log.info("Attribute content is invalid - {}", data);\r
-        }\r
-    }\r
-}\r
+/*-
+ * ============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.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+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 org.openecomp.sdc.be.components.impl.AttributeBusinessLogic;
+import org.openecomp.sdc.be.components.impl.ComponentInstanceBusinessLogic;
+import org.openecomp.sdc.be.components.impl.ResourceImportManager;
+import org.openecomp.sdc.be.components.impl.aaf.AafPermission;
+import org.openecomp.sdc.be.components.impl.aaf.PermissionAllowed;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.impl.ServletUtils;
+import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.model.User;
+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 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.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;
+
+/**
+ * Web Servlet for actions on Attributes
+ * 
+ * @author mshitrit
+ *
+ */
+@Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
+@Path("/v1/catalog")
+@OpenAPIDefinition(info = @Info(title = "Resource Attribute Servlet", description = "Resource Attribute Servlet"))
+@Controller
+public class AttributeServlet extends AbstractValidationsServlet {
+    private static final Logger log = Logger.getLogger(AttributeServlet.class);
+    private static final String ATTRIBUTE_CONTENT_IS_INVALID = "Attribute content is invalid - {}";
+    @Inject
+    public AttributeServlet(UserBusinessLogic userBusinessLogic,
+        ComponentInstanceBusinessLogic componentInstanceBL,
+        ComponentsUtils componentsUtils, ServletUtils servletUtils,
+        ResourceImportManager resourceImportManager) {
+        super(userBusinessLogic, componentInstanceBL, componentsUtils, servletUtils, resourceImportManager);
+    }
+
+    /**
+     * Creates new Attribute on a resource with given resource ID
+     *
+     * @param resourceId
+     * @param data
+     * @param request
+     * @param userId
+     * @return
+     */
+    @POST
+    @Path("resources/{resourceId}/attributes")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "Create Resource Attribute", method = "POST",
+            summary = "Returns created resource attribute", responses = @ApiResponse(
+                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Response.class)))))
+    @ApiResponses(value = {@ApiResponse(responseCode = "201", description = "Resource property created"),
+            @ApiResponse(responseCode = "403", description = "Restricted operation"),
+            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
+            @ApiResponse(responseCode = "409", description = "Resource attribute already exist")})
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response createAttribute(
+            @Parameter(description = "resource id to update with new attribute",
+                    required = true) @PathParam("resourceId") final String resourceId,
+            @Parameter(description = "Resource attribute to be created", required = true) String data,
+            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) throws IOException {
+
+        ServletContext context = request.getSession().getServletContext();
+
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug("Start handle request of {} modifier id is {} data is {}", url, userId, data);
+
+        try {
+            Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
+            Wrapper<PropertyDefinition> attributesWrapper = new Wrapper<>();
+            // convert json to AttributeDefinition
+
+            buildAttributeFromString(data, attributesWrapper, errorWrapper);
+            if (errorWrapper.isEmpty()) {
+                AttributeBusinessLogic businessLogic = getClassFromWebAppContext(context, () -> AttributeBusinessLogic.class);
+                Either<PropertyDefinition, ResponseFormat> createAttribute = businessLogic.createAttribute(resourceId, attributesWrapper.getInnerElement(), userId);
+                if (createAttribute.isRight()) {
+                    errorWrapper.setInnerElement(createAttribute.right().value());
+                } else {
+                    attributesWrapper.setInnerElement(createAttribute.left().value());
+                }
+            }
+
+            Response response;
+            if (!errorWrapper.isEmpty()) {
+                log.info("Failed to create Attribute. Reason - ", errorWrapper.getInnerElement());
+                response = buildErrorResponse(errorWrapper.getInnerElement());
+            } else {
+                PropertyDefinition createdAttDef = attributesWrapper.getInnerElement();
+                log.debug("Attribute {} created successfully with id {}", createdAttDef.getName(), createdAttDef.getUniqueId());
+                ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.CREATED);
+                response = buildOkResponse(responseFormat, RepresentationUtils.toRepresentation(createdAttDef));
+            }
+
+            return response;
+
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Create Attribute");
+            log.debug("create property failed with exception", e);
+            throw e;
+        }
+    }
+
+    /**
+     * Updates existing Attribute with given attributeID on a resource with given resourceID
+     *
+     * @param resourceId
+     * @param attributeId
+     * @param data
+     * @param request
+     * @param userId
+     * @return
+     */
+    @PUT
+    @Path("resources/{resourceId}/attributes/{attributeId}")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "Update Resource Attribute", method = "PUT", summary = "Returns updated attribute",
+            responses = @ApiResponse(
+                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Response.class)))))
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Resource attribute updated"),
+            @ApiResponse(responseCode = "403", description = "Restricted operation"),
+            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response updateAttribute(
+            @Parameter(description = "resource id to update with new attribute",
+                    required = true) @PathParam("resourceId") final String resourceId,
+            @Parameter(description = "attribute id to update",
+                    required = true) @PathParam("attributeId") final String attributeId,
+            @Parameter(description = "Resource attribute to update", required = true) String data,
+            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) throws IOException {
+
+        ServletContext context = request.getSession().getServletContext();
+
+        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);
+
+        try {
+            // convert json to PropertyDefinition
+            Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
+            Wrapper<PropertyDefinition> attributesWrapper = new Wrapper<>();
+            // convert json to AttributeDefinition
+
+            buildAttributeFromString(data, attributesWrapper, errorWrapper);
+
+            if (errorWrapper.isEmpty()) {
+                AttributeBusinessLogic businessLogic = getClassFromWebAppContext(context, () -> AttributeBusinessLogic.class);
+                Either<PropertyDefinition, ResponseFormat> eitherUpdateAttribute = businessLogic.updateAttribute(resourceId, attributeId, attributesWrapper.getInnerElement(), userId);
+                // update property
+                if (eitherUpdateAttribute.isRight()) {
+                    errorWrapper.setInnerElement(eitherUpdateAttribute.right().value());
+                } else {
+                    attributesWrapper.setInnerElement(eitherUpdateAttribute.left().value());
+                }
+            }
+
+            Response response;
+            if (!errorWrapper.isEmpty()) {
+                log.info("Failed to update Attribute. Reason - ", errorWrapper.getInnerElement());
+                response = buildErrorResponse(errorWrapper.getInnerElement());
+            } else {
+                PropertyDefinition updatedAttribute = attributesWrapper.getInnerElement();
+                log.debug("Attribute id {} updated successfully ", updatedAttribute.getUniqueId());
+                ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.OK);
+                response = buildOkResponse(responseFormat, RepresentationUtils.toRepresentation(updatedAttribute));
+            }
+
+            return response;
+
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Update Attribute");
+            log.debug("update attribute failed with exception", e);
+            throw e;
+        }
+    }
+
+    /**
+     * Deletes existing Attribute with given attributeID on a resource with given resourceID
+     *
+     * @param resourceId
+     * @param attributeId
+     * @param request
+     * @param userId
+     * @return
+     */
+    @DELETE
+    @Path("resources/{resourceId}/attributes/{attributeId}")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(description = "Create Resource Attribute", method = "DELETE", summary = "Returns deleted attribute",
+            responses = @ApiResponse(
+                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Response.class)))))
+    @ApiResponses(value = {@ApiResponse(responseCode = "204", description = "deleted attribute"),
+            @ApiResponse(responseCode = "403", description = "Restricted operation"),
+            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
+            @ApiResponse(responseCode = "404", description = "Resource property not found")})
+    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
+    public Response deleteAttribute(
+            @Parameter(description = "resource id of attribute",
+                    required = true) @PathParam("resourceId") final String resourceId,
+            @Parameter(description = "Attribute id to delete",
+                    required = true) @PathParam("attributeId") final String attributeId,
+            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) throws IOException {
+
+        ServletContext context = request.getSession().getServletContext();
+
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug("Start handle request of {}", url);
+        log.debug("modifier id is {}", userId);
+
+        try {
+
+            // delete the property
+            AttributeBusinessLogic businessLogic = getClassFromWebAppContext(context, () -> AttributeBusinessLogic.class);
+            Either<PropertyDefinition, ResponseFormat> eitherAttribute = businessLogic.deleteAttribute(resourceId, attributeId, userId);
+            if (eitherAttribute.isRight()) {
+                log.debug("Failed to delete Attribute. Reason - ", eitherAttribute.right().value());
+                return buildErrorResponse(eitherAttribute.right().value());
+            }
+            PropertyDefinition attributeDefinition = eitherAttribute.left().value();
+            String name = attributeDefinition.getName();
+
+            log.debug("Attribute {} deleted successfully with id {}", name, attributeDefinition.getUniqueId());
+            ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.NO_CONTENT);
+            return buildOkResponse(responseFormat, RepresentationUtils.toRepresentation(attributeDefinition));
+
+        } catch (Exception e) {
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Delete Attribute");
+            log.debug("delete attribute failed with exception", e);
+            throw e;
+        }
+    }
+
+    private void buildAttributeFromString(String data, Wrapper<PropertyDefinition> attributesWrapper,
+            Wrapper<ResponseFormat> errorWrapper) {
+        try {
+            Gson gson = new GsonBuilder().setPrettyPrinting().create();
+            final PropertyDefinition attribute = gson.fromJson(data, PropertyDefinition.class);
+            if (attribute == null) {
+                log.info(ATTRIBUTE_CONTENT_IS_INVALID, data);
+                ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);
+                errorWrapper.setInnerElement(responseFormat);
+            } else {
+                attributesWrapper.setInnerElement(attribute);
+            }
+
+        } catch (Exception e) {
+            ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);
+            errorWrapper.setInnerElement(responseFormat);
+            log.debug(ATTRIBUTE_CONTENT_IS_INVALID, data, e);
+            log.info(ATTRIBUTE_CONTENT_IS_INVALID, data);
+        }
+    }
+}