X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Fbe%2Fservlets%2FComponentPropertyServlet.java;h=87ee9229fdaa3b74d10f9d66ffe0137a63c87803;hb=5f3e9912406897ee18c424b940881ce08d59bb44;hp=c58c43db523ffe689e7bea4a73154b18a3a5997b;hpb=e61d26cb2a74813b526e10864af4d73f04df2650;p=sdc.git

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentPropertyServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentPropertyServlet.java
index c58c43db52..87ee9229fd 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentPropertyServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentPropertyServlet.java
@@ -43,8 +43,6 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import org.openecomp.sdc.be.components.impl.PropertyBusinessLogic;
-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.datamodel.utils.PropertyValueConstraintValidationUtil;
@@ -92,7 +90,6 @@ public class ComponentPropertyServlet extends BeGenericServlet {
         @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
         @ApiResponse(responseCode = "409", description = "Service property already exist")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response createPropertyInService(
         @Parameter(description = "service id to update with new property", required = true) @PathParam("serviceId") final String serviceId,
         @Parameter(description = "Service property to be created", required = true) String data, @Context final HttpServletRequest request,
@@ -110,7 +107,6 @@ public class ComponentPropertyServlet extends BeGenericServlet {
         @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
         @ApiResponse(responseCode = "409", description = "Resource property already exist")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response createPropertyInResource(
         @Parameter(description = "Resource id to update with new property", required = true) @PathParam("resourceId") final String resourceId,
         @Parameter(description = "Resource property to be created", required = true) String data, @Context final HttpServletRequest request,
@@ -127,7 +123,6 @@ public class ComponentPropertyServlet extends BeGenericServlet {
         @ApiResponse(responseCode = "200", description = "property"), @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
         @ApiResponse(responseCode = "404", description = "Service property not found")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response getPropertyInService(
         @Parameter(description = "service id of property", required = true) @PathParam("serviceId") final String serviceId,
         @Parameter(description = "property id to get", required = true) @PathParam("propertyId") final String propertyId,
@@ -144,7 +139,6 @@ public class ComponentPropertyServlet extends BeGenericServlet {
         @ApiResponse(responseCode = "200", description = "property"), @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 getPropertyInResource(
         @Parameter(description = "resource id of property", required = true) @PathParam("resourceId") final String resourceId,
         @Parameter(description = "property id to get", required = true) @PathParam("propertyId") final String propertyId,
@@ -161,7 +155,6 @@ public class ComponentPropertyServlet extends BeGenericServlet {
         @ApiResponse(responseCode = "200", description = "property"), @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
         @ApiResponse(responseCode = "404", description = "Service property not found")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response getPropertyListInService(
         @Parameter(description = "service id of property", required = true) @PathParam("serviceId") final String serviceId,
         @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
@@ -177,7 +170,6 @@ public class ComponentPropertyServlet extends BeGenericServlet {
         @ApiResponse(responseCode = "200", description = "property"), @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 getPropertyListInResource(
         @Parameter(description = "resource id of property", required = true) @PathParam("resourceId") final String resourceId,
         @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
@@ -194,7 +186,6 @@ public class ComponentPropertyServlet extends BeGenericServlet {
         @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
         @ApiResponse(responseCode = "404", description = "Service property not found")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response deletePropertyInService(
         @Parameter(description = "service id of property", required = true) @PathParam("serviceId") final String serviceId,
         @Parameter(description = "Property id to delete", required = true) @PathParam("propertyId") final String propertyId,
@@ -212,7 +203,6 @@ public class ComponentPropertyServlet extends BeGenericServlet {
         @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 deletePropertyInResource(
         @Parameter(description = "resource id of property", required = true) @PathParam("resourceId") final String resourceId,
         @Parameter(description = "Property id to delete", required = true) @PathParam("propertyId") final String propertyId,
@@ -229,7 +219,6 @@ public class ComponentPropertyServlet extends BeGenericServlet {
         @ApiResponse(responseCode = "200", description = "Service property updated"),
         @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response updatePropertyInService(
         @Parameter(description = "service id to update with new property", required = true) @PathParam("serviceId") final String serviceId,
         @Parameter(description = "Service property to update", required = true) String data, @Context final HttpServletRequest request,
@@ -246,7 +235,6 @@ public class ComponentPropertyServlet extends BeGenericServlet {
         @ApiResponse(responseCode = "200", description = "Resource property updated"),
         @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response updatePropertyInResource(
         @Parameter(description = "resource id to update with new property", required = true) @PathParam("resourceId") final String resourceId,
         @Parameter(description = "Resource property to update", required = true) String data, @Context final HttpServletRequest request,
@@ -268,6 +256,16 @@ public class ComponentPropertyServlet extends BeGenericServlet {
                 log.info("Property content is invalid - {}", data);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT));
             }
+
+            //Validate value and Constraint of property and Fetch all data types from cache
+            Either<Boolean, ResponseFormat> constraintValidatorResponse = new PropertyValueConstraintValidationUtil()
+                .validatePropertyConstraints(properties.values(), applicationDataTypeCache,
+                    propertyBusinessLogic.getComponentModelByComponentId(componentId));
+            if (constraintValidatorResponse.isRight()) {
+                log.error("Failed validation value and constraint of property: {}", constraintValidatorResponse.right().value());
+                return buildErrorResponse(constraintValidatorResponse.right().value());
+            }
+
             Map.Entry<String, PropertyDefinition> entry = properties.entrySet().iterator().next();
             PropertyDefinition newPropertyDefinition = entry.getValue();
             newPropertyDefinition.setParentUniqueId(componentId);