aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest
diff options
context:
space:
mode:
authorayalaben <ayala.benzvi@amdocs.com>2018-02-13 12:44:17 +0200
committerAvi Gaffa <avi.gaffa@amdocs.com>2018-02-15 13:37:55 +0000
commitb4c4dbc6bbcd9995387c0716ee57f620c7a701df (patch)
tree8ff9d83fdc62c677bea4943cb328f292694bc27a /openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest
parent4e1b18cb2c939993558070c3a963d6fb6dca25db (diff)
Delete Item status Draft - Fix Errors
Change-Id: I2e602a82f70ac77545b70658a35bbeffaf713a9b Issue-ID: SDC-1014 Signed-off-by: ayalaben <ayala.benzvi@amdocs.com>
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest')
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/VendorLicenseModelsImpl.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/VendorLicenseModelsImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/VendorLicenseModelsImpl.java
index fd89989987..e5db536deb 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/VendorLicenseModelsImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/services/VendorLicenseModelsImpl.java
@@ -22,6 +22,8 @@ import org.openecomp.sdc.activitylog.ActivityLogManager;
import org.openecomp.sdc.activitylog.ActivityLogManagerFactory;
import org.openecomp.sdc.activitylog.dao.type.ActivityLogEntity;
import org.openecomp.sdc.activitylog.dao.type.ActivityType;
+import org.openecomp.sdc.common.errors.CoreException;
+import org.openecomp.sdc.common.errors.ErrorCode;
import org.openecomp.sdc.common.errors.Messages;
import org.openecomp.sdc.datatypes.model.ItemType;
import org.openecomp.sdc.healing.factory.HealingManagerFactory;
@@ -202,6 +204,12 @@ public class VendorLicenseModelsImpl implements VendorLicenseModels {
public Response deleteLicenseModel(String vlmId, String user) {
Item vlm = itemManager.get(vlmId);
+ if (!vlm.getType().equals(ItemType.vlm.name())){
+ throw new CoreException((new ErrorCode.ErrorCodeBuilder()
+ .withMessage(String.format("Vlm with id %s does not exist.",
+ vlmId)).build()));
+ }
+
Integer certifiedVersionsCounter = vlm.getVersionStatusCounters().get(VersionStatus.Certified);
if (Objects.isNull(certifiedVersionsCounter) || certifiedVersionsCounter == 0) {
itemManager.delete(vlm);
@@ -213,7 +221,7 @@ public class VendorLicenseModelsImpl implements VendorLicenseModels {
return Response.ok().build();
} else {
- return Response.status(Response.Status.PRECONDITION_FAILED)
+ return Response.status(Response.Status.FORBIDDEN)
.entity(new Exception(Messages.DELETE_VLM_ERROR.getErrorMessage())).build();
}
}