Response changed

Error Response changed while collaboration changes

Change-Id: I1e634c5da3b2bfb3cf385efe1a015bc3c2cd890f
Issue-ID: SDC-1496
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>

2 files changed, 5 insertions, 8 deletions

diff --git a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/main/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImpl.java b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/main/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImpl.java
index 4402af6599..8f4f410c68 100644
--- a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/main/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/main/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImpl.java
@@ -89,7 +89,7 @@ public class PermissionsManagerImpl implements PermissionsManager {
     if (!permissionsServices.isAllowed(itemId, currentUser, CHANGE_PERMISSIONS)) {
       throw new CoreException(new ErrorCode.ErrorCodeBuilder()
           .withMessage(Messages.PERMISSIONS_ERROR.getErrorMessage())
-          .withId(Messages.PERMISSIONS_ERROR.getErrorMessage())
+          .withId(Messages.PERMISSIONS_ERROR.name())
           .withCategory(ErrorCategory.SECURITY).build());
     }
 
@@ -99,7 +99,7 @@ public class PermissionsManagerImpl implements PermissionsManager {
     } else {
         throw new CoreException(new ErrorCode.ErrorCodeBuilder()
             .withMessage(Messages.PERMISSIONS_OWNER_ERROR.getErrorMessage())
-            .withId(Messages.PERMISSIONS_OWNER_ERROR.getErrorMessage())
+            .withId(Messages.PERMISSIONS_OWNER_ERROR.name())
             .withCategory(ErrorCategory.SECURITY).build());
       }
     }
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/DeploymentFlavorErrorBuilder.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/DeploymentFlavorErrorBuilder.java
index 08fb7116bb..8fa8bd2088 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/DeploymentFlavorErrorBuilder.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/DeploymentFlavorErrorBuilder.java
@@ -16,7 +16,6 @@
 
 package org.openecomp.sdc.vendorsoftwareproduct.errors;
 
-
 import org.openecomp.sdc.common.errors.ErrorCategory;
 import org.openecomp.sdc.common.errors.ErrorCode;
 import org.openecomp.sdc.versioning.dao.types.Version;
@@ -25,8 +24,7 @@ public class DeploymentFlavorErrorBuilder {
     private static final String CREATE_DEPLOYMENT_FLAVOR_NOT_ALLOWED_IN_HEAT_ONBOARDING_MSG =
             "Deployment Flavor cannot be added for VSPs onboarded with HEAT.";
     private static final String FEATURE_GROUP_NOT_EXIST_FOR_VSP_MSG =
-            "Invalid request,Feature Group with Id %s does not exist for Vsp with Id %s and version "
-                    + "%s.";
+            "Invalid request, Feature Group provided does not exist for this Vsp.";
     private static final String INVALID_COMPONENT_COMPUTE_ASSOCIATION_MSG
             = "Invalid request,for valid association please provide ComponentId for Compute Flavor";
     private static final String SAME_VFC_ASSOCIATION_MORE_THAN_ONCE_NOT_ALLOWED_MSG =
@@ -36,7 +34,7 @@ public class DeploymentFlavorErrorBuilder {
     private static final String DEPLOYMENT_FLAVOUR_NAME_FORMAT_MSG = "Field does not conform to predefined criteria"
             + ": name : must match %s";
     private static final String INVALID_COMPUTE_FLAVOR_ID_MSG =
-            "Invalid request, Compute Flavor with Id %s does not exist for VFC with Id %s.";
+            "Invalid request, Compute Flavor provided does not exist for this VFC.";
     private static final String INVALID_COMPONENT_COMPUTE_ASSOCIATION_ERROR_MSG="VSP cannot be " +
             "submitted with an invalid Deployment Flavor. All Deployment Flavor should have atleast a VFC included with it's required Compute needs. " +
             "Please fix the Deployment Flavor %s and re-submit the VSP.";
@@ -62,8 +60,7 @@ public class DeploymentFlavorErrorBuilder {
         ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder();
         builder.withId(VendorSoftwareProductErrorCodes.FEATURE_GROUP_NOT_EXIST_FOR_VSP);
         builder.withCategory(ErrorCategory.APPLICATION);
-        builder.withMessage(String.format(FEATURE_GROUP_NOT_EXIST_FOR_VSP_MSG,featureGroupId,
-                vspId,activeVersion.toString()));
+        builder.withMessage(FEATURE_GROUP_NOT_EXIST_FOR_VSP_MSG);
         return builder.build();
     }