mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
Fixed all sync commands that can possibly return a <success> tag. If success, it will return true, otherwise an HTTP error will be returned.
This commit is contained in:
parent
eeb98499d5
commit
ca0ce93fde
@ -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");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -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)) {
|
||||
|
||||
@ -25,4 +25,8 @@ public class SuccessResponse extends BaseResponse {
|
||||
public void setDisplayText(String displayText) {
|
||||
this.displayText = displayText;
|
||||
}
|
||||
|
||||
public SuccessResponse(String responseName) {
|
||||
super.setResponseName(responseName);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user