Add support for delete property from non-normative data type

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / servlets / DataTypeServlet.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/DataTypeServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/DataTypeServlet.java
index 05c1fb7..3a62600 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/DataTypeServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/DataTypeServlet.java
@@ -35,6 +35,7 @@ import java.util.List;
 import java.util.Optional;
 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;
@@ -63,7 +64,6 @@ import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Controller;
-import org.apache.commons.lang3.StringUtils;
 
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog/data-types")
@@ -162,10 +162,10 @@ public class DataTypeServlet extends BeGenericServlet {
                 String.format("Property model is not the same as the data type model. Must be '%s'", model));
         }
         if (StringUtils.isEmpty(dataType.getModel())) {
-            dataType.setModel("SDC AID");
+            dataType.setModel(Constants.DEFAULT_MODEL_NAME);
         }
         final PropertyDefinitionDto property = dataTypeOperation.createProperty(id, propertyDefinitionDto);
-        dataTypeOperation.addPropertyToAdditionalTypeDataType(dataType, property);
+        dataTypeOperation.updatePropertyInAdditionalTypeDataType(dataType, property, true);
         dataTypeBusinessLogic.updateApplicationDataTypeCache(id);
         return Response.status(Status.CREATED).entity(property).build();
     }
@@ -204,7 +204,7 @@ public class DataTypeServlet extends BeGenericServlet {
             dataType.setModel(Constants.DEFAULT_MODEL_NAME);
         }
         final PropertyDefinitionDto property = dataTypeOperation.updateProperty(id, propertyDefinitionDto);
-        dataTypeOperation.addPropertyToAdditionalTypeDataType(dataType, property);
+        dataTypeOperation.updatePropertyInAdditionalTypeDataType(dataType, property, true);
         dataTypeBusinessLogic.updateApplicationDataTypeCache(id);
         return Response.status(Status.CREATED).entity(property).build();
     }
@@ -224,4 +224,38 @@ public class DataTypeServlet extends BeGenericServlet {
         return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK),
             gson.toJson(dataTypeOperation.getAllDataTypeModels(dataTypeName)));
     }
+
+    @DELETE
+    @Path("{dataTypeId}/{propertyId}")
+    public Response deleteProperty(@Parameter(in = ParameterIn.PATH, required = true, description = "The data type id")
+                                   @PathParam("dataTypeId") final String dataTypeId,
+                                   @Parameter(in = ParameterIn.PATH, required = true, description = "The property id to delete")
+                                   @PathParam("propertyId") final String propertyId) {
+        final Optional<DataTypeDataDefinition> dataTypeOptional = dataTypeOperation.getDataTypeByUid(dataTypeId);
+        dataTypeOptional.orElseThrow(() -> {
+            throw new OperationException(ActionStatus.DATA_TYPE_NOT_FOUND, String.format("Failed to find data type '%s'", dataTypeId));
+        });
+        final DataTypeDataDefinition dataTypeDataDefinition = dataTypeOptional.get();
+        if (StringUtils.isEmpty(dataTypeDataDefinition.getModel())) {
+            dataTypeDataDefinition.setModel(Constants.DEFAULT_MODEL_NAME);
+        }
+        final PropertyDefinitionDto propertyDefinitionDto;
+        try {
+            propertyDefinitionDto = dataTypeOperation.deleteProperty(dataTypeDataDefinition, propertyId);
+            dataTypeOperation.updatePropertyInAdditionalTypeDataType(dataTypeDataDefinition, propertyDefinitionDto, false);
+        } catch (OperationException e) {
+            final PropertyDefinitionDto dto = new PropertyDefinitionDto();
+            dto.setName(extractNameFromPropertyId(propertyId));
+            dataTypeOperation.updatePropertyInAdditionalTypeDataType(dataTypeDataDefinition, dto, false);
+            throw e;
+        } finally {
+            dataTypeBusinessLogic.updateApplicationDataTypeCache(dataTypeId);
+        }
+        return Response.status(Status.OK).entity(propertyDefinitionDto).build();
+    }
+
+    private String extractNameFromPropertyId(final String propertyId) {
+        final String[] split = propertyId.split("\\.");
+        return split[split.length - 1];
+    }
 }