diff --git a/core/src/com/cloud/serializer/Param.java b/core/src/com/cloud/serializer/Param.java index 8072b2d3779..da3579e3125 100644 --- a/core/src/com/cloud/serializer/Param.java +++ b/core/src/com/cloud/serializer/Param.java @@ -24,5 +24,6 @@ import java.lang.annotation.RetentionPolicy; @Retention(RetentionPolicy.RUNTIME) public @interface Param { String name() default ""; - String propName() default ""; + String propName() default ""; + String description() default ""; } diff --git a/server/.classpath b/server/.classpath index cefa0653a40..9546c1c9646 100644 --- a/server/.classpath +++ b/server/.classpath @@ -21,5 +21,6 @@ + diff --git a/server/src/com/cloud/api/ApiXmlDocBuilder.java b/server/src/com/cloud/api/ApiXmlDocBuilder.java deleted file mode 100644 index 7bc7f1bb594..00000000000 --- a/server/src/com/cloud/api/ApiXmlDocBuilder.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.cloud.api; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileWriter; -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Text; - -public class ApiXmlDocBuilder { - private static final Logger s_logger = Logger.getLogger(ApiXmlDocBuilder.class.getName()); - private static Properties api_commands = new Properties(); - private static String dirName=""; - - public static void main (String[] args) { - Properties preProcessedCommands = new Properties(); - Class clas = null; - - Enumeration e = null; - String[] fileNames = null; - - //load properties - List argsList = Arrays.asList(args); - Iterator iter = argsList.iterator(); - while (iter.hasNext()) { - String arg = iter.next(); - // populate the file names - if (arg.equals("-f")) { - fileNames = iter.next().split(","); - } - if (arg.equals("-d")) { - dirName = iter.next(); - } - } - - if ((fileNames == null) || (fileNames.length == 0)){ - System.out.println("Please specify input file(s) separated by coma using -f option"); - System.exit(2); - } - - for (String fileName : fileNames) { - try { - FileInputStream in = new FileInputStream(fileName); - preProcessedCommands.load(in); - }catch (FileNotFoundException ex) { - s_logger.error("Can't find file " + fileName); - System.exit(2); - } catch (IOException ex1) { - System.out.println("Error reading from file " + ex1); - System.exit(2); - } - } - - - for (Object key : preProcessedCommands.keySet()) { - String preProcessedCommand = preProcessedCommands.getProperty((String)key); - String[] commandParts = preProcessedCommand.split(";"); - api_commands.put(key, commandParts[0]); - } - - e = api_commands.propertyNames(); - - try { - DocumentBuilderFactory dbfac = DocumentBuilderFactory.newInstance(); - DocumentBuilder docBuilder = dbfac.newDocumentBuilder(); - Document doc = docBuilder.newDocument(); - Element root = doc.createElement("commands"); - doc.appendChild(root); - - while (e.hasMoreElements()) { - String key = (String) e.nextElement(); - try { - //Get command name and description - clas = Class.forName(api_commands.getProperty(key)); - Element commandElement = doc.createElement("command"); - root.appendChild(commandElement); - Element nameElement = doc.createElement("name"); - commandElement.appendChild(nameElement); - Text text = doc.createTextNode(key); - nameElement.appendChild(text); - - Annotation[] classAnnotations = clas.getAnnotations(); - for (Annotation a : classAnnotations) { - Class classAnnotation = a.annotationType(); - Method descriptionMethod = classAnnotation.getMethod("description"); - nameElement.setAttribute("description", descriptionMethod.invoke(a).toString()); - } - //Get input parameters - Element parameter = doc.createElement("arguments"); - commandElement.appendChild(parameter); - - Field[] fields = clas.getDeclaredFields(); - - for (Field f : fields) { - Parameter parameterAnnotation = f.getAnnotation(Parameter.class); - Element argElement = doc.createElement("arg"); - parameter.appendChild(argElement); - text = doc.createTextNode(parameterAnnotation.name()); - argElement.appendChild(text); - argElement.setAttribute("required", String.valueOf(parameterAnnotation.required())); - argElement.setAttribute("description", parameterAnnotation.description()); - } - - //Get response parameters - Element response = doc.createElement("response"); - commandElement.appendChild(response); - } catch (ClassNotFoundException ex2) { - System.out.println("Can't find class " + api_commands.getProperty(key)); - System.exit(2); - } - } - - TransformerFactory transfac = TransformerFactory.newInstance(); - Transformer trans = transfac.newTransformer(); - trans.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); - trans.setOutputProperty(OutputKeys.INDENT, "yes"); - - StringWriter sw = new StringWriter(); - StreamResult result = new StreamResult(sw); - DOMSource source = new DOMSource(doc); - trans.transform(source, result); - String xmlString = sw.toString(); - - //write xml to file - File f=new File(dirName + "/commands.xml"); - Writer output = new BufferedWriter(new FileWriter(f)); - output.write(xmlString); - output.close(); - } catch (Exception ex) { - System.out.println("Exception" + ex); - System.exit(2); - } - } -} \ No newline at end of file diff --git a/server/src/com/cloud/api/BaseCmd.java b/server/src/com/cloud/api/BaseCmd.java index 62572b2c095..af9e4f5173b 100755 --- a/server/src/com/cloud/api/BaseCmd.java +++ b/server/src/com/cloud/api/BaseCmd.java @@ -108,7 +108,7 @@ public abstract class BaseCmd { } public abstract String getName(); - public abstract ResponseObject getResponse(); + public abstract T getResponse(); public Object getResponseObject() { return _responseObject; diff --git a/server/src/com/cloud/api/commands/AddConfigCmd.java b/server/src/com/cloud/api/commands/AddConfigCmd.java index ac2cc21fa81..9d5a7a80e5a 100644 --- a/server/src/com/cloud/api/commands/AddConfigCmd.java +++ b/server/src/com/cloud/api/commands/AddConfigCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.ConfigurationResponse; import com.cloud.configuration.ConfigurationVO; @@ -95,8 +94,8 @@ public class AddConfigCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public ConfigurationResponse getResponse() { ConfigurationResponse response = new ConfigurationResponse(); ConfigurationVO responseObject = (ConfigurationVO)getResponseObject(); if (responseObject != null) { diff --git a/server/src/com/cloud/api/commands/AddHostCmd.java b/server/src/com/cloud/api/commands/AddHostCmd.java index 258a2a1a261..ec473e2c26e 100644 --- a/server/src/com/cloud/api/commands/AddHostCmd.java +++ b/server/src/com/cloud/api/commands/AddHostCmd.java @@ -31,7 +31,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.HostResponse; import com.cloud.api.response.ListResponse; @@ -118,10 +117,10 @@ public class AddHostCmd extends BaseCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List hosts = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List hostResponses = new ArrayList(); if (hosts != null) { for (HostVO host : hosts) { diff --git a/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java b/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java index 3e632ffc09d..d6931ab3f02 100644 --- a/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java +++ b/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java @@ -31,7 +31,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.HostResponse; import com.cloud.api.response.ListResponse; @@ -77,10 +76,10 @@ public class AddSecondaryStorageCmd extends BaseCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List hosts = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List hostResponses = new ArrayList(); if (hosts != null) { for (HostVO host : hosts) { diff --git a/server/src/com/cloud/api/commands/AssignPortForwardingServiceCmd.java b/server/src/com/cloud/api/commands/AssignPortForwardingServiceCmd.java index 9a9d856454a..b279ab6fcea 100644 --- a/server/src/com/cloud/api/commands/AssignPortForwardingServiceCmd.java +++ b/server/src/com/cloud/api/commands/AssignPortForwardingServiceCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="assignSecurityGroup", manager=Manager.ManagementServer) @@ -81,8 +80,8 @@ public class AssignPortForwardingServiceCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java index 33f01e221da..70888969be3 100644 --- a/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="assignToLoadBalancer", manager=Manager.NetworkManager) @@ -71,8 +70,8 @@ public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); response.setSuccess(Boolean.TRUE); response.setResponseName(getName()); diff --git a/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java b/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java index 094a59cfe54..f87df59d7c3 100644 --- a/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java +++ b/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.IPAddressResponse; import com.cloud.dc.Vlan.VlanType; import com.cloud.dc.VlanVO; @@ -80,7 +79,8 @@ public class AssociateIPAddrCmd extends BaseCmd { return "addressinfo"; } - public ResponseObject getResponse() { + @SuppressWarnings("unchecked") + public IPAddressResponse getResponse() { IPAddressVO ipAddress = (IPAddressVO)getResponseObject(); VlanVO vlan = ApiDBUtils.findVlanById(ipAddress.getVlanDbId()); diff --git a/server/src/com/cloud/api/commands/AttachIsoCmd.java b/server/src/com/cloud/api/commands/AttachIsoCmd.java index 5d068364b15..e5697d12bd1 100644 --- a/server/src/com/cloud/api/commands/AttachIsoCmd.java +++ b/server/src/com/cloud/api/commands/AttachIsoCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; @@ -67,8 +66,8 @@ public class AttachIsoCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); Boolean responseObject = (Boolean)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/AttachVolumeCmd.java b/server/src/com/cloud/api/commands/AttachVolumeCmd.java index f4df6449d76..34b82af39aa 100644 --- a/server/src/com/cloud/api/commands/AttachVolumeCmd.java +++ b/server/src/com/cloud/api/commands/AttachVolumeCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.VolumeResponse; import com.cloud.storage.VolumeVO; import com.cloud.uservm.UserVm; @@ -75,8 +74,8 @@ public class AttachVolumeCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public VolumeResponse getResponse() { VolumeVO volume = ApiDBUtils.findVolumeById(id); VolumeResponse response = new VolumeResponse(); UserVm instance = ApiDBUtils.findUserVmById(volume.getInstanceId()); diff --git a/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java b/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java index 84651f05844..ea37205bb54 100644 --- a/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java +++ b/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java @@ -28,7 +28,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.IngressRuleResponse; import com.cloud.api.response.ListResponse; import com.cloud.network.security.IngressRuleVO; @@ -136,10 +135,10 @@ public class AuthorizeNetworkGroupIngressCmd extends BaseAsyncCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List ingressRules = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); if ((ingressRules != null) && !ingressRules.isEmpty()) { List responses = new ArrayList(); for (IngressRuleVO ingressRule : ingressRules) { diff --git a/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java b/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java index 6a00b0cc90d..bc31f6cff18 100644 --- a/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java @@ -26,13 +26,12 @@ import java.util.Set; import org.apache.log4j.Logger; +import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; -import com.cloud.api.response.HostResponse; -import com.cloud.api.ApiDBUtils; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; +import com.cloud.api.response.HostResponse; import com.cloud.dc.HostPodVO; import com.cloud.host.Host; import com.cloud.host.HostStats; @@ -77,8 +76,8 @@ public class CancelMaintenanceCmd extends BaseAsyncCmd { return "host"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public HostResponse getResponse() { HostVO host = (HostVO)getResponseObject(); HostResponse response = new HostResponse(); diff --git a/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java b/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java index 8aaad3300a8..663fb5f86c4 100644 --- a/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java @@ -20,12 +20,11 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; +import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; -import com.cloud.api.ApiDBUtils; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.StoragePoolResponse; import com.cloud.dc.ClusterVO; import com.cloud.storage.StoragePoolVO; @@ -66,8 +65,8 @@ public class CancelPrimaryStorageMaintenanceCmd extends BaseAsyncCmd { return "primarystorage"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public StoragePoolResponse getResponse() { StoragePoolVO primaryStorage = (StoragePoolVO)getResponseObject(); StoragePoolResponse response = new StoragePoolResponse(); diff --git a/server/src/com/cloud/api/commands/CopyIsoCmd.java b/server/src/com/cloud/api/commands/CopyIsoCmd.java index 1d048b28d92..517fe29e3cd 100644 --- a/server/src/com/cloud/api/commands/CopyIsoCmd.java +++ b/server/src/com/cloud/api/commands/CopyIsoCmd.java @@ -26,7 +26,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.TemplateResponse; import com.cloud.storage.GuestOS; @@ -84,8 +83,8 @@ public class CopyIsoCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public TemplateResponse getResponse() { TemplateResponse isoResponse = new TemplateResponse(); VMTemplateVO iso = (VMTemplateVO)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/CopyTemplateCmd.java b/server/src/com/cloud/api/commands/CopyTemplateCmd.java index 7da51b33366..edb5f80fda7 100644 --- a/server/src/com/cloud/api/commands/CopyTemplateCmd.java +++ b/server/src/com/cloud/api/commands/CopyTemplateCmd.java @@ -26,7 +26,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.TemplateResponse; import com.cloud.storage.GuestOS; @@ -85,8 +84,8 @@ public class CopyTemplateCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public TemplateResponse getResponse() { TemplateResponse templateResponse = new TemplateResponse(); VMTemplateVO template = (VMTemplateVO)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java b/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java index b0c98db232a..4f5678b57b2 100755 --- a/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java +++ b/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.DiskOfferingResponse; import com.cloud.storage.DiskOfferingVO; @@ -87,8 +86,8 @@ public class CreateDiskOfferingCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public DiskOfferingResponse getResponse() { DiskOfferingResponse response = new DiskOfferingResponse(); DiskOfferingVO responseObject = (DiskOfferingVO)getResponseObject(); if (responseObject != null) { diff --git a/server/src/com/cloud/api/commands/CreateDomainCmd.java b/server/src/com/cloud/api/commands/CreateDomainCmd.java index 5fabea53661..424cab2dd19 100644 --- a/server/src/com/cloud/api/commands/CreateDomainCmd.java +++ b/server/src/com/cloud/api/commands/CreateDomainCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.DomainResponse; import com.cloud.domain.DomainVO; @@ -67,8 +66,8 @@ public class CreateDomainCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public DomainResponse getResponse() { DomainResponse response = new DomainResponse(); DomainVO responseObject = (DomainVO)getResponseObject(); if (responseObject != null) { diff --git a/server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java b/server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java index 3074808693b..e6ce31b619b 100644 --- a/server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.FirewallRuleResponse; import com.cloud.network.FirewallRuleVO; import com.cloud.uservm.UserVm; @@ -90,8 +89,8 @@ public class CreateIPForwardingRuleCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public FirewallRuleResponse getResponse() { FirewallRuleVO fwRule = (FirewallRuleVO)getResponseObject(); FirewallRuleResponse fwResponse = new FirewallRuleResponse(); diff --git a/server/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java index 7a5ee6cc800..77ced0057ec 100644 --- a/server/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.LoadBalancerResponse; import com.cloud.network.LoadBalancerVO; @@ -95,8 +94,8 @@ public class CreateLoadBalancerRuleCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public LoadBalancerResponse getResponse() { LoadBalancerVO responseObj = (LoadBalancerVO)getResponseObject(); LoadBalancerResponse response = new LoadBalancerResponse(); diff --git a/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java b/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java index 2f987515141..5a579f05fca 100644 --- a/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java +++ b/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.NetworkGroupResponse; import com.cloud.network.security.NetworkGroupVO; @@ -80,8 +79,8 @@ public class CreateNetworkGroupCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public NetworkGroupResponse getResponse() { NetworkGroupVO group = (NetworkGroupVO)getResponseObject(); NetworkGroupResponse response = new NetworkGroupResponse(); diff --git a/server/src/com/cloud/api/commands/CreatePodCmd.java b/server/src/com/cloud/api/commands/CreatePodCmd.java index 0e00c8a7edd..e474dc1e478 100644 --- a/server/src/com/cloud/api/commands/CreatePodCmd.java +++ b/server/src/com/cloud/api/commands/CreatePodCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.PodResponse; import com.cloud.dc.HostPodVO; @@ -95,8 +94,8 @@ public class CreatePodCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public PodResponse getResponse() { HostPodVO pod = (HostPodVO)getResponseObject(); PodResponse response = new PodResponse(); diff --git a/server/src/com/cloud/api/commands/CreatePortForwardingServiceCmd.java b/server/src/com/cloud/api/commands/CreatePortForwardingServiceCmd.java index eea1dc9c856..1ab7b2f0f90 100644 --- a/server/src/com/cloud/api/commands/CreatePortForwardingServiceCmd.java +++ b/server/src/com/cloud/api/commands/CreatePortForwardingServiceCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SecurityGroupResponse; import com.cloud.network.SecurityGroupVO; @@ -81,8 +80,8 @@ public class CreatePortForwardingServiceCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SecurityGroupResponse getResponse() { SecurityGroupVO group = (SecurityGroupVO)getResponseObject(); SecurityGroupResponse response = new SecurityGroupResponse(); diff --git a/server/src/com/cloud/api/commands/CreatePortForwardingServiceRuleCmd.java b/server/src/com/cloud/api/commands/CreatePortForwardingServiceRuleCmd.java index 3561f86f17d..cb3aa859e7d 100644 --- a/server/src/com/cloud/api/commands/CreatePortForwardingServiceRuleCmd.java +++ b/server/src/com/cloud/api/commands/CreatePortForwardingServiceRuleCmd.java @@ -23,7 +23,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseAsyncCreateCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.PortForwardingServiceRuleResponse; import com.cloud.network.NetworkRuleConfigVO; @@ -84,8 +83,8 @@ public class CreatePortForwardingServiceRuleCmd extends BaseAsyncCreateCmd { return "portforwardingservicerule"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public PortForwardingServiceRuleResponse getResponse() { NetworkRuleConfigVO netRule = (NetworkRuleConfigVO)getResponseObject(); PortForwardingServiceRuleResponse response = new PortForwardingServiceRuleResponse(); diff --git a/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java b/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java index 89514bcdcb2..47c08248812 100644 --- a/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java +++ b/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ServiceOfferingResponse; import com.cloud.service.ServiceOfferingVO; @@ -113,8 +112,8 @@ public class CreateServiceOfferingCmd extends BaseCmd { return _name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public ServiceOfferingResponse getResponse() { ServiceOfferingVO offering = (ServiceOfferingVO)getResponseObject(); ServiceOfferingResponse response = new ServiceOfferingResponse(); diff --git a/server/src/com/cloud/api/commands/CreateSnapshotCmd.java b/server/src/com/cloud/api/commands/CreateSnapshotCmd.java index 1ec76ea0ffc..604517e6425 100644 --- a/server/src/com/cloud/api/commands/CreateSnapshotCmd.java +++ b/server/src/com/cloud/api/commands/CreateSnapshotCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseAsyncCreateCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SnapshotResponse; import com.cloud.storage.Snapshot.SnapshotType; import com.cloud.storage.SnapshotVO; @@ -79,8 +78,8 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd { return "snapshot"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SnapshotResponse getResponse() { SnapshotVO snapshot = (SnapshotVO)getResponseObject(); SnapshotResponse response = new SnapshotResponse(); diff --git a/server/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java b/server/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java index 139f222adcc..e9cccd09590 100644 --- a/server/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java +++ b/server/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SnapshotPolicyResponse; import com.cloud.storage.SnapshotPolicyVO; @@ -102,8 +101,8 @@ public class CreateSnapshotPolicyCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SnapshotPolicyResponse getResponse() { SnapshotPolicyVO snapshotPolicy = (SnapshotPolicyVO)getResponseObject(); SnapshotPolicyResponse response = new SnapshotPolicyResponse(); diff --git a/server/src/com/cloud/api/commands/CreateStoragePoolCmd.java b/server/src/com/cloud/api/commands/CreateStoragePoolCmd.java index 95e4c3645f6..b5fbb923fd2 100644 --- a/server/src/com/cloud/api/commands/CreateStoragePoolCmd.java +++ b/server/src/com/cloud/api/commands/CreateStoragePoolCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.StoragePoolResponse; import com.cloud.storage.StoragePoolVO; import com.cloud.storage.StorageStats; @@ -105,8 +104,8 @@ public class CreateStoragePoolCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public StoragePoolResponse getResponse() { StoragePoolVO pool = (StoragePoolVO)getResponseObject(); StoragePoolResponse response = new StoragePoolResponse(); diff --git a/server/src/com/cloud/api/commands/CreateTemplateCmd.java b/server/src/com/cloud/api/commands/CreateTemplateCmd.java index 9107364f2f0..3e4d8df16de 100644 --- a/server/src/com/cloud/api/commands/CreateTemplateCmd.java +++ b/server/src/com/cloud/api/commands/CreateTemplateCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseAsyncCreateCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.TemplateResponse; import com.cloud.dc.DataCenterVO; import com.cloud.storage.GuestOS; @@ -132,8 +131,8 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd { return "template"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public TemplateResponse getResponse() { VMTemplateVO template = (VMTemplateVO)getResponseObject(); TemplateResponse response = new TemplateResponse(); diff --git a/server/src/com/cloud/api/commands/CreateUserCmd.java b/server/src/com/cloud/api/commands/CreateUserCmd.java index 5a9e1c1a17a..21950466de6 100644 --- a/server/src/com/cloud/api/commands/CreateUserCmd.java +++ b/server/src/com/cloud/api/commands/CreateUserCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.UserResponse; import com.cloud.user.UserAccount; @@ -116,8 +115,8 @@ public class CreateUserCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public UserResponse getResponse() { UserAccount user = (UserAccount)getResponseObject(); // TODO: user keys? diff --git a/server/src/com/cloud/api/commands/CreateVMGroupCmd.java b/server/src/com/cloud/api/commands/CreateVMGroupCmd.java index d17b862eb91..d615872c7fa 100644 --- a/server/src/com/cloud/api/commands/CreateVMGroupCmd.java +++ b/server/src/com/cloud/api/commands/CreateVMGroupCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.InstanceGroupResponse; import com.cloud.user.Account; import com.cloud.vm.InstanceGroupVO; @@ -73,8 +72,8 @@ public class CreateVMGroupCmd extends BaseCmd{ return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public InstanceGroupResponse getResponse() { InstanceGroupVO group = (InstanceGroupVO)getResponseObject(); InstanceGroupResponse response = new InstanceGroupResponse(); diff --git a/server/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java b/server/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java index 8e53a3e4323..3cc953fa4f1 100644 --- a/server/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java +++ b/server/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.VlanIpRangeResponse; import com.cloud.dc.VlanVO; @@ -124,8 +123,8 @@ public class CreateVlanIpRangeCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public VlanIpRangeResponse getResponse() { VlanVO vlan = (VlanVO)getResponseObject(); String domainNameResponse = null; diff --git a/server/src/com/cloud/api/commands/CreateVolumeCmd.java b/server/src/com/cloud/api/commands/CreateVolumeCmd.java index a1e27f5ca5e..04c781dd961 100644 --- a/server/src/com/cloud/api/commands/CreateVolumeCmd.java +++ b/server/src/com/cloud/api/commands/CreateVolumeCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseAsyncCreateCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.VolumeResponse; import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.VolumeVO; @@ -107,8 +106,8 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd { return "volume"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public VolumeResponse getResponse() { VolumeVO volume = (VolumeVO)getResponseObject(); VolumeResponse response = new VolumeResponse(); diff --git a/server/src/com/cloud/api/commands/CreateZoneCmd.java b/server/src/com/cloud/api/commands/CreateZoneCmd.java index a93a6983966..cd7ffbbff65 100644 --- a/server/src/com/cloud/api/commands/CreateZoneCmd.java +++ b/server/src/com/cloud/api/commands/CreateZoneCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ZoneResponse; import com.cloud.dc.DataCenterVO; @@ -101,8 +100,8 @@ public class CreateZoneCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public ZoneResponse getResponse() { DataCenterVO zone = (DataCenterVO)getResponseObject(); ZoneResponse response = new ZoneResponse(); diff --git a/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java b/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java index de537e285f4..0a51b654960 100644 --- a/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java +++ b/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; @@ -58,8 +57,8 @@ public class DeleteDiskOfferingCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); Boolean responseObject = (Boolean)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/DeleteDomainCmd.java b/server/src/com/cloud/api/commands/DeleteDomainCmd.java index c3620cde427..570c0c751c1 100644 --- a/server/src/com/cloud/api/commands/DeleteDomainCmd.java +++ b/server/src/com/cloud/api/commands/DeleteDomainCmd.java @@ -22,7 +22,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.DeleteDomainResponse; @Implementation(method="deleteDomain") @@ -63,8 +62,8 @@ public class DeleteDomainCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public DeleteDomainResponse getResponse() { String deleteResult = (String)getResponseObject(); DeleteDomainResponse response = new DeleteDomainResponse(); diff --git a/server/src/com/cloud/api/commands/DeleteHostCmd.java b/server/src/com/cloud/api/commands/DeleteHostCmd.java index 6240cc03b80..e3e07951a5d 100644 --- a/server/src/com/cloud/api/commands/DeleteHostCmd.java +++ b/server/src/com/cloud/api/commands/DeleteHostCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; @@ -61,8 +60,8 @@ public class DeleteHostCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override@SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); Boolean responseObject = (Boolean)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java b/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java index 830f7e5cea4..513dd50a86c 100644 --- a/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="deleteIpForwardingRule", manager=Manager.NetworkManager) @@ -56,8 +55,8 @@ public class DeleteIPForwardingRuleCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DeleteIsoCmd.java b/server/src/com/cloud/api/commands/DeleteIsoCmd.java index 1981287d251..7904e7c30ec 100644 --- a/server/src/com/cloud/api/commands/DeleteIsoCmd.java +++ b/server/src/com/cloud/api/commands/DeleteIsoCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; @@ -69,8 +68,8 @@ public class DeleteIsoCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); Boolean responseObject = (Boolean)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java index e1660208eac..9dbeb326abe 100644 --- a/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="deleteLoadBalancerRule", manager=Manager.NetworkManager) @@ -55,8 +54,8 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java b/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java index d10df9a2adb..4a2635b9a3d 100644 --- a/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java +++ b/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java @@ -6,7 +6,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="deleteNetworkGroup", manager=Manager.NetworkGroupManager) @@ -54,8 +53,8 @@ public class DeleteNetworkGroupCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); response.setSuccess(Boolean.TRUE); response.setResponseName(getName()); diff --git a/server/src/com/cloud/api/commands/DeletePodCmd.java b/server/src/com/cloud/api/commands/DeletePodCmd.java index 1a2d33e8fe2..a94f85eea5f 100644 --- a/server/src/com/cloud/api/commands/DeletePodCmd.java +++ b/server/src/com/cloud/api/commands/DeletePodCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; @@ -58,8 +57,8 @@ public class DeletePodCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); Boolean responseObject = (Boolean)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/DeletePoolCmd.java b/server/src/com/cloud/api/commands/DeletePoolCmd.java index fd7a59b3299..25d012f4fe0 100644 --- a/server/src/com/cloud/api/commands/DeletePoolCmd.java +++ b/server/src/com/cloud/api/commands/DeletePoolCmd.java @@ -6,7 +6,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; @@ -41,8 +40,8 @@ public class DeletePoolCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); Boolean responseObject = (Boolean)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/DeletePortForwardingServiceCmd.java b/server/src/com/cloud/api/commands/DeletePortForwardingServiceCmd.java index b8e883b895f..4e3adf21334 100644 --- a/server/src/com/cloud/api/commands/DeletePortForwardingServiceCmd.java +++ b/server/src/com/cloud/api/commands/DeletePortForwardingServiceCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; @@ -58,8 +57,8 @@ public class DeletePortForwardingServiceCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); Boolean responseObject = (Boolean)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/DeletePortForwardingServiceRuleCmd.java b/server/src/com/cloud/api/commands/DeletePortForwardingServiceRuleCmd.java index 25099844831..cfd64de8635 100644 --- a/server/src/com/cloud/api/commands/DeletePortForwardingServiceRuleCmd.java +++ b/server/src/com/cloud/api/commands/DeletePortForwardingServiceRuleCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="deleteNetworkRuleConfig", manager=Manager.NetworkManager) @@ -57,8 +56,8 @@ public class DeletePortForwardingServiceRuleCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java b/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java index bd312b06df3..e3416cabbcc 100644 --- a/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java +++ b/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java @@ -20,7 +20,6 @@ package com.cloud.api.commands; import com.cloud.api.BaseCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.DeletePreallocatedLunResponse; @Implementation(method="unregisterPreallocatedLun") @@ -51,8 +50,8 @@ public class DeletePreallocatedLunCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public DeletePreallocatedLunResponse getResponse() { Boolean result = (Boolean)getResponseObject(); DeletePreallocatedLunResponse response = new DeletePreallocatedLunResponse(); diff --git a/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java b/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java index 6527d000098..1d890557b71 100644 --- a/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java +++ b/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="deleteServiceOffering", manager=Manager.ConfigManager) @@ -58,8 +57,8 @@ public class DeleteServiceOfferingCmd extends BaseCmd{ return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java b/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java index 51f2dc7603a..71e94909919 100644 --- a/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java +++ b/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="deleteSnapshot", manager=Manager.SnapshotManager) @@ -72,8 +71,8 @@ public class DeleteSnapshotCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java b/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java index ec02cc20fcf..a38d913277c 100644 --- a/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java +++ b/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java @@ -26,7 +26,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="deleteSnapshotPolicies", manager=Manager.SnapshotManager) @@ -82,8 +81,8 @@ public class DeleteSnapshotPoliciesCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DeleteTemplateCmd.java b/server/src/com/cloud/api/commands/DeleteTemplateCmd.java index 294da8379ad..031c5a0fbf0 100644 --- a/server/src/com/cloud/api/commands/DeleteTemplateCmd.java +++ b/server/src/com/cloud/api/commands/DeleteTemplateCmd.java @@ -22,10 +22,9 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; -import com.cloud.api.response.SuccessResponse; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; +import com.cloud.api.response.SuccessResponse; @Implementation(method="deleteTemplate", manager=Manager.TemplateManager) public class DeleteTemplateCmd extends BaseCmd { @@ -69,8 +68,8 @@ public class DeleteTemplateCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DeleteUserCmd.java b/server/src/com/cloud/api/commands/DeleteUserCmd.java index 3bf852a976b..68c093b6cf6 100644 --- a/server/src/com/cloud/api/commands/DeleteUserCmd.java +++ b/server/src/com/cloud/api/commands/DeleteUserCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="deleteUser", manager=Manager.ManagementServer) @@ -62,8 +61,8 @@ public class DeleteUserCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java b/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java index 56e810fab11..ff5bf91cb91 100644 --- a/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="deleteVmGroup", manager=Manager.UserVmManager) @@ -55,8 +54,8 @@ public class DeleteVMGroupCmd extends BaseCmd{ return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); diff --git a/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java b/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java index a57afa0d802..315f614a8eb 100644 --- a/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="deleteVlanIpRange", manager=Manager.ConfigManager) @@ -57,8 +56,8 @@ public class DeleteVlanIpRangeCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DeleteVolumeCmd.java b/server/src/com/cloud/api/commands/DeleteVolumeCmd.java index 02f3245dc75..d5975d5ddd7 100644 --- a/server/src/com/cloud/api/commands/DeleteVolumeCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVolumeCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="deleteVolume", manager=Manager.StorageManager) @@ -62,8 +61,8 @@ public class DeleteVolumeCmd extends BaseCmd { return "volume"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DeleteZoneCmd.java b/server/src/com/cloud/api/commands/DeleteZoneCmd.java index a9eccd4de7b..58da9f5389c 100644 --- a/server/src/com/cloud/api/commands/DeleteZoneCmd.java +++ b/server/src/com/cloud/api/commands/DeleteZoneCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="deleteZone", manager=Manager.ConfigManager) @@ -59,8 +58,8 @@ public class DeleteZoneCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DeployVMCmd.java b/server/src/com/cloud/api/commands/DeployVMCmd.java index e7e569faeb0..6c92f707db3 100644 --- a/server/src/com/cloud/api/commands/DeployVMCmd.java +++ b/server/src/com/cloud/api/commands/DeployVMCmd.java @@ -154,8 +154,8 @@ public class DeployVMCmd extends BaseAsyncCmd { return "virtualmachine"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public UserVmResponse getResponse() { UserVm userVm = (UserVm)getResponseObject(); UserVmResponse response = new UserVmResponse(); diff --git a/server/src/com/cloud/api/commands/DestroyVMCmd.java b/server/src/com/cloud/api/commands/DestroyVMCmd.java index 71338725a87..c0b859bd84f 100644 --- a/server/src/com/cloud/api/commands/DestroyVMCmd.java +++ b/server/src/com/cloud/api/commands/DestroyVMCmd.java @@ -55,8 +55,8 @@ public class DestroyVMCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); diff --git a/server/src/com/cloud/api/commands/DetachIsoCmd.java b/server/src/com/cloud/api/commands/DetachIsoCmd.java index 5f11a157403..198b4e8abf6 100644 --- a/server/src/com/cloud/api/commands/DetachIsoCmd.java +++ b/server/src/com/cloud/api/commands/DetachIsoCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="detachIso", manager=Manager.TemplateManager) @@ -56,8 +55,8 @@ public class DetachIsoCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DetachVolumeCmd.java b/server/src/com/cloud/api/commands/DetachVolumeCmd.java index 67707940c45..c0bcb1471a3 100644 --- a/server/src/com/cloud/api/commands/DetachVolumeCmd.java +++ b/server/src/com/cloud/api/commands/DetachVolumeCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="detachVolumeFromVM", manager=Manager.UserVmManager) @@ -73,8 +72,8 @@ public class DetachVolumeCmd extends BaseAsyncCmd { return "volume"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DisableAccountCmd.java b/server/src/com/cloud/api/commands/DisableAccountCmd.java index e705663db1c..153710ee7d2 100644 --- a/server/src/com/cloud/api/commands/DisableAccountCmd.java +++ b/server/src/com/cloud/api/commands/DisableAccountCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="disableAccount", manager=Manager.ManagementServer) @@ -62,8 +61,8 @@ public class DisableAccountCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DisableUserCmd.java b/server/src/com/cloud/api/commands/DisableUserCmd.java index e52135212d2..76f54e3557d 100644 --- a/server/src/com/cloud/api/commands/DisableUserCmd.java +++ b/server/src/com/cloud/api/commands/DisableUserCmd.java @@ -22,7 +22,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="disableUser") @@ -54,8 +53,8 @@ public class DisableUserCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java b/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java index 2f2df83647b..dc431e3c01b 100644 --- a/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java +++ b/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="disassociateIpAddress", manager=Manager.NetworkManager) @@ -56,8 +55,8 @@ public class DisassociateIPAddrCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/EnableAccountCmd.java b/server/src/com/cloud/api/commands/EnableAccountCmd.java index bb697364195..ef3c04cee21 100644 --- a/server/src/com/cloud/api/commands/EnableAccountCmd.java +++ b/server/src/com/cloud/api/commands/EnableAccountCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; @@ -63,8 +62,8 @@ public class EnableAccountCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); Boolean responseObject = (Boolean)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/EnableUserCmd.java b/server/src/com/cloud/api/commands/EnableUserCmd.java index 343d9ba2eee..4f4adf663b5 100644 --- a/server/src/com/cloud/api/commands/EnableUserCmd.java +++ b/server/src/com/cloud/api/commands/EnableUserCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; @@ -58,8 +57,8 @@ public class EnableUserCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); Boolean responseObject = (Boolean)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/ExtractIsoCmd.java b/server/src/com/cloud/api/commands/ExtractIsoCmd.java index 60bba246ddb..0d284abacd4 100755 --- a/server/src/com/cloud/api/commands/ExtractIsoCmd.java +++ b/server/src/com/cloud/api/commands/ExtractIsoCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ExtractResponse; @Implementation(method="extract", manager=Manager.TemplateManager) @@ -70,8 +69,8 @@ public class ExtractIsoCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public ExtractResponse getResponse() { ExtractResponse response = (ExtractResponse)getResponseObject(); response.setResponseName(getName()); return response; diff --git a/server/src/com/cloud/api/commands/ExtractTemplateCmd.java b/server/src/com/cloud/api/commands/ExtractTemplateCmd.java index 37af6f637b5..e494334819d 100755 --- a/server/src/com/cloud/api/commands/ExtractTemplateCmd.java +++ b/server/src/com/cloud/api/commands/ExtractTemplateCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ExtractResponse; @Implementation(method="extract", manager=Manager.TemplateManager) @@ -74,8 +73,8 @@ public class ExtractTemplateCmd extends BaseAsyncCmd { return "ExtractTemplate"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public ExtractResponse getResponse() { ExtractResponse response = (ExtractResponse)getResponseObject(); response.setResponseName(getName()); return response; diff --git a/server/src/com/cloud/api/commands/ExtractVolumeCmd.java b/server/src/com/cloud/api/commands/ExtractVolumeCmd.java index 6e98f52bedb..28da6ae72f8 100755 --- a/server/src/com/cloud/api/commands/ExtractVolumeCmd.java +++ b/server/src/com/cloud/api/commands/ExtractVolumeCmd.java @@ -22,7 +22,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ExtractResponse; @Implementation(method="extractVolume") @@ -69,8 +68,8 @@ public class ExtractVolumeCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public ExtractResponse getResponse() { ExtractResponse response = (ExtractResponse)getResponseObject(); response.setResponseName(getName()); return response; diff --git a/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java b/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java index d347e346c68..0eb4061d89e 100644 --- a/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java +++ b/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java @@ -26,7 +26,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.CloudIdentifierResponse; @@ -61,7 +60,7 @@ public class GetCloudIdentifierCmd extends BaseCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public CloudIdentifierResponse getResponse() { CloudIdentifierResponse response = new CloudIdentifierResponse(); ArrayList responseObject = (ArrayList)getResponseObject(); if (responseObject != null) { diff --git a/server/src/com/cloud/api/commands/ListAccountsCmd.java b/server/src/com/cloud/api/commands/ListAccountsCmd.java index 269f780826c..959090467ee 100644 --- a/server/src/com/cloud/api/commands/ListAccountsCmd.java +++ b/server/src/com/cloud/api/commands/ListAccountsCmd.java @@ -28,7 +28,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.AccountResponse; import com.cloud.api.response.ListResponse; @@ -114,10 +113,10 @@ public class ListAccountsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List accounts = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List accountResponses = new ArrayList(); for (AccountVO account : accounts) { diff --git a/server/src/com/cloud/api/commands/ListAlertsCmd.java b/server/src/com/cloud/api/commands/ListAlertsCmd.java index 5e082fb797a..9e0a9073121 100644 --- a/server/src/com/cloud/api/commands/ListAlertsCmd.java +++ b/server/src/com/cloud/api/commands/ListAlertsCmd.java @@ -26,7 +26,6 @@ import com.cloud.alert.AlertVO; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.AlertResponse; import com.cloud.api.response.ListResponse; @@ -62,10 +61,10 @@ public class ListAlertsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List alertList = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List alertResponseList = new ArrayList(); for (AlertVO alert : alertList) { AlertResponse alertResponse = new AlertResponse(); diff --git a/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java b/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java index 67b89a3d142..b7c0c6281e4 100644 --- a/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java +++ b/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java @@ -74,10 +74,10 @@ public class ListAsyncJobsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List jobs = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List jobResponses = new ArrayList(); for (AsyncJobVO job : jobs) { AsyncJobResponse jobResponse = new AsyncJobResponse(); diff --git a/server/src/com/cloud/api/commands/ListCapabilitiesCmd.java b/server/src/com/cloud/api/commands/ListCapabilitiesCmd.java index c6d51038822..0a2d6b2d04a 100644 --- a/server/src/com/cloud/api/commands/ListCapabilitiesCmd.java +++ b/server/src/com/cloud/api/commands/ListCapabilitiesCmd.java @@ -23,7 +23,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; import com.cloud.api.Implementation; -import com.cloud.api.ResponseObject; import com.cloud.api.response.CapabilitiesResponse; @Implementation(method="listCapabilities") @@ -38,7 +37,7 @@ public class ListCapabilitiesCmd extends BaseCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public CapabilitiesResponse getResponse() { Map capabilities = (Map)getResponseObject(); CapabilitiesResponse response = new CapabilitiesResponse(); diff --git a/server/src/com/cloud/api/commands/ListCapacityCmd.java b/server/src/com/cloud/api/commands/ListCapacityCmd.java index 1f7ee106734..d2b0c2010c0 100644 --- a/server/src/com/cloud/api/commands/ListCapacityCmd.java +++ b/server/src/com/cloud/api/commands/ListCapacityCmd.java @@ -33,7 +33,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.CapacityResponse; import com.cloud.api.response.ListResponse; import com.cloud.capacity.CapacityVO; @@ -106,10 +105,10 @@ public class ListCapacityCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List capacities = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List capacityResponses = new ArrayList(); List summedCapacities = sumCapacities(capacities); for (CapacityVO summedCapacity : summedCapacities) { diff --git a/server/src/com/cloud/api/commands/ListCfgsByCmd.java b/server/src/com/cloud/api/commands/ListCfgsByCmd.java index aca441af383..566b4c89ef8 100644 --- a/server/src/com/cloud/api/commands/ListCfgsByCmd.java +++ b/server/src/com/cloud/api/commands/ListCfgsByCmd.java @@ -26,7 +26,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ConfigurationResponse; import com.cloud.api.response.ListResponse; import com.cloud.configuration.ConfigurationVO; @@ -71,10 +70,10 @@ public class ListCfgsByCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List configurations = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List configResponses = new ArrayList(); for (ConfigurationVO cfg : configurations) { ConfigurationResponse cfgResponse = new ConfigurationResponse(); diff --git a/server/src/com/cloud/api/commands/ListClustersCmd.java b/server/src/com/cloud/api/commands/ListClustersCmd.java index 4fa8610cc18..5b1da66949f 100644 --- a/server/src/com/cloud/api/commands/ListClustersCmd.java +++ b/server/src/com/cloud/api/commands/ListClustersCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ClusterResponse; import com.cloud.api.response.ListResponse; import com.cloud.dc.ClusterVO; @@ -87,10 +86,10 @@ public class ListClustersCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List clusters = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List clusterResponses = new ArrayList(); for (ClusterVO cluster : clusters) { ClusterResponse clusterResponse = new ClusterResponse(); diff --git a/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java b/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java index b5adec0cd20..5d2d9b42973 100644 --- a/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java +++ b/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java @@ -26,7 +26,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.DiskOfferingResponse; import com.cloud.api.response.ListResponse; import com.cloud.domain.DomainVO; @@ -77,10 +76,10 @@ public class ListDiskOfferingsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List offerings = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List diskOfferingResponses = new ArrayList(); for (DiskOfferingVO offering : offerings) { DiskOfferingResponse diskOffResp = new DiskOfferingResponse(); diff --git a/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java b/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java index 141709ea131..03635bb26c0 100644 --- a/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java +++ b/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java @@ -26,7 +26,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.DomainResponse; import com.cloud.api.response.ListResponse; import com.cloud.domain.DomainVO; @@ -76,10 +75,10 @@ public class ListDomainChildrenCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List domains = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List domainResponses = new ArrayList(); for (DomainVO domain : domains) { DomainResponse domainResponse = new DomainResponse(); diff --git a/server/src/com/cloud/api/commands/ListDomainsCmd.java b/server/src/com/cloud/api/commands/ListDomainsCmd.java index 537c2ecda08..3269898bce8 100644 --- a/server/src/com/cloud/api/commands/ListDomainsCmd.java +++ b/server/src/com/cloud/api/commands/ListDomainsCmd.java @@ -26,7 +26,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.DomainResponse; import com.cloud.api.response.ListResponse; import com.cloud.domain.DomainVO; @@ -76,10 +75,10 @@ public class ListDomainsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List domains = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List domainResponses = new ArrayList(); for (DomainVO domain : domains) { DomainResponse domainResponse = new DomainResponse(); diff --git a/server/src/com/cloud/api/commands/ListEventsCmd.java b/server/src/com/cloud/api/commands/ListEventsCmd.java index 483fcaf04c1..1ca2816af86 100644 --- a/server/src/com/cloud/api/commands/ListEventsCmd.java +++ b/server/src/com/cloud/api/commands/ListEventsCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.EventResponse; import com.cloud.api.response.ListResponse; import com.cloud.event.EventVO; @@ -113,10 +112,10 @@ public class ListEventsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List events = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List eventResponses = new ArrayList(); for (EventVO event : events) { EventResponse responseEvent = new EventResponse(); diff --git a/server/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java b/server/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java index 09de3c8f837..00170f45ff4 100644 --- a/server/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java +++ b/server/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java @@ -26,7 +26,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.GuestOSCategoryResponse; import com.cloud.api.response.ListResponse; import com.cloud.storage.GuestOSCategoryVO; @@ -64,10 +63,10 @@ public class ListGuestOsCategoriesCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List osCategories = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List osCatResponses = new ArrayList(); for (GuestOSCategoryVO osCategory : osCategories) { GuestOSCategoryResponse categoryResponse = new GuestOSCategoryResponse(); diff --git a/server/src/com/cloud/api/commands/ListGuestOsCmd.java b/server/src/com/cloud/api/commands/ListGuestOsCmd.java index 2576e0ecdc9..58793bd2f69 100644 --- a/server/src/com/cloud/api/commands/ListGuestOsCmd.java +++ b/server/src/com/cloud/api/commands/ListGuestOsCmd.java @@ -26,7 +26,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.GuestOSResponse; import com.cloud.api.response.ListResponse; import com.cloud.storage.GuestOSVO; @@ -71,10 +70,10 @@ public class ListGuestOsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List guestOSList = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List osResponses = new ArrayList(); for (GuestOSVO guestOS : guestOSList) { GuestOSResponse guestOSResponse = new GuestOSResponse(); diff --git a/server/src/com/cloud/api/commands/ListHostsCmd.java b/server/src/com/cloud/api/commands/ListHostsCmd.java index 559dd2be58f..c070590cd13 100644 --- a/server/src/com/cloud/api/commands/ListHostsCmd.java +++ b/server/src/com/cloud/api/commands/ListHostsCmd.java @@ -31,7 +31,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.HostResponse; import com.cloud.api.response.ListResponse; import com.cloud.dc.ClusterVO; @@ -118,10 +117,10 @@ public class ListHostsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List hosts = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List hostResponses = new ArrayList(); for (HostVO host : hosts) { HostResponse hostResponse = new HostResponse(); diff --git a/server/src/com/cloud/api/commands/ListIsosCmd.java b/server/src/com/cloud/api/commands/ListIsosCmd.java index ff7aa2b2a93..099a8d972de 100644 --- a/server/src/com/cloud/api/commands/ListIsosCmd.java +++ b/server/src/com/cloud/api/commands/ListIsosCmd.java @@ -29,7 +29,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.TemplateResponse; import com.cloud.async.AsyncJobVO; @@ -131,7 +130,7 @@ public class ListIsosCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { TemplateFilter isoFilterObj = null; try { if (isoFilter == null) { @@ -184,7 +183,7 @@ public class ListIsosCmd extends BaseListCmd { } } - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List isoResponses = new ArrayList(); for (VMTemplateVO iso : isos) { List isoHosts = isoHostsMap.get(iso.getId()); diff --git a/server/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java b/server/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java index de7479385ac..dae5568650f 100644 --- a/server/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java +++ b/server/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java @@ -26,7 +26,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.UserVmResponse; import com.cloud.user.Account; @@ -70,10 +69,10 @@ public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List instances = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List vmResponses = new ArrayList(); for (UserVmVO instance : instances) { UserVmResponse userVmResponse = new UserVmResponse(); diff --git a/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java b/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java index 6d223e92203..8791033ee02 100644 --- a/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java +++ b/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.LoadBalancerResponse; import com.cloud.network.LoadBalancerVO; @@ -100,10 +99,10 @@ public class ListLoadBalancerRulesCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List loadBalancers = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List lbResponses = new ArrayList(); for (LoadBalancerVO loadBalancer : loadBalancers) { LoadBalancerResponse lbResponse = new LoadBalancerResponse(); diff --git a/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java b/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java index 9a7141dfe4d..92798076c78 100644 --- a/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java +++ b/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.BaseCmd.Manager; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.IngressRuleResponse; import com.cloud.api.response.ListResponse; import com.cloud.api.response.NetworkGroupResponse; @@ -87,11 +86,11 @@ public class ListNetworkGroupsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List networkGroups = (List)getResponseObject(); List groupResultObjs = NetworkGroupResultObject.transposeNetworkGroups(networkGroups); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List netGrpResponses = new ArrayList(); for (NetworkGroupResultObject networkGroup : groupResultObjs) { NetworkGroupResponse netGrpResponse = new NetworkGroupResponse(); diff --git a/server/src/com/cloud/api/commands/ListPodsByCmd.java b/server/src/com/cloud/api/commands/ListPodsByCmd.java index 6bdd4810e1e..c167ed83bb4 100644 --- a/server/src/com/cloud/api/commands/ListPodsByCmd.java +++ b/server/src/com/cloud/api/commands/ListPodsByCmd.java @@ -26,7 +26,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.PodResponse; import com.cloud.dc.HostPodVO; @@ -78,10 +77,10 @@ public class ListPodsByCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List pods = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List podResponses = new ArrayList(); for (HostPodVO pod : pods) { String[] ipRange = new String[2]; diff --git a/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java b/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java index 015bae33d65..44b49f4962a 100644 --- a/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java +++ b/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java @@ -29,7 +29,6 @@ import com.cloud.api.BaseCmd.Manager; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.FirewallRuleResponse; import com.cloud.api.response.ListResponse; import com.cloud.network.FirewallRuleVO; @@ -68,12 +67,12 @@ public class ListPortForwardingRulesCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List firewallRules = (List)getResponseObject(); Map userVmCache = new HashMap(); IPAddressVO ipAddr = ApiDBUtils.findIpAddressById(ipAddress); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List fwResponses = new ArrayList(); for (FirewallRuleVO fwRule : firewallRules) { FirewallRuleResponse ruleData = new FirewallRuleResponse(); diff --git a/server/src/com/cloud/api/commands/ListPortForwardingServiceRulesCmd.java b/server/src/com/cloud/api/commands/ListPortForwardingServiceRulesCmd.java index 22eb7bdf6db..17393a29b5a 100644 --- a/server/src/com/cloud/api/commands/ListPortForwardingServiceRulesCmd.java +++ b/server/src/com/cloud/api/commands/ListPortForwardingServiceRulesCmd.java @@ -26,7 +26,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.PortForwardingServiceRuleResponse; import com.cloud.async.AsyncJobVO; @@ -84,10 +83,10 @@ public class ListPortForwardingServiceRulesCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List portForwardingServiceRules = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List ruleResponses = new ArrayList(); for (NetworkRuleConfigVO rule : portForwardingServiceRules) { PortForwardingServiceRuleResponse ruleResponse = new PortForwardingServiceRuleResponse(); diff --git a/server/src/com/cloud/api/commands/ListPortForwardingServicesByVmCmd.java b/server/src/com/cloud/api/commands/ListPortForwardingServicesByVmCmd.java index f729fd70f86..947cd9c82da 100644 --- a/server/src/com/cloud/api/commands/ListPortForwardingServicesByVmCmd.java +++ b/server/src/com/cloud/api/commands/ListPortForwardingServicesByVmCmd.java @@ -28,7 +28,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.SecurityGroupResponse; import com.cloud.network.SecurityGroupVO; @@ -87,10 +86,10 @@ public class ListPortForwardingServicesByVmCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { Map> portForwardingServices = (Map>)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List pfResponses = new ArrayList(); for (String addr : portForwardingServices.keySet()) { List appliedGroup = portForwardingServices.get(addr); diff --git a/server/src/com/cloud/api/commands/ListPortForwardingServicesCmd.java b/server/src/com/cloud/api/commands/ListPortForwardingServicesCmd.java index 1397011e4d9..558530d5302 100644 --- a/server/src/com/cloud/api/commands/ListPortForwardingServicesCmd.java +++ b/server/src/com/cloud/api/commands/ListPortForwardingServicesCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.SecurityGroupResponse; import com.cloud.network.SecurityGroupVO; @@ -86,10 +85,10 @@ public class ListPortForwardingServicesCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List groups = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List pfsResponses = new ArrayList(); for (SecurityGroupVO group : groups) { SecurityGroupResponse pfsData = new SecurityGroupResponse(); diff --git a/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java b/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java index 3f3d3a1475f..0b88b3488e3 100644 --- a/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java +++ b/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java @@ -26,7 +26,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.PreallocatedLunResponse; import com.cloud.storage.preallocatedlun.PreallocatedLunVO; @@ -69,10 +68,10 @@ public class ListPreallocatedLunsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List preallocatedLuns = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List lunResponses = new ArrayList(); for (PreallocatedLunVO preallocatedLun : preallocatedLuns) { PreallocatedLunResponse preallocLunResponse = new PreallocatedLunResponse(); diff --git a/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java b/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java index 848b75e5afa..e2d06acc521 100644 --- a/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java +++ b/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.IPAddressResponse; import com.cloud.api.response.ListResponse; import com.cloud.dc.Vlan.VlanType; @@ -109,10 +108,10 @@ public class ListPublicIpAddressesCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List ipAddresses = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List ipAddrResponses = new ArrayList(); for (IPAddressVO ipAddress : ipAddresses) { VlanVO vlan = ApiDBUtils.findVlanById(ipAddress.getVlanDbId()); diff --git a/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java b/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java index 680e1face09..c2c4df3f34d 100644 --- a/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java +++ b/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java @@ -28,7 +28,6 @@ import com.cloud.api.BaseCmd.Manager; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.ResourceLimitResponse; import com.cloud.configuration.ResourceLimitVO; @@ -86,10 +85,10 @@ public class ListResourceLimitsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List limits = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List limitResponses = new ArrayList(); for (ResourceLimitVO limit : limits) { ResourceLimitResponse resourceLimitResponse = new ResourceLimitResponse(); diff --git a/server/src/com/cloud/api/commands/ListRoutersCmd.java b/server/src/com/cloud/api/commands/ListRoutersCmd.java index bd7768d718b..0246e119b64 100644 --- a/server/src/com/cloud/api/commands/ListRoutersCmd.java +++ b/server/src/com/cloud/api/commands/ListRoutersCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.DomainRouterResponse; import com.cloud.api.response.ListResponse; import com.cloud.async.AsyncJobVO; @@ -107,10 +106,10 @@ public class ListRoutersCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List routers = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List routerResponses = new ArrayList(); for (DomainRouterVO router : routers) { DomainRouterResponse routerResponse = new DomainRouterResponse(); diff --git a/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java b/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java index 70814e9f2fc..74dcb749e1a 100644 --- a/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java +++ b/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.ServiceOfferingResponse; import com.cloud.offering.NetworkOffering.GuestIpType; @@ -76,10 +75,10 @@ public class ListServiceOfferingsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List offerings = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List offeringResponses = new ArrayList(); for (ServiceOfferingVO offering : offerings) { ServiceOfferingResponse offeringResponse = new ServiceOfferingResponse(); diff --git a/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java b/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java index 0f6852fe612..49597568c14 100644 --- a/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java +++ b/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.BaseCmd.Manager; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.SnapshotPolicyResponse; import com.cloud.storage.SnapshotPolicyVO; @@ -77,10 +76,10 @@ public class ListSnapshotPoliciesCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List policies = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List policyResponses = new ArrayList(); for (SnapshotPolicyVO policy : policies) { SnapshotPolicyResponse policyResponse = new SnapshotPolicyResponse(); diff --git a/server/src/com/cloud/api/commands/ListSnapshotsCmd.java b/server/src/com/cloud/api/commands/ListSnapshotsCmd.java index fc073b87397..2426e127749 100644 --- a/server/src/com/cloud/api/commands/ListSnapshotsCmd.java +++ b/server/src/com/cloud/api/commands/ListSnapshotsCmd.java @@ -26,7 +26,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.SnapshotResponse; import com.cloud.async.AsyncJobVO; @@ -109,10 +108,10 @@ public class ListSnapshotsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List snapshots = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List snapshotResponses = new ArrayList(); for (Snapshot snapshot : snapshots) { SnapshotResponse snapshotResponse = new SnapshotResponse(); diff --git a/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java b/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java index 058bd13bc48..3006a550ede 100644 --- a/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java +++ b/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.StoragePoolResponse; import com.cloud.dc.ClusterVO; @@ -100,10 +99,10 @@ public class ListStoragePoolsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List pools = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List poolResponses = new ArrayList(); for (StoragePoolVO pool : pools) { StoragePoolResponse poolResponse = new StoragePoolResponse(); diff --git a/server/src/com/cloud/api/commands/ListSystemVMsCmd.java b/server/src/com/cloud/api/commands/ListSystemVMsCmd.java index b2331872fd5..4de76065c30 100644 --- a/server/src/com/cloud/api/commands/ListSystemVMsCmd.java +++ b/server/src/com/cloud/api/commands/ListSystemVMsCmd.java @@ -26,7 +26,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.SystemVmResponse; import com.cloud.async.AsyncJobVO; @@ -108,10 +107,10 @@ public class ListSystemVMsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List systemVMs = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List vmResponses = new ArrayList(); for (VMInstanceVO systemVM : systemVMs) { SystemVmResponse vmResponse = new SystemVmResponse(); diff --git a/server/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java b/server/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java index deb8dbda8e9..a877aa63ac9 100644 --- a/server/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java +++ b/server/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.TemplatePermissionsResponse; import com.cloud.storage.VMTemplateVO; import com.cloud.user.Account; @@ -75,7 +74,7 @@ public class ListTemplateOrIsoPermissionsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public TemplatePermissionsResponse getResponse() { List accountNames = (List)getResponseObject(); Account account = (Account)UserContext.current().getAccountObject(); boolean isAdmin = ((account == null) || isAdmin(account.getType())); diff --git a/server/src/com/cloud/api/commands/ListTemplatesCmd.java b/server/src/com/cloud/api/commands/ListTemplatesCmd.java index 4d3c51e7adf..181fdc89cc3 100644 --- a/server/src/com/cloud/api/commands/ListTemplatesCmd.java +++ b/server/src/com/cloud/api/commands/ListTemplatesCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.TemplateResponse; import com.cloud.async.AsyncJobVO; @@ -108,7 +107,7 @@ public class ListTemplatesCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { TemplateFilter templateFilterObj; try { templateFilterObj = TemplateFilter.valueOf(templateFilter); @@ -137,7 +136,7 @@ public class ListTemplatesCmd extends BaseListCmd { // get the response List templates = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List templateResponses = new ArrayList(); for (VMTemplateVO template : templates) { diff --git a/server/src/com/cloud/api/commands/ListUsersCmd.java b/server/src/com/cloud/api/commands/ListUsersCmd.java index e58326854bd..c28a4696267 100644 --- a/server/src/com/cloud/api/commands/ListUsersCmd.java +++ b/server/src/com/cloud/api/commands/ListUsersCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.UserResponse; import com.cloud.user.UserAccountVO; @@ -98,10 +97,10 @@ public class ListUsersCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List users = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List userResponses = new ArrayList(); for (UserAccountVO user : users) { UserResponse userResponse = new UserResponse(); diff --git a/server/src/com/cloud/api/commands/ListVMGroupsCmd.java b/server/src/com/cloud/api/commands/ListVMGroupsCmd.java index 9803029c7df..f7e30926e25 100644 --- a/server/src/com/cloud/api/commands/ListVMGroupsCmd.java +++ b/server/src/com/cloud/api/commands/ListVMGroupsCmd.java @@ -26,7 +26,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.InstanceGroupResponse; import com.cloud.api.response.ListResponse; import com.cloud.user.Account; @@ -84,10 +83,10 @@ public class ListVMGroupsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List groups = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List responses = new ArrayList(); for (InstanceGroupVO group : groups) { InstanceGroupResponse groupResponse = new InstanceGroupResponse(); diff --git a/server/src/com/cloud/api/commands/ListVMsCmd.java b/server/src/com/cloud/api/commands/ListVMsCmd.java index b48426f0a9e..e9a2004b8af 100644 --- a/server/src/com/cloud/api/commands/ListVMsCmd.java +++ b/server/src/com/cloud/api/commands/ListVMsCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.UserVmResponse; import com.cloud.async.AsyncJobVO; @@ -119,10 +118,10 @@ public class ListVMsCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List userVms = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List vmResponses = new ArrayList(); for (UserVmVO userVm : userVms) { UserVmResponse userVmResponse = new UserVmResponse(); diff --git a/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java b/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java index 42414d02bb6..44e5120ef02 100644 --- a/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java +++ b/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java @@ -26,7 +26,6 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.VlanIpRangeResponse; import com.cloud.dc.HostPodVO; @@ -100,10 +99,10 @@ public class ListVlanIpRangesCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List vlans = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List vlanResponses = new ArrayList(); for (VlanVO vlan : vlans) { Long accountId = ApiDBUtils.getAccountIdForVlan(vlan.getId()); diff --git a/server/src/com/cloud/api/commands/ListVolumesCmd.java b/server/src/com/cloud/api/commands/ListVolumesCmd.java index dc7b2bea731..7394a135d5e 100755 --- a/server/src/com/cloud/api/commands/ListVolumesCmd.java +++ b/server/src/com/cloud/api/commands/ListVolumesCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.ListResponse; import com.cloud.api.response.VolumeResponse; @@ -125,10 +124,10 @@ public class ListVolumesCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List volumes = (List)getResponseObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List volResponses = new ArrayList(); for (VolumeVO volume : volumes) { VolumeResponse volResponse = new VolumeResponse(); diff --git a/server/src/com/cloud/api/commands/ListZonesByCmd.java b/server/src/com/cloud/api/commands/ListZonesByCmd.java index 6ef465247bd..f59c4bc0b36 100644 --- a/server/src/com/cloud/api/commands/ListZonesByCmd.java +++ b/server/src/com/cloud/api/commands/ListZonesByCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.ZoneResponse; import com.cloud.dc.DataCenterVO; @@ -63,11 +62,11 @@ public class ListZonesByCmd extends BaseListCmd { } @Override @SuppressWarnings("unchecked") - public ResponseObject getResponse() { + public ListResponse getResponse() { List dataCenters = (List)getResponseObject(); Account account = (Account)UserContext.current().getAccountObject(); - ListResponse response = new ListResponse(); + ListResponse response = new ListResponse(); List zoneResponses = new ArrayList(); for (DataCenterVO dataCenter : dataCenters) { ZoneResponse zoneResponse = new ZoneResponse(); diff --git a/server/src/com/cloud/api/commands/LockAccountCmd.java b/server/src/com/cloud/api/commands/LockAccountCmd.java index 15578e66e8f..0f9573c4b8d 100644 --- a/server/src/com/cloud/api/commands/LockAccountCmd.java +++ b/server/src/com/cloud/api/commands/LockAccountCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="lockAccount", manager=Manager.ManagementServer) @@ -63,8 +62,8 @@ public class LockAccountCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/LockUserCmd.java b/server/src/com/cloud/api/commands/LockUserCmd.java index f4aaa4ec769..8c2c097a512 100644 --- a/server/src/com/cloud/api/commands/LockUserCmd.java +++ b/server/src/com/cloud/api/commands/LockUserCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="lockUser", manager=Manager.ManagementServer) @@ -56,8 +55,8 @@ public class LockUserCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java b/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java index 836fdfbe9fc..1877e54e070 100644 --- a/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="maintain", manager=Manager.AgentManager) @@ -60,8 +59,8 @@ public class PrepareForMaintenanceCmd extends BaseAsyncCmd { return "host"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java b/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java index f20fd7b5f25..dc26d1f0a81 100644 --- a/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="preparePrimaryStorageForMaintenance", manager=Manager.StorageManager) @@ -59,8 +58,8 @@ public class PreparePrimaryStorageForMaintenanceCmd extends BaseAsyncCmd { return "primarystorage"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/QueryAsyncJobResultCmd.java b/server/src/com/cloud/api/commands/QueryAsyncJobResultCmd.java index b5ccecb0898..5c60a18639d 100644 --- a/server/src/com/cloud/api/commands/QueryAsyncJobResultCmd.java +++ b/server/src/com/cloud/api/commands/QueryAsyncJobResultCmd.java @@ -60,8 +60,8 @@ public class QueryAsyncJobResultCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public AsyncJobResponse getResponse() { AsyncJobResult result = (AsyncJobResult)getResponseObject(); AsyncJobResponse response = new AsyncJobResponse(); diff --git a/server/src/com/cloud/api/commands/RebootRouterCmd.java b/server/src/com/cloud/api/commands/RebootRouterCmd.java index faaa39a42a4..8a31e3d61ca 100644 --- a/server/src/com/cloud/api/commands/RebootRouterCmd.java +++ b/server/src/com/cloud/api/commands/RebootRouterCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; @@ -57,8 +56,8 @@ public class RebootRouterCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); Boolean responseObject = (Boolean)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/RebootSystemVmCmd.java b/server/src/com/cloud/api/commands/RebootSystemVmCmd.java index fccbab7108c..c92a3a20c54 100644 --- a/server/src/com/cloud/api/commands/RebootSystemVmCmd.java +++ b/server/src/com/cloud/api/commands/RebootSystemVmCmd.java @@ -22,10 +22,9 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; -import com.cloud.api.response.SuccessResponse; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; +import com.cloud.api.response.SuccessResponse; @Implementation(method="rebootSystemVM", manager=Manager.ManagementServer) public class RebootSystemVmCmd extends BaseAsyncCmd { @@ -57,8 +56,8 @@ public class RebootSystemVmCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/RebootVMCmd.java b/server/src/com/cloud/api/commands/RebootVMCmd.java index 5017c0701cc..fce26653798 100644 --- a/server/src/com/cloud/api/commands/RebootVMCmd.java +++ b/server/src/com/cloud/api/commands/RebootVMCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="rebootVirtualMachine", manager=Manager.UserVmManager) @@ -55,8 +54,8 @@ public class RebootVMCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/ReconnectHostCmd.java b/server/src/com/cloud/api/commands/ReconnectHostCmd.java index 1a7a44505b6..2b07358eb74 100644 --- a/server/src/com/cloud/api/commands/ReconnectHostCmd.java +++ b/server/src/com/cloud/api/commands/ReconnectHostCmd.java @@ -31,7 +31,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.HostResponse; import com.cloud.dc.HostPodVO; import com.cloud.host.Host; @@ -75,8 +74,8 @@ public class ReconnectHostCmd extends BaseAsyncCmd { return "host"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public HostResponse getResponse() { HostVO host = (HostVO)getResponseObject(); HostResponse response = new HostResponse(); diff --git a/server/src/com/cloud/api/commands/RecoverVMCmd.java b/server/src/com/cloud/api/commands/RecoverVMCmd.java index 58d2168847c..f10288eb6d0 100644 --- a/server/src/com/cloud/api/commands/RecoverVMCmd.java +++ b/server/src/com/cloud/api/commands/RecoverVMCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="recoverVirtualMachine", manager=Manager.UserVmManager) @@ -57,8 +56,8 @@ public class RecoverVMCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/RegisterCmd.java b/server/src/com/cloud/api/commands/RegisterCmd.java index 00080d9a275..0c2bdf2414a 100644 --- a/server/src/com/cloud/api/commands/RegisterCmd.java +++ b/server/src/com/cloud/api/commands/RegisterCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.RegisterResponse; @Implementation(method="createApiKeyAndSecretKey", manager=Manager.ManagementServer) @@ -56,8 +55,8 @@ public class RegisterCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public RegisterResponse getResponse() { String[] keys = (String[])getResponseObject(); RegisterResponse response = new RegisterResponse(); diff --git a/server/src/com/cloud/api/commands/RegisterIsoCmd.java b/server/src/com/cloud/api/commands/RegisterIsoCmd.java index 759d398e697..97aa763bd1d 100644 --- a/server/src/com/cloud/api/commands/RegisterIsoCmd.java +++ b/server/src/com/cloud/api/commands/RegisterIsoCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.TemplateResponse; import com.cloud.dc.DataCenterVO; @@ -115,12 +114,12 @@ public class RegisterIsoCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public ListResponse getResponse() { VMTemplateVO template = (VMTemplateVO)getResponseObject(); - ListResponse response = new ListResponse(); - List responses = new ArrayList(); + ListResponse response = new ListResponse(); + List responses = new ArrayList(); List zones = null; if (zoneId != null) { diff --git a/server/src/com/cloud/api/commands/RegisterPreallocatedLunCmd.java b/server/src/com/cloud/api/commands/RegisterPreallocatedLunCmd.java index 2abcb5752fa..48e833c787f 100644 --- a/server/src/com/cloud/api/commands/RegisterPreallocatedLunCmd.java +++ b/server/src/com/cloud/api/commands/RegisterPreallocatedLunCmd.java @@ -20,7 +20,6 @@ package com.cloud.api.commands; import com.cloud.api.BaseCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.PreallocatedLunResponse; import com.cloud.storage.preallocatedlun.PreallocatedLunVO; @@ -87,8 +86,8 @@ public class RegisterPreallocatedLunCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public PreallocatedLunResponse getResponse() { PreallocatedLunVO preallocatedLun = (PreallocatedLunVO)getResponseObject(); PreallocatedLunResponse response = new PreallocatedLunResponse(); diff --git a/server/src/com/cloud/api/commands/RegisterTemplateCmd.java b/server/src/com/cloud/api/commands/RegisterTemplateCmd.java index 0c5b1c5917f..48bea1ff0a5 100644 --- a/server/src/com/cloud/api/commands/RegisterTemplateCmd.java +++ b/server/src/com/cloud/api/commands/RegisterTemplateCmd.java @@ -27,7 +27,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ListResponse; import com.cloud.api.response.TemplateResponse; import com.cloud.dc.DataCenterVO; @@ -137,12 +136,12 @@ public class RegisterTemplateCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public ListResponse getResponse() { VMTemplateVO template = (VMTemplateVO)getResponseObject(); - ListResponse response = new ListResponse(); - List responses = new ArrayList(); + ListResponse response = new ListResponse(); + List responses = new ArrayList(); List zones = null; if (zoneId != null) { diff --git a/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java index dc8a15d93ed..f30094ade5b 100644 --- a/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="removeFromLoadBalancer", manager=Manager.NetworkManager) @@ -72,8 +71,8 @@ public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/RemovePortForwardingServiceCmd.java b/server/src/com/cloud/api/commands/RemovePortForwardingServiceCmd.java index ef51005e6c5..8f090234a53 100644 --- a/server/src/com/cloud/api/commands/RemovePortForwardingServiceCmd.java +++ b/server/src/com/cloud/api/commands/RemovePortForwardingServiceCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="removeSecurityGroup", manager=Manager.ManagementServer) @@ -70,8 +69,8 @@ public class RemovePortForwardingServiceCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java b/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java index 37360ac0b5d..19476432812 100644 --- a/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java +++ b/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="resetVMPassword", manager=Manager.UserVmManager) @@ -56,8 +55,8 @@ public class ResetVMPasswordCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java b/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java index 50ac8af8d7b..69e2b4e8f75 100644 --- a/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java +++ b/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java @@ -8,7 +8,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @SuppressWarnings("rawtypes") @@ -109,8 +108,8 @@ public class RevokeNetworkGroupIngressCmd extends BaseAsyncCmd { return "revokenetworkgroupingress"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/StartRouterCmd.java b/server/src/com/cloud/api/commands/StartRouterCmd.java index d2cbb1dca56..c09de40f0d4 100644 --- a/server/src/com/cloud/api/commands/StartRouterCmd.java +++ b/server/src/com/cloud/api/commands/StartRouterCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.DomainRouterResponse; import com.cloud.user.Account; import com.cloud.vm.DomainRouterVO; @@ -64,8 +63,8 @@ public class StartRouterCmd extends BaseAsyncCmd { return "router"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public DomainRouterResponse getResponse() { DomainRouterResponse routerResponse = new DomainRouterResponse(); DomainRouterVO router = (DomainRouterVO)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/StartSystemVMCmd.java b/server/src/com/cloud/api/commands/StartSystemVMCmd.java index fb84fe38f1d..fe0ec4cb9ca 100644 --- a/server/src/com/cloud/api/commands/StartSystemVMCmd.java +++ b/server/src/com/cloud/api/commands/StartSystemVMCmd.java @@ -20,13 +20,12 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; +import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; -import com.cloud.api.response.SystemVmResponse; -import com.cloud.api.ApiDBUtils; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; +import com.cloud.api.response.SystemVmResponse; import com.cloud.vm.ConsoleProxyVO; import com.cloud.vm.SecondaryStorageVmVO; import com.cloud.vm.VMInstanceVO; @@ -65,8 +64,8 @@ public class StartSystemVMCmd extends BaseAsyncCmd { return "systemvm"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SystemVmResponse getResponse() { VMInstanceVO instance = (VMInstanceVO)getResponseObject(); SystemVmResponse response = new SystemVmResponse(); diff --git a/server/src/com/cloud/api/commands/StartVMCmd.java b/server/src/com/cloud/api/commands/StartVMCmd.java index 863c02d8376..d5609c1160a 100644 --- a/server/src/com/cloud/api/commands/StartVMCmd.java +++ b/server/src/com/cloud/api/commands/StartVMCmd.java @@ -67,9 +67,9 @@ public class StartVMCmd extends BaseAsyncCmd { public static String getResultObjectName() { return "virtualmachine"; } - - @Override - public ResponseObject getResponse() { + + @Override @SuppressWarnings("unchecked") + public UserVmResponse getResponse() { UserVm vm = (UserVm)getResponseObject(); UserVmResponse response = new UserVmResponse(); diff --git a/server/src/com/cloud/api/commands/StopRouterCmd.java b/server/src/com/cloud/api/commands/StopRouterCmd.java index 5c4a7fd2c3b..ef734eb3464 100644 --- a/server/src/com/cloud/api/commands/StopRouterCmd.java +++ b/server/src/com/cloud/api/commands/StopRouterCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; @@ -58,8 +57,8 @@ public class StopRouterCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); Boolean responseObject = (Boolean)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/StopSystemVmCmd.java b/server/src/com/cloud/api/commands/StopSystemVmCmd.java index 9d337a81d24..9674bbde463 100644 --- a/server/src/com/cloud/api/commands/StopSystemVmCmd.java +++ b/server/src/com/cloud/api/commands/StopSystemVmCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SystemVmResponse; import com.cloud.vm.ConsoleProxyVO; import com.cloud.vm.SecondaryStorageVmVO; @@ -61,8 +60,8 @@ public class StopSystemVmCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SystemVmResponse getResponse() { VMInstanceVO instance = (VMInstanceVO)getResponseObject(); SystemVmResponse response = new SystemVmResponse(); diff --git a/server/src/com/cloud/api/commands/StopVMCmd.java b/server/src/com/cloud/api/commands/StopVMCmd.java index b4b639afb76..5302cf7163b 100644 --- a/server/src/com/cloud/api/commands/StopVMCmd.java +++ b/server/src/com/cloud/api/commands/StopVMCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.UserVmResponse; import com.cloud.offering.ServiceOffering; import com.cloud.storage.VMTemplateVO; @@ -63,8 +62,8 @@ public class StopVMCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public UserVmResponse getResponse() { UserVm vm = (UserVm)getResponseObject(); UserVmResponse response = new UserVmResponse(); diff --git a/server/src/com/cloud/api/commands/UpdateAccountCmd.java b/server/src/com/cloud/api/commands/UpdateAccountCmd.java index 98f51cdcdb2..83f4dac21eb 100644 --- a/server/src/com/cloud/api/commands/UpdateAccountCmd.java +++ b/server/src/com/cloud/api/commands/UpdateAccountCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; @@ -70,8 +69,8 @@ public class UpdateAccountCmd extends BaseCmd{ return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); Boolean responseObject = (Boolean)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/UpdateCfgCmd.java b/server/src/com/cloud/api/commands/UpdateCfgCmd.java index de731a40b80..68534392a99 100644 --- a/server/src/com/cloud/api/commands/UpdateCfgCmd.java +++ b/server/src/com/cloud/api/commands/UpdateCfgCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; @@ -63,8 +62,8 @@ public class UpdateCfgCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); Boolean responseObject = (Boolean)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java b/server/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java index 33dc9cbcf68..1b7db788d3a 100644 --- a/server/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java +++ b/server/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.DiskOfferingResponse; import com.cloud.storage.DiskOfferingVO; @@ -80,7 +79,8 @@ public class UpdateDiskOfferingCmd extends BaseCmd{ return s_name; } - public ResponseObject getResponse() { + @SuppressWarnings("unchecked") + public DiskOfferingResponse getResponse() { DiskOfferingResponse response = new DiskOfferingResponse(); DiskOfferingVO responseObject = (DiskOfferingVO)getResponseObject(); if (responseObject != null) { diff --git a/server/src/com/cloud/api/commands/UpdateDomainCmd.java b/server/src/com/cloud/api/commands/UpdateDomainCmd.java index 2ccb29343d2..235229641d5 100644 --- a/server/src/com/cloud/api/commands/UpdateDomainCmd.java +++ b/server/src/com/cloud/api/commands/UpdateDomainCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.SuccessResponse; @@ -63,8 +62,8 @@ public class UpdateDomainCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); Boolean responseObject = (Boolean)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/UpdateHostCmd.java b/server/src/com/cloud/api/commands/UpdateHostCmd.java index ba776089f66..6948900ffce 100644 --- a/server/src/com/cloud/api/commands/UpdateHostCmd.java +++ b/server/src/com/cloud/api/commands/UpdateHostCmd.java @@ -31,7 +31,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.HostResponse; import com.cloud.dc.ClusterVO; @@ -83,8 +82,8 @@ public class UpdateHostCmd extends BaseCmd { return "updatehost"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public HostResponse getResponse() { HostResponse hostResponse = new HostResponse(); HostVO host = (HostVO)getResponseObject(); if (host != null) { diff --git a/server/src/com/cloud/api/commands/UpdateIPForwardingRuleCmd.java b/server/src/com/cloud/api/commands/UpdateIPForwardingRuleCmd.java index a0cdef8110e..07655848056 100644 --- a/server/src/com/cloud/api/commands/UpdateIPForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/UpdateIPForwardingRuleCmd.java @@ -7,7 +7,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.FirewallRuleResponse; import com.cloud.network.FirewallRuleVO; import com.cloud.uservm.UserVm; @@ -76,8 +75,8 @@ public class UpdateIPForwardingRuleCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public FirewallRuleResponse getResponse() { FirewallRuleVO fwRule = (FirewallRuleVO)getResponseObject(); FirewallRuleResponse response = new FirewallRuleResponse(); diff --git a/server/src/com/cloud/api/commands/UpdateIsoCmd.java b/server/src/com/cloud/api/commands/UpdateIsoCmd.java index b6bc0420478..1abb1632e53 100755 --- a/server/src/com/cloud/api/commands/UpdateIsoCmd.java +++ b/server/src/com/cloud/api/commands/UpdateIsoCmd.java @@ -22,7 +22,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.TemplateResponse; import com.cloud.storage.VMTemplateVO; @@ -54,7 +53,8 @@ public class UpdateIsoCmd extends UpdateTemplateOrIsoCmd { return s_name; } - public ResponseObject getResponse() { + @SuppressWarnings("unchecked") + public TemplateResponse getResponse() { TemplateResponse response = new TemplateResponse(); VMTemplateVO responseObject = (VMTemplateVO)getResponseObject(); if (responseObject != null) { diff --git a/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java index 8a57de021d7..3aa33cbd6dd 100644 --- a/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseAsyncCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.LoadBalancerResponse; import com.cloud.network.LoadBalancerVO; @@ -85,8 +84,8 @@ public class UpdateLoadBalancerRuleCmd extends BaseAsyncCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public LoadBalancerResponse getResponse() { LoadBalancerVO loadBalancer = (LoadBalancerVO)getResponseObject(); LoadBalancerResponse response = new LoadBalancerResponse(); diff --git a/server/src/com/cloud/api/commands/UpdatePodCmd.java b/server/src/com/cloud/api/commands/UpdatePodCmd.java index 15032673f4a..70381fe0866 100644 --- a/server/src/com/cloud/api/commands/UpdatePodCmd.java +++ b/server/src/com/cloud/api/commands/UpdatePodCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="editPod", manager=Manager.ConfigManager) @@ -91,8 +90,8 @@ public class UpdatePodCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { /* Not sure why we aren't returning the Pod here, but I'll keep the old "success" response we used to have HostPodVO pod = (HostPodVO)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java b/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java index 2cd417aff66..d6dbed8edff 100644 --- a/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java +++ b/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java @@ -25,7 +25,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ResourceLimitResponse; import com.cloud.configuration.ResourceLimitVO; import com.cloud.user.Account; @@ -82,8 +81,8 @@ public class UpdateResourceLimitCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public ResourceLimitResponse getResponse() { ResourceLimitVO limit = (ResourceLimitVO) getResponseObject(); ResourceLimitResponse response = new ResourceLimitResponse(); diff --git a/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java b/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java index d4e68d63d8f..adc0f4a11fe 100644 --- a/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java +++ b/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.ServiceOfferingResponse; import com.cloud.offering.NetworkOffering.GuestIpType; import com.cloud.service.ServiceOfferingVO; @@ -92,8 +91,8 @@ public class UpdateServiceOfferingCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public ServiceOfferingResponse getResponse() { ServiceOfferingVO offering = (ServiceOfferingVO) getResponseObject(); ServiceOfferingResponse response = new ServiceOfferingResponse(); diff --git a/server/src/com/cloud/api/commands/UpdateStoragePoolCmd.java b/server/src/com/cloud/api/commands/UpdateStoragePoolCmd.java index 5862066a56d..3b81951e84d 100644 --- a/server/src/com/cloud/api/commands/UpdateStoragePoolCmd.java +++ b/server/src/com/cloud/api/commands/UpdateStoragePoolCmd.java @@ -20,12 +20,11 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; +import com.cloud.api.ApiDBUtils; import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; -import com.cloud.api.ApiDBUtils; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.StoragePoolResponse; import com.cloud.dc.ClusterVO; import com.cloud.storage.StoragePoolVO; @@ -68,8 +67,8 @@ public class UpdateStoragePoolCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public StoragePoolResponse getResponse() { StoragePoolVO pool = (StoragePoolVO) getResponseObject(); StoragePoolResponse response = new StoragePoolResponse(); diff --git a/server/src/com/cloud/api/commands/UpdateTemplateCmd.java b/server/src/com/cloud/api/commands/UpdateTemplateCmd.java index 84fe561ab7a..e3dca860794 100644 --- a/server/src/com/cloud/api/commands/UpdateTemplateCmd.java +++ b/server/src/com/cloud/api/commands/UpdateTemplateCmd.java @@ -22,7 +22,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.TemplateResponse; import com.cloud.storage.VMTemplateVO; @@ -48,8 +47,9 @@ public class UpdateTemplateCmd extends UpdateTemplateOrIsoCmd { public String getName() { return s_name; } - - public ResponseObject getResponse() { + + @SuppressWarnings("unchecked") + public TemplateResponse getResponse() { TemplateResponse response = new TemplateResponse(); VMTemplateVO responseObject = (VMTemplateVO)getResponseObject(); if (responseObject != null) { diff --git a/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java b/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java index e73c20cddf8..58de94a25a8 100644 --- a/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java +++ b/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java @@ -8,7 +8,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="updateTemplatePermissions", manager=Manager.ManagementServer) @@ -78,8 +77,8 @@ public abstract class UpdateTemplateOrIsoPermissionsCmd extends BaseCmd { return Logger.getLogger(UpdateTemplateOrIsoPermissionsCmd.class.getName()); } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/UpdateUserCmd.java b/server/src/com/cloud/api/commands/UpdateUserCmd.java index 7d3f112e34e..4890a8ccbd8 100644 --- a/server/src/com/cloud/api/commands/UpdateUserCmd.java +++ b/server/src/com/cloud/api/commands/UpdateUserCmd.java @@ -112,8 +112,8 @@ public class UpdateUserCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); diff --git a/server/src/com/cloud/api/commands/UpdateVMCmd.java b/server/src/com/cloud/api/commands/UpdateVMCmd.java index 16c700c73c9..858372ab60f 100644 --- a/server/src/com/cloud/api/commands/UpdateVMCmd.java +++ b/server/src/com/cloud/api/commands/UpdateVMCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.response.SuccessResponse; @Implementation(method="updateVirtualMachine", manager=Manager.UserVmManager) @@ -80,8 +79,8 @@ public class UpdateVMCmd extends BaseCmd{ return "virtualmachine"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); response.setSuccess(Boolean.TRUE); response.setResponseName(getName()); diff --git a/server/src/com/cloud/api/commands/UpdateVMGroupCmd.java b/server/src/com/cloud/api/commands/UpdateVMGroupCmd.java index 3147e8b8e99..e27c54df9d1 100644 --- a/server/src/com/cloud/api/commands/UpdateVMGroupCmd.java +++ b/server/src/com/cloud/api/commands/UpdateVMGroupCmd.java @@ -65,8 +65,8 @@ public class UpdateVMGroupCmd extends BaseCmd{ return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public InstanceGroupResponse getResponse() { InstanceGroupVO group = (InstanceGroupVO)getResponseObject(); InstanceGroupResponse response = new InstanceGroupResponse(); diff --git a/server/src/com/cloud/api/commands/UpdateZoneCmd.java b/server/src/com/cloud/api/commands/UpdateZoneCmd.java index 0adf5a84754..4dd0e930cdf 100644 --- a/server/src/com/cloud/api/commands/UpdateZoneCmd.java +++ b/server/src/com/cloud/api/commands/UpdateZoneCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.ZoneResponse; import com.cloud.dc.DataCenterVO; @@ -108,8 +107,8 @@ public class UpdateZoneCmd extends BaseCmd { return s_name; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public ZoneResponse getResponse() { ZoneResponse response = new ZoneResponse(); DataCenterVO responseObject = (DataCenterVO)getResponseObject(); diff --git a/server/src/com/cloud/api/commands/UpgradeVMCmd.java b/server/src/com/cloud/api/commands/UpgradeVMCmd.java index 0ae7afaae0a..afdff352de1 100644 --- a/server/src/com/cloud/api/commands/UpgradeVMCmd.java +++ b/server/src/com/cloud/api/commands/UpgradeVMCmd.java @@ -24,7 +24,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.ResponseObject; import com.cloud.api.ServerApiException; import com.cloud.api.response.UpgradeVmResponse; import com.cloud.offering.ServiceOffering; @@ -74,8 +73,8 @@ public class UpgradeVMCmd extends BaseCmd { return "virtualmachine"; } - @Override - public ResponseObject getResponse() { + @Override @SuppressWarnings("unchecked") + public UpgradeVmResponse getResponse() { UserVmVO userVm = (UserVmVO)getResponseObject(); UpgradeVmResponse response = new UpgradeVmResponse(); diff --git a/server/src/com/cloud/api/doc/ApiXmlDocReader.java b/server/src/com/cloud/api/doc/ApiXmlDocReader.java new file mode 100644 index 00000000000..850ae79271b --- /dev/null +++ b/server/src/com/cloud/api/doc/ApiXmlDocReader.java @@ -0,0 +1,104 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package com.cloud.api.doc; + +import java.io.EOFException; +import java.io.FileReader; +import java.io.ObjectInputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; + +public class ApiXmlDocReader { + public static void main (String[] args) { + String newFile = ""; + String oldFile = ""; + + + HashMap commands = new HashMap(); + HashMap oldCommands = new HashMap(); + ArrayList newCommands = new ArrayList(); + XStream xs = new XStream(new DomDriver()); + xs.alias("command", Command.class); + xs.alias("arg", Argument.class); + + + List argsList = Arrays.asList(args); + Iterator iter = argsList.iterator(); + while (iter.hasNext()) { + String arg = iter.next(); + // populate the file names + if (arg.equals("-new")) { + newFile = iter.next(); + } + if (arg.equals("-old")) { + oldFile = iter.next(); + } + } + try { + + try{ + ObjectInputStream inOld = xs.createObjectInputStream(new FileReader(oldFile)); + while (true){ + Command c1 = (Command)inOld.readObject(); + oldCommands.put(c1.getName(), c1); + } + } catch (EOFException ex) { + //EOF exception shows that there is no more objects in ObjectInputStream, so do nothing here + } + + try{ + ObjectInputStream inNew = xs.createObjectInputStream(new FileReader(newFile)); + while (true){ + Command c = (Command)inNew.readObject(); + commands.put(c.getName(), c); + } + } catch (EOFException ex) { + //EOF exception shows that there is no more objects in ObjectInputStream, so do nothing here + } + } catch (Exception ex){ + ex.printStackTrace(); + } + + + Iterator i = commands.keySet().iterator(); + while (i.hasNext()) { + String key = (String)i.next(); + //Check if command existed in old version + if (!oldCommands.containsKey(key)) { + newCommands.add(commands.get(key)); + } + + //Verify request and response arguments + else { + commands.get(key).compareArguments(oldCommands.get(key)); + } + } + //Print new commands + for (Command c : newCommands) { + System.out.println(c.getName()); + } + + } +} diff --git a/server/src/com/cloud/api/doc/ApiXmlDocWriter.java b/server/src/com/cloud/api/doc/ApiXmlDocWriter.java new file mode 100644 index 00000000000..e3e49a4143e --- /dev/null +++ b/server/src/com/cloud/api/doc/ApiXmlDocWriter.java @@ -0,0 +1,183 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package com.cloud.api.doc; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; + +import org.apache.log4j.Logger; + +import com.cloud.api.BaseCmd; +import com.cloud.api.Implementation; +import com.cloud.api.Parameter; +import com.cloud.serializer.Param; +import com.google.gson.annotations.SerializedName; +import com.thoughtworks.xstream.XStream; + +public class ApiXmlDocWriter { + private static final Logger s_logger = Logger.getLogger(ApiXmlDocWriter.class.getName()); + private static Properties api_commands = new Properties(); + private static String dirName=""; + + public static void main (String[] args) { + Properties preProcessedCommands = new Properties(); + Enumeration command = null; + String[] fileNames = null; + + List argsList = Arrays.asList(args); + Iterator iter = argsList.iterator(); + while (iter.hasNext()) { + String arg = iter.next(); + // populate the file names + if (arg.equals("-f")) { + fileNames = iter.next().split(","); + } + if (arg.equals("-d")) { + dirName = iter.next(); + } + } + + if ((fileNames == null) || (fileNames.length == 0)){ + s_logger.error("Please specify input file(s) separated by coma using -f option"); + System.exit(2); + } + + for (String fileName : fileNames) { + try { + FileInputStream in = new FileInputStream(fileName); + preProcessedCommands.load(in); + }catch (FileNotFoundException ex) { + s_logger.error("Can't find file " + fileName); + System.exit(2); + } catch (IOException ex1) { + s_logger.error("Error reading from file " + ex1); + System.exit(2); + } + } + + //Get command classes and response object classes + for (Object key : preProcessedCommands.keySet()) { + String preProcessedCommand = preProcessedCommands.getProperty((String)key); + String[] commandParts = preProcessedCommand.split(";"); + api_commands.put(key, commandParts[0]); + } + + command = api_commands.propertyNames(); + + try { + //Create object writer + XStream xs = new XStream(); + xs.alias("command", Command.class); + xs.alias("arg", Argument.class); + + ObjectOutputStream out = xs.createObjectOutputStream(new FileWriter(dirName + "commands.xml"), "commands"); + + while (command.hasMoreElements()) { + String key = (String) command.nextElement(); + Class clas = Class.forName(api_commands.getProperty(key)); + ArrayList request = new ArrayList(); + ArrayList response = new ArrayList(); + + //Create a new command, set name and description + Command apiCommand = new Command(); + apiCommand.setName(key); + Implementation impl = (Implementation)clas.getAnnotation(Implementation.class); + if (impl == null) + impl = (Implementation)clas.getSuperclass().getAnnotation(Implementation.class); + String commandDescription = impl.description(); + if (commandDescription != null) + apiCommand.setDescription(commandDescription); + + //Get request parameters + Field[] fields = clas.getDeclaredFields(); + + //Get fields from superclass + Class superClass = clas.getSuperclass(); + while (BaseCmd.class.isAssignableFrom(superClass) && !superClass.getName().equals(BaseCmd.class.getName())) { + Field[] superClassFields = superClass.getDeclaredFields(); + if (superClassFields != null) { + Field[] tmpFields = new Field[fields.length + superClassFields.length]; + System.arraycopy(fields, 0, tmpFields, 0, fields.length); + System.arraycopy(superClassFields, 0, tmpFields, fields.length, superClassFields.length); + fields = tmpFields; + } + superClass = superClass.getSuperclass(); + } + + for (Field f : fields) { + Parameter parameterAnnotation = f.getAnnotation(Parameter.class); + if (parameterAnnotation != null) { + Argument reqArg = new Argument(parameterAnnotation.name()); + reqArg.setRequired(parameterAnnotation.required()); + if (!parameterAnnotation.description().isEmpty()) + reqArg.setDescription(parameterAnnotation.description()); + request.add(reqArg); + } + } + + //Get response parameters + Method getResponseMethod = clas.getMethod("getResponse"); + Class responseClas = (Class)getResponseMethod.getReturnType(); + Type returnType = getResponseMethod.getGenericReturnType(); + + if(returnType != null && returnType instanceof ParameterizedType){ + ParameterizedType type = (ParameterizedType) returnType; + Type[] typeArguments = type.getActualTypeArguments(); + responseClas = (Class)typeArguments[0]; + } + + //Get response parameters + Field[] responseFields = responseClas.getDeclaredFields(); + for (Field responseField : responseFields) { + SerializedName nameAnnotation = responseField.getAnnotation(SerializedName.class); + Param descAnnotation = responseField.getAnnotation(Param.class); + Argument respArg = new Argument(nameAnnotation.value()); + if (descAnnotation != null) + respArg.setDescription(descAnnotation.description()); + response.add(respArg); + } + + + apiCommand.setRequest(request); + apiCommand.setResponse(response); + + //Write command to xml file + out.writeObject(apiCommand); + } + + out.close(); + } catch (Exception ex) { + ex.printStackTrace(); + System.exit(2); + } + } +} \ No newline at end of file diff --git a/server/src/com/cloud/api/doc/Argument.java b/server/src/com/cloud/api/doc/Argument.java new file mode 100644 index 00000000000..77fcbe4f877 --- /dev/null +++ b/server/src/com/cloud/api/doc/Argument.java @@ -0,0 +1,53 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package com.cloud.api.doc; + +public class Argument implements Comparable{ + private String name; + private String description; + private Boolean required; + + public Argument(String name) { + this.name = name; + } + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + public Boolean isRequired() { + return required; + } + public void setRequired(Boolean required) { + this.required = required; + } + + public int compareTo(Argument arg) { + return required.compareTo(arg.isRequired()); + } + +} diff --git a/server/src/com/cloud/api/doc/Command.java b/server/src/com/cloud/api/doc/Command.java new file mode 100644 index 00000000000..e76ad389672 --- /dev/null +++ b/server/src/com/cloud/api/doc/Command.java @@ -0,0 +1,73 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package com.cloud.api.doc; + +import java.util.ArrayList; + +public class Command { + + private String name; + private String description; + private ArrayList request; + private ArrayList response; + + public Command(String name, String description) { + this.name = name; + this.description = description; + } + + public Command() {} + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public ArrayList getRequest() { + return request; + } + + public void setRequest(ArrayList request) { + this.request = request; + } + + public ArrayList getResponse() { + return response; + } + + public void setResponse(ArrayList response) { + this.response = response; + } + + public void compareArguments(Command oldCommand){ + //TODO compare request and response arguments + } + +} diff --git a/server/src/com/cloud/api/response/ListResponse.java b/server/src/com/cloud/api/response/ListResponse.java index b7f6d48d117..effda47dc2d 100644 --- a/server/src/com/cloud/api/response/ListResponse.java +++ b/server/src/com/cloud/api/response/ListResponse.java @@ -4,14 +4,14 @@ import java.util.List; import com.cloud.api.ResponseObject; -public class ListResponse extends BaseResponse { - List responses; +public class ListResponse extends BaseResponse { + List responses; - public List getResponses() { + public List getResponses() { return responses; } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = responses; } } diff --git a/server/src/com/cloud/api/response/SuccessResponse.java b/server/src/com/cloud/api/response/SuccessResponse.java index f50826dedcf..8f49fc04ad6 100644 --- a/server/src/com/cloud/api/response/SuccessResponse.java +++ b/server/src/com/cloud/api/response/SuccessResponse.java @@ -1,9 +1,10 @@ package com.cloud.api.response; +import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; public class SuccessResponse extends BaseResponse { - @SerializedName("success") + @SerializedName("success") @Param(description="true if operation is executed successfully") private Boolean success; public Boolean getSuccess() { diff --git a/server/src/com/cloud/api/response/UpgradeVmResponse.java b/server/src/com/cloud/api/response/UpgradeVmResponse.java index 2d9aee4b124..e2679ab5787 100644 --- a/server/src/com/cloud/api/response/UpgradeVmResponse.java +++ b/server/src/com/cloud/api/response/UpgradeVmResponse.java @@ -20,9 +20,10 @@ package com.cloud.api.response; import java.util.Date; import com.cloud.serializer.Param; +import com.google.gson.annotations.SerializedName; public class UpgradeVmResponse extends BaseResponse { - @Param(name = "id") + @SerializedName("id") private long id; public String getName() { @@ -221,75 +222,75 @@ public class UpgradeVmResponse extends BaseResponse { return id; } - @Param(name = "name") + @SerializedName("name") private String name; - @Param(name = "created") + @SerializedName("created") private Date created; - @Param(name = "ipaddress") + @SerializedName("ipaddress") private String ipAddress; - @Param(name = "state") + @SerializedName("state") private String state; - @Param(name = "account") + @SerializedName("account") private String account; - @Param(name = "domainid") + @SerializedName("domainid") private long domainId; - @Param(name = "domain") + @SerializedName("domain") private String domain; - @Param(name = "haenable") + @SerializedName("haenable") private boolean haEnable; - @Param(name = "zoneid") + @SerializedName("zoneid") private long zoneId; - @Param(name = "displayname") + @SerializedName("displayname") private String displayName; - @Param(name = "zonename") + @SerializedName("zonename") private String zoneName; - @Param(name = "hostid") + @SerializedName("hostid") private long hostId; - @Param(name = "hostname") + @SerializedName("hostname") private String hostName; - @Param(name = "templateid") + @SerializedName("templateid") private long templateId; - @Param(name = "templatename") + @SerializedName("templatename") private String templateName; - @Param(name = "templatedisplaytext") + @SerializedName("templatedisplaytext") private String templateDisplayText; - @Param(name = "passwordenabled") + @SerializedName("passwordenabled") private boolean passwordEnabled; - @Param(name = "serviceofferingid") + @SerializedName("serviceofferingid") private long serviceOfferingId; - @Param(name = "serviceofferingname") + @SerializedName("serviceofferingname") private String serviceOfferingName; - @Param(name = "cpunumber") + @SerializedName("cpunumber") private long cpuSpeed; - @Param(name = "memory") + @SerializedName("memory") private long memory; - @Param(name = "cpuused") + @SerializedName("cpuused") private long cpuUsed; - @Param(name = "networkkbsread") + @SerializedName("networkkbsread") private long networkKbsRead; - @Param(name = "networkkbswrite") + @SerializedName("networkkbswrite") private long networkKbsWrite; }