From ca0ce93fded7d05beef1bf4c2bce5ffc86efa4a4 Mon Sep 17 00:00:00 2001 From: will Date: Fri, 5 Nov 2010 21:25:19 -0700 Subject: [PATCH] Fixed all sync commands that can possibly return a tag. If success, it will return true, otherwise an HTTP error will be returned. --- .../commands/AssignToLoadBalancerRuleCmd.java | 11 +++++++---- .../api/commands/DeleteDiskOfferingCmd.java | 15 +++++---------- .../com/cloud/api/commands/DeleteDomainCmd.java | 16 +++++----------- .../com/cloud/api/commands/DeleteHostCmd.java | 15 +++++---------- .../api/commands/DeleteIPForwardingRuleCmd.java | 4 ++-- .../src/com/cloud/api/commands/DeleteIsoCmd.java | 4 ++-- .../api/commands/DeleteLoadBalancerRuleCmd.java | 4 ++-- .../api/commands/DeleteNetworkGroupCmd.java | 4 ++-- .../src/com/cloud/api/commands/DeletePodCmd.java | 4 ++-- .../com/cloud/api/commands/DeletePoolCmd.java | 4 ++-- .../api/commands/DeletePreallocatedLunCmd.java | 4 ++-- .../api/commands/DeleteRemoteAccessVpnCmd.java | 4 ++-- .../api/commands/DeleteServiceOfferingCmd.java | 4 ++-- .../cloud/api/commands/DeleteSnapshotCmd.java | 4 ++-- .../api/commands/DeleteSnapshotPoliciesCmd.java | 4 ++-- .../cloud/api/commands/DeleteTemplateCmd.java | 4 ++-- .../com/cloud/api/commands/DeleteUserCmd.java | 4 ++-- .../com/cloud/api/commands/DeleteVMGroupCmd.java | 4 ++-- .../cloud/api/commands/DeleteVlanIpRangeCmd.java | 4 ++-- .../com/cloud/api/commands/DeleteVolumeCmd.java | 4 ++-- .../com/cloud/api/commands/DeleteZoneCmd.java | 4 ++-- .../api/commands/DestroyConsoleProxyCmd.java | 4 ++-- .../src/com/cloud/api/commands/DetachIsoCmd.java | 4 ++-- .../api/commands/DisassociateIPAddrCmd.java | 4 ++-- .../commands/RemoveFromLoadBalancerRuleCmd.java | 4 ++-- .../com/cloud/api/commands/RemoveVpnUserCmd.java | 4 ++-- .../commands/RevokeNetworkGroupIngressCmd.java | 4 ++-- .../UpdateTemplateOrIsoPermissionsCmd.java | 4 ++-- .../api/response/ApiResponseSerializer.java | 2 ++ .../com/cloud/api/response/SuccessResponse.java | 4 ++++ 30 files changed, 76 insertions(+), 83 deletions(-) diff --git a/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java index 2e618b30140..e5521c19d24 100644 --- a/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java @@ -24,8 +24,10 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; +import com.cloud.api.BaseCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; +import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.network.LoadBalancerVO; @@ -97,9 +99,10 @@ public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - SuccessResponse response = new SuccessResponse(); - response.setSuccess(Boolean.TRUE); - response.setResponseName("success"); - return response; + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to assign to load balancer"); + } } } diff --git a/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java b/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java index 0e01f9b9219..3852db5e05c 100644 --- a/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java +++ b/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java @@ -60,15 +60,10 @@ public class DeleteDiskOfferingCmd extends BaseCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - SuccessResponse response = new SuccessResponse(); - Boolean responseObject = (Boolean)getResponseObject(); - - if (responseObject != null) { - response.setSuccess(responseObject); - } else { - throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete disk offering"); - } - - return response; + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete disk offering"); + } } } diff --git a/server/src/com/cloud/api/commands/DeleteDomainCmd.java b/server/src/com/cloud/api/commands/DeleteDomainCmd.java index 0920e023872..99a1c2e421e 100644 --- a/server/src/com/cloud/api/commands/DeleteDomainCmd.java +++ b/server/src/com/cloud/api/commands/DeleteDomainCmd.java @@ -90,16 +90,10 @@ public class DeleteDomainCmd extends BaseAsyncCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - Boolean responseObject = (Boolean)getResponseObject(); - - SuccessResponse response = new SuccessResponse(); - - if (responseObject != null) { - response.setSuccess(responseObject); - } else { - throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete host"); - } - - return response; + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete delete domain"); + } } } diff --git a/server/src/com/cloud/api/commands/DeleteHostCmd.java b/server/src/com/cloud/api/commands/DeleteHostCmd.java index 40cbb409930..3bf51891775 100644 --- a/server/src/com/cloud/api/commands/DeleteHostCmd.java +++ b/server/src/com/cloud/api/commands/DeleteHostCmd.java @@ -63,15 +63,10 @@ public class DeleteHostCmd extends BaseCmd { @Override@SuppressWarnings("unchecked") public SuccessResponse getResponse() { - SuccessResponse response = new SuccessResponse(); - Boolean responseObject = (Boolean)getResponseObject(); - - if (responseObject != null) { - response.setSuccess(responseObject); - } else { - throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete host"); - } - - return response; + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete host"); + } } } \ No newline at end of file diff --git a/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java b/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java index a0f198fc2c3..d141d51b32c 100644 --- a/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java @@ -59,8 +59,8 @@ public class DeleteIPForwardingRuleCmd extends BaseCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete port forwarding rule"); } diff --git a/server/src/com/cloud/api/commands/DeleteIsoCmd.java b/server/src/com/cloud/api/commands/DeleteIsoCmd.java index c69960443f8..d592ba49b62 100644 --- a/server/src/com/cloud/api/commands/DeleteIsoCmd.java +++ b/server/src/com/cloud/api/commands/DeleteIsoCmd.java @@ -75,8 +75,8 @@ public class DeleteIsoCmd extends BaseAsyncCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete iso"); } diff --git a/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java index 835eb19ca1b..64b3f5fca7a 100644 --- a/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java @@ -83,8 +83,8 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete load balancer rule"); } diff --git a/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java b/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java index 937e130494b..8276d0d8a38 100644 --- a/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java +++ b/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java @@ -57,8 +57,8 @@ public class DeleteNetworkGroupCmd extends BaseCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete security group"); } diff --git a/server/src/com/cloud/api/commands/DeletePodCmd.java b/server/src/com/cloud/api/commands/DeletePodCmd.java index 7e9a82e2bcf..41d1b231769 100644 --- a/server/src/com/cloud/api/commands/DeletePodCmd.java +++ b/server/src/com/cloud/api/commands/DeletePodCmd.java @@ -60,8 +60,8 @@ public class DeletePodCmd extends BaseCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete pod"); } diff --git a/server/src/com/cloud/api/commands/DeletePoolCmd.java b/server/src/com/cloud/api/commands/DeletePoolCmd.java index 23ed463e5ac..52d263ce959 100644 --- a/server/src/com/cloud/api/commands/DeletePoolCmd.java +++ b/server/src/com/cloud/api/commands/DeletePoolCmd.java @@ -43,8 +43,8 @@ public class DeletePoolCmd extends BaseCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if ((Boolean)getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete storage pool"); } diff --git a/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java b/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java index f46f7546c68..feee746ad88 100644 --- a/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java +++ b/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java @@ -54,8 +54,8 @@ public class DeletePreallocatedLunCmd extends BaseCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete preallocated lun"); } diff --git a/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java b/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java index e056d6555cf..40921b6b7c7 100644 --- a/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java +++ b/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java @@ -81,8 +81,8 @@ public class DeleteRemoteAccessVpnCmd extends BaseAsyncCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if ((Boolean)getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete remote access vpn"); } diff --git a/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java b/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java index 6da8822afe5..3c1dc6fb689 100644 --- a/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java +++ b/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java @@ -61,8 +61,8 @@ public class DeleteServiceOfferingCmd extends BaseCmd{ @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete service offering"); } diff --git a/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java b/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java index 703277dfd44..c217a03e29c 100644 --- a/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java +++ b/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java @@ -99,8 +99,8 @@ public class DeleteSnapshotCmd extends BaseAsyncCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete snapshot"); } diff --git a/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java b/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java index 938b4a904ad..fa6f868cc9a 100644 --- a/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java +++ b/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java @@ -85,8 +85,8 @@ public class DeleteSnapshotPoliciesCmd extends BaseCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete snapshot policy"); } diff --git a/server/src/com/cloud/api/commands/DeleteTemplateCmd.java b/server/src/com/cloud/api/commands/DeleteTemplateCmd.java index 8afcc10cebd..d2667d50523 100644 --- a/server/src/com/cloud/api/commands/DeleteTemplateCmd.java +++ b/server/src/com/cloud/api/commands/DeleteTemplateCmd.java @@ -77,8 +77,8 @@ public class DeleteTemplateCmd extends BaseAsyncCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete template"); } diff --git a/server/src/com/cloud/api/commands/DeleteUserCmd.java b/server/src/com/cloud/api/commands/DeleteUserCmd.java index c4b1abdde1b..5c2cbaee84f 100644 --- a/server/src/com/cloud/api/commands/DeleteUserCmd.java +++ b/server/src/com/cloud/api/commands/DeleteUserCmd.java @@ -92,8 +92,8 @@ public class DeleteUserCmd extends BaseAsyncCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete user"); } diff --git a/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java b/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java index 0bbc00a84bc..449c228895a 100644 --- a/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java @@ -58,8 +58,8 @@ public class DeleteVMGroupCmd extends BaseCmd{ @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete virtual machine group"); } diff --git a/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java b/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java index 0a368c18dd4..60b68039dbb 100644 --- a/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java @@ -60,8 +60,8 @@ public class DeleteVlanIpRangeCmd extends BaseCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete vlan ip range"); } diff --git a/server/src/com/cloud/api/commands/DeleteVolumeCmd.java b/server/src/com/cloud/api/commands/DeleteVolumeCmd.java index 4e45f94329f..51b00cde27a 100644 --- a/server/src/com/cloud/api/commands/DeleteVolumeCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVolumeCmd.java @@ -65,8 +65,8 @@ public class DeleteVolumeCmd extends BaseCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete volume"); } diff --git a/server/src/com/cloud/api/commands/DeleteZoneCmd.java b/server/src/com/cloud/api/commands/DeleteZoneCmd.java index 16b166a6844..0cf8ad708cd 100644 --- a/server/src/com/cloud/api/commands/DeleteZoneCmd.java +++ b/server/src/com/cloud/api/commands/DeleteZoneCmd.java @@ -62,8 +62,8 @@ public class DeleteZoneCmd extends BaseCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete zone"); } diff --git a/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java b/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java index aafb6f89be2..29a7bc44655 100644 --- a/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java +++ b/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java @@ -86,8 +86,8 @@ public class DestroyConsoleProxyCmd extends BaseAsyncCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete console proxy"); } diff --git a/server/src/com/cloud/api/commands/DetachIsoCmd.java b/server/src/com/cloud/api/commands/DetachIsoCmd.java index fbbcdfb18df..636436c3a96 100644 --- a/server/src/com/cloud/api/commands/DetachIsoCmd.java +++ b/server/src/com/cloud/api/commands/DetachIsoCmd.java @@ -84,8 +84,8 @@ public class DetachIsoCmd extends BaseAsyncCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to detach iso"); } diff --git a/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java b/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java index 4b51779a0a7..3add15bb7ac 100644 --- a/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java +++ b/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java @@ -59,8 +59,8 @@ public class DisassociateIPAddrCmd extends BaseCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to disassociate ip address"); } diff --git a/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java index c13aa7e50d9..a79b5ef1fb1 100644 --- a/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java @@ -107,8 +107,8 @@ public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to remove instance from load balancer rule"); } diff --git a/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java b/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java index 31676018b19..c78b7cdcf9a 100644 --- a/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java +++ b/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java @@ -86,8 +86,8 @@ public class RemoveVpnUserCmd extends BaseAsyncCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to remove vpn user"); } diff --git a/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java b/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java index 6ba9169f5b7..6f734002991 100644 --- a/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java +++ b/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java @@ -182,8 +182,8 @@ public class RevokeNetworkGroupIngressCmd extends BaseAsyncCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to revoke security group ingress rule"); } diff --git a/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java b/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java index e6de26db851..56485ac2cbd 100644 --- a/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java +++ b/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java @@ -81,8 +81,8 @@ public abstract class UpdateTemplateOrIsoPermissionsCmd extends BaseCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - if ((Boolean)getResponseObject()) { - return new SuccessResponse(); + if (getResponseObject() == null || (Boolean)getResponseObject()) { + return new SuccessResponse(getName()); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update template permissions"); } diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java b/server/src/com/cloud/api/response/ApiResponseSerializer.java index 2d8642a84bc..544e39eaf6f 100644 --- a/server/src/com/cloud/api/response/ApiResponseSerializer.java +++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java @@ -47,6 +47,8 @@ public class ApiResponseSerializer { } else { sb.append("{ }"); } + } else if (result instanceof SuccessResponse) { + sb.append("{ \"success\" : \""+((SuccessResponse)result).getSuccess()+"\"} "); } else { String jsonStr = gson.toJson(result); if ((jsonStr != null) && !"".equals(jsonStr)) { diff --git a/server/src/com/cloud/api/response/SuccessResponse.java b/server/src/com/cloud/api/response/SuccessResponse.java index 6317fa355f6..4dd4b8cef4f 100644 --- a/server/src/com/cloud/api/response/SuccessResponse.java +++ b/server/src/com/cloud/api/response/SuccessResponse.java @@ -25,4 +25,8 @@ public class SuccessResponse extends BaseResponse { public void setDisplayText(String displayText) { this.displayText = displayText; } + + public SuccessResponse(String responseName) { + super.setResponseName(responseName); + } }