From a5f50d236ff67225bc4ab394a4974ae88a31fa4c Mon Sep 17 00:00:00 2001 From: Kris McQueen Date: Fri, 17 Sep 2010 15:18:37 -0700 Subject: [PATCH] Rearranging how response objects work since we need the response name when doing serialization. Now there's a base class that implements the getResponseName method, all responses extend this base class --- .../cloud/serializer/SerializerHelper.java | 10 - server/src/com/cloud/api/ResponseObject.java | 11 + .../api/commands/GetCloudIdentifierCmd.java | 6 +- .../cloud/api/response/AccountResponse.java | 3 +- .../com/cloud/api/response/AlertResponse.java | 3 +- .../api/response/ApiResponseSerializer.java | 17 + .../cloud/api/response/AsyncJobResponse.java | 3 +- .../com/cloud/api/response/BaseResponse.java | 18 + .../cloud/api/response/CapacityResponse.java | 3 +- .../api/response/CloudIdentifierResponse.java | 3 +- .../cloud/api/response/ClusterResponse.java | 3 +- .../api/response/ConfigurationResponse.java | 3 +- .../cloud/api/response/CreateCmdResponse.java | 3 +- .../api/response/DeleteDomainResponse.java | 3 +- .../DeletePreallocatedLunResponse.java | 3 +- .../api/response/DiskOfferingResponse.java | 3 +- .../cloud/api/response/DomainResponse.java | 3 +- .../api/response/DomainRouterResponse.java | 3 +- .../com/cloud/api/response/EventResponse.java | 3 +- .../api/response/FirewallRuleResponse.java | 3 +- .../api/response/GuestOSCategoryResponse.java | 3 +- .../cloud/api/response/GuestOSResponse.java | 3 +- .../com/cloud/api/response/HostResponse.java | 3 +- .../cloud/api/response/IPAddressResponse.java | 3 +- .../api/response/IngressRuleResponse.java | 3 +- .../api/response/LoadBalancerResponse.java | 3 +- .../api/response/NetworkGroupResponse.java | 3 +- .../com/cloud/api/response/PodResponse.java | 3 +- .../PortForwardingServiceRuleResponse.java | 3 +- .../api/response/PreallocatedLunResponse.java | 3 +- .../api/response/ResourceLimitResponse.java | 3 +- .../api/response/SecurityGroupResponse.java | 3 +- .../api/response/ServiceOfferingResponse.java | 3 +- .../api/response/SnapshotPolicyResponse.java | 3 +- .../cloud/api/response/SnapshotResponse.java | 3 +- .../response/SnapshotScheduleResponse.java | 3 +- .../api/response/StoragePoolResponse.java | 3 +- .../cloud/api/response/SuccessResponse.java | 3 +- .../cloud/api/response/SystemVmResponse.java | 3 +- .../response/TemplatePermissionsResponse.java | 3 +- .../cloud/api/response/TemplateResponse.java | 3 +- .../cloud/api/response/UpgradeVmResponse.java | 543 +++++++++--------- .../com/cloud/api/response/UserResponse.java | 3 +- .../cloud/api/response/UserVmResponse.java | 3 +- .../api/response/VlanIpRangeResponse.java | 3 +- .../cloud/api/response/VolumeResponse.java | 3 +- .../com/cloud/api/response/ZoneResponse.java | 3 +- 47 files changed, 361 insertions(+), 367 deletions(-) create mode 100644 server/src/com/cloud/api/response/ApiResponseSerializer.java create mode 100644 server/src/com/cloud/api/response/BaseResponse.java diff --git a/core/src/com/cloud/serializer/SerializerHelper.java b/core/src/com/cloud/serializer/SerializerHelper.java index f26dc2466e4..347d6b23101 100644 --- a/core/src/com/cloud/serializer/SerializerHelper.java +++ b/core/src/com/cloud/serializer/SerializerHelper.java @@ -48,16 +48,6 @@ public class SerializerHelper { return null; } - // FIXME: what about XML response? - public static String toSerializedString(Object result) { - if (result != null) { - Gson gson = GsonHelper.getBuilder().create(); - - return gson.toJson(result); - } - return null; - } - public static Object fromSerializedString(String result) { try { if(result != null && !result.isEmpty()) { diff --git a/server/src/com/cloud/api/ResponseObject.java b/server/src/com/cloud/api/ResponseObject.java index 6941ec225b9..c5123c1a632 100644 --- a/server/src/com/cloud/api/ResponseObject.java +++ b/server/src/com/cloud/api/ResponseObject.java @@ -1,4 +1,15 @@ package com.cloud.api; public interface ResponseObject { + /** + * Get the name of the API response + * @return the name of the API response + */ + String getResponseName(); + + /** + * Set the name of the API response + * @param name + */ + void setResponseName(String name); } diff --git a/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java b/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java index 898c4dcc606..d5c6856d359 100644 --- a/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java +++ b/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java @@ -27,6 +27,7 @@ import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; +import com.cloud.api.response.ApiResponseSerializer; import com.cloud.api.response.CloudIdentifierResponse; import com.cloud.serializer.SerializerHelper; @@ -60,9 +61,10 @@ public class GetCloudIdentifierCmd extends BaseCmd { return s_name; } - @Override + @Override @SuppressWarnings("unchecked") public String getResponse() { CloudIdentifierResponse response = new CloudIdentifierResponse(); + response.se ArrayList responseObject = (ArrayList)getResponseObject(); if (responseObject != null) { response.setCloudIdentifier(responseObject.get(0)); @@ -71,6 +73,6 @@ public class GetCloudIdentifierCmd extends BaseCmd { } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add config"); } - return SerializerHelper.toSerializedString(responseObject); + return ApiResponseSerializer.toSerializedString(responseObject); } } \ No newline at end of file diff --git a/server/src/com/cloud/api/response/AccountResponse.java b/server/src/com/cloud/api/response/AccountResponse.java index b52970dec82..85d1220567f 100644 --- a/server/src/com/cloud/api/response/AccountResponse.java +++ b/server/src/com/cloud/api/response/AccountResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class AccountResponse implements ResponseObject { +public class AccountResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/AlertResponse.java b/server/src/com/cloud/api/response/AlertResponse.java index 3aff5cec3ce..b83acf3c279 100644 --- a/server/src/com/cloud/api/response/AlertResponse.java +++ b/server/src/com/cloud/api/response/AlertResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class AlertResponse implements ResponseObject { +public class AlertResponse extends BaseResponse { @Param(name="type") private Short alertType; diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java b/server/src/com/cloud/api/response/ApiResponseSerializer.java new file mode 100644 index 00000000000..43cad64a152 --- /dev/null +++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java @@ -0,0 +1,17 @@ +package com.cloud.api.response; + +import com.cloud.api.ResponseObject; +import com.cloud.serializer.GsonHelper; +import com.google.gson.Gson; + +public class ApiResponseSerializer { + // FIXME: what about XML response? + public static String toSerializedString(ResponseObject result) { + if (result != null) { + Gson gson = GsonHelper.getBuilder().create(); + + return gson.toJson(result); + } + return null; + } +} diff --git a/server/src/com/cloud/api/response/AsyncJobResponse.java b/server/src/com/cloud/api/response/AsyncJobResponse.java index 65f67b9c902..cf07b12d35f 100644 --- a/server/src/com/cloud/api/response/AsyncJobResponse.java +++ b/server/src/com/cloud/api/response/AsyncJobResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class AsyncJobResponse implements ResponseObject { +public class AsyncJobResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/BaseResponse.java b/server/src/com/cloud/api/response/BaseResponse.java new file mode 100644 index 00000000000..5f40a3b8da0 --- /dev/null +++ b/server/src/com/cloud/api/response/BaseResponse.java @@ -0,0 +1,18 @@ +package com.cloud.api.response; + +import com.cloud.api.ResponseObject; + +public class BaseResponse implements ResponseObject { + private String responseName; + + @Override + public String getResponseName() { + return responseName; + } + + @Override + public void setResponseName(String responseName) { + this.responseName = responseName; + } + +} diff --git a/server/src/com/cloud/api/response/CapacityResponse.java b/server/src/com/cloud/api/response/CapacityResponse.java index 6c50b4c0ab8..ec327992c5d 100644 --- a/server/src/com/cloud/api/response/CapacityResponse.java +++ b/server/src/com/cloud/api/response/CapacityResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class CapacityResponse implements ResponseObject { +public class CapacityResponse extends BaseResponse { @Param(name="type") private Short capacityType; diff --git a/server/src/com/cloud/api/response/CloudIdentifierResponse.java b/server/src/com/cloud/api/response/CloudIdentifierResponse.java index bb442c8f2b2..f8ebf6ad906 100644 --- a/server/src/com/cloud/api/response/CloudIdentifierResponse.java +++ b/server/src/com/cloud/api/response/CloudIdentifierResponse.java @@ -1,9 +1,8 @@ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class CloudIdentifierResponse implements ResponseObject{ +public class CloudIdentifierResponse extends BaseResponse { @Param(name="userid") private Long userId; diff --git a/server/src/com/cloud/api/response/ClusterResponse.java b/server/src/com/cloud/api/response/ClusterResponse.java index 2ae7a9244ed..a157308868c 100644 --- a/server/src/com/cloud/api/response/ClusterResponse.java +++ b/server/src/com/cloud/api/response/ClusterResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class ClusterResponse implements ResponseObject { +public class ClusterResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/ConfigurationResponse.java b/server/src/com/cloud/api/response/ConfigurationResponse.java index 0f12e3349a6..2f64f04fa0a 100644 --- a/server/src/com/cloud/api/response/ConfigurationResponse.java +++ b/server/src/com/cloud/api/response/ConfigurationResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class ConfigurationResponse implements ResponseObject { +public class ConfigurationResponse extends BaseResponse { @Param(name="category") private String category; diff --git a/server/src/com/cloud/api/response/CreateCmdResponse.java b/server/src/com/cloud/api/response/CreateCmdResponse.java index cd7c4619ef9..b309d6b10ff 100644 --- a/server/src/com/cloud/api/response/CreateCmdResponse.java +++ b/server/src/com/cloud/api/response/CreateCmdResponse.java @@ -1,9 +1,8 @@ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class CreateCmdResponse implements ResponseObject { +public class CreateCmdResponse extends BaseResponse { @Param(name="jobid") private Long jobId; diff --git a/server/src/com/cloud/api/response/DeleteDomainResponse.java b/server/src/com/cloud/api/response/DeleteDomainResponse.java index b25774ac9a4..45954026887 100644 --- a/server/src/com/cloud/api/response/DeleteDomainResponse.java +++ b/server/src/com/cloud/api/response/DeleteDomainResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class DeleteDomainResponse implements ResponseObject { +public class DeleteDomainResponse extends BaseResponse { @Param(name="result") private String result; diff --git a/server/src/com/cloud/api/response/DeletePreallocatedLunResponse.java b/server/src/com/cloud/api/response/DeletePreallocatedLunResponse.java index 2ec58d3a51a..6f0b767c32f 100644 --- a/server/src/com/cloud/api/response/DeletePreallocatedLunResponse.java +++ b/server/src/com/cloud/api/response/DeletePreallocatedLunResponse.java @@ -1,9 +1,8 @@ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class DeletePreallocatedLunResponse implements ResponseObject { +public class DeletePreallocatedLunResponse extends BaseResponse { @Param(name="success") private Boolean success; diff --git a/server/src/com/cloud/api/response/DiskOfferingResponse.java b/server/src/com/cloud/api/response/DiskOfferingResponse.java index 5945eb47e19..0c7ce399219 100644 --- a/server/src/com/cloud/api/response/DiskOfferingResponse.java +++ b/server/src/com/cloud/api/response/DiskOfferingResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class DiskOfferingResponse implements ResponseObject { +public class DiskOfferingResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/DomainResponse.java b/server/src/com/cloud/api/response/DomainResponse.java index 927b02bfad4..a63d688fdf0 100644 --- a/server/src/com/cloud/api/response/DomainResponse.java +++ b/server/src/com/cloud/api/response/DomainResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class DomainResponse implements ResponseObject { +public class DomainResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/DomainRouterResponse.java b/server/src/com/cloud/api/response/DomainRouterResponse.java index 23bc79a3458..1e1ff2617a3 100644 --- a/server/src/com/cloud/api/response/DomainRouterResponse.java +++ b/server/src/com/cloud/api/response/DomainRouterResponse.java @@ -19,11 +19,10 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; import com.cloud.vm.State; -public class DomainRouterResponse implements ResponseObject { +public class DomainRouterResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/EventResponse.java b/server/src/com/cloud/api/response/EventResponse.java index f2030ec8a9e..9db3338d87b 100644 --- a/server/src/com/cloud/api/response/EventResponse.java +++ b/server/src/com/cloud/api/response/EventResponse.java @@ -19,11 +19,10 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.event.EventState; import com.cloud.serializer.Param; -public class EventResponse implements ResponseObject { +public class EventResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/FirewallRuleResponse.java b/server/src/com/cloud/api/response/FirewallRuleResponse.java index 09afffa6113..c3359bd3bd9 100644 --- a/server/src/com/cloud/api/response/FirewallRuleResponse.java +++ b/server/src/com/cloud/api/response/FirewallRuleResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class FirewallRuleResponse implements ResponseObject { +public class FirewallRuleResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/GuestOSCategoryResponse.java b/server/src/com/cloud/api/response/GuestOSCategoryResponse.java index 2065ea4c0e8..2ab35403d12 100644 --- a/server/src/com/cloud/api/response/GuestOSCategoryResponse.java +++ b/server/src/com/cloud/api/response/GuestOSCategoryResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class GuestOSCategoryResponse implements ResponseObject { +public class GuestOSCategoryResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/GuestOSResponse.java b/server/src/com/cloud/api/response/GuestOSResponse.java index d8b9603ef44..7f39c0eb689 100644 --- a/server/src/com/cloud/api/response/GuestOSResponse.java +++ b/server/src/com/cloud/api/response/GuestOSResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class GuestOSResponse implements ResponseObject { +public class GuestOSResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/HostResponse.java b/server/src/com/cloud/api/response/HostResponse.java index 722f034135c..a50a81a08b6 100644 --- a/server/src/com/cloud/api/response/HostResponse.java +++ b/server/src/com/cloud/api/response/HostResponse.java @@ -19,13 +19,12 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.host.Host; import com.cloud.host.Status; import com.cloud.hypervisor.Hypervisor; import com.cloud.serializer.Param; -public class HostResponse implements ResponseObject { +public class HostResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/IPAddressResponse.java b/server/src/com/cloud/api/response/IPAddressResponse.java index fd447bbbb53..1591f97b1c4 100644 --- a/server/src/com/cloud/api/response/IPAddressResponse.java +++ b/server/src/com/cloud/api/response/IPAddressResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class IPAddressResponse implements ResponseObject { +public class IPAddressResponse extends BaseResponse { @Param(name="ipaddress") private String ipAddress; diff --git a/server/src/com/cloud/api/response/IngressRuleResponse.java b/server/src/com/cloud/api/response/IngressRuleResponse.java index 0f74b20e9f4..22335a8899c 100644 --- a/server/src/com/cloud/api/response/IngressRuleResponse.java +++ b/server/src/com/cloud/api/response/IngressRuleResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class IngressRuleResponse implements ResponseObject { +public class IngressRuleResponse extends BaseResponse { @Param(name="ruleid") private Long ruleId; diff --git a/server/src/com/cloud/api/response/LoadBalancerResponse.java b/server/src/com/cloud/api/response/LoadBalancerResponse.java index 1db3d39d47c..897d7b06fc3 100644 --- a/server/src/com/cloud/api/response/LoadBalancerResponse.java +++ b/server/src/com/cloud/api/response/LoadBalancerResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class LoadBalancerResponse implements ResponseObject { +public class LoadBalancerResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/NetworkGroupResponse.java b/server/src/com/cloud/api/response/NetworkGroupResponse.java index fd12715c38c..5ce65fc1743 100644 --- a/server/src/com/cloud/api/response/NetworkGroupResponse.java +++ b/server/src/com/cloud/api/response/NetworkGroupResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.List; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class NetworkGroupResponse implements ResponseObject { +public class NetworkGroupResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/PodResponse.java b/server/src/com/cloud/api/response/PodResponse.java index 5789b62b554..f728db03426 100644 --- a/server/src/com/cloud/api/response/PodResponse.java +++ b/server/src/com/cloud/api/response/PodResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class PodResponse implements ResponseObject { +public class PodResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/PortForwardingServiceRuleResponse.java b/server/src/com/cloud/api/response/PortForwardingServiceRuleResponse.java index 27b383bcbb5..d54d0c82ccc 100644 --- a/server/src/com/cloud/api/response/PortForwardingServiceRuleResponse.java +++ b/server/src/com/cloud/api/response/PortForwardingServiceRuleResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class PortForwardingServiceRuleResponse implements ResponseObject { +public class PortForwardingServiceRuleResponse extends BaseResponse { @Param(name="id") private long ruleId; diff --git a/server/src/com/cloud/api/response/PreallocatedLunResponse.java b/server/src/com/cloud/api/response/PreallocatedLunResponse.java index 7ac641c17be..7ef3e926ca7 100644 --- a/server/src/com/cloud/api/response/PreallocatedLunResponse.java +++ b/server/src/com/cloud/api/response/PreallocatedLunResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class PreallocatedLunResponse implements ResponseObject { +public class PreallocatedLunResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/ResourceLimitResponse.java b/server/src/com/cloud/api/response/ResourceLimitResponse.java index 8f5d43bb115..6d3ea6ae7cf 100644 --- a/server/src/com/cloud/api/response/ResourceLimitResponse.java +++ b/server/src/com/cloud/api/response/ResourceLimitResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class ResourceLimitResponse implements ResponseObject { +public class ResourceLimitResponse extends BaseResponse { @Param(name="account") private String accountName; diff --git a/server/src/com/cloud/api/response/SecurityGroupResponse.java b/server/src/com/cloud/api/response/SecurityGroupResponse.java index c60e0590943..5e54f7f2d72 100644 --- a/server/src/com/cloud/api/response/SecurityGroupResponse.java +++ b/server/src/com/cloud/api/response/SecurityGroupResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class SecurityGroupResponse implements ResponseObject { +public class SecurityGroupResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/ServiceOfferingResponse.java b/server/src/com/cloud/api/response/ServiceOfferingResponse.java index 465c60dd8ac..408843b7949 100644 --- a/server/src/com/cloud/api/response/ServiceOfferingResponse.java +++ b/server/src/com/cloud/api/response/ServiceOfferingResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class ServiceOfferingResponse implements ResponseObject { +public class ServiceOfferingResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/SnapshotPolicyResponse.java b/server/src/com/cloud/api/response/SnapshotPolicyResponse.java index ddef2b47ec9..b5e301a2b4f 100644 --- a/server/src/com/cloud/api/response/SnapshotPolicyResponse.java +++ b/server/src/com/cloud/api/response/SnapshotPolicyResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class SnapshotPolicyResponse implements ResponseObject { +public class SnapshotPolicyResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/SnapshotResponse.java b/server/src/com/cloud/api/response/SnapshotResponse.java index 7e5bd6ca79b..c6540ec2f03 100644 --- a/server/src/com/cloud/api/response/SnapshotResponse.java +++ b/server/src/com/cloud/api/response/SnapshotResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class SnapshotResponse implements ResponseObject { +public class SnapshotResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/SnapshotScheduleResponse.java b/server/src/com/cloud/api/response/SnapshotScheduleResponse.java index f1094f27487..aaad4aa2d5a 100644 --- a/server/src/com/cloud/api/response/SnapshotScheduleResponse.java +++ b/server/src/com/cloud/api/response/SnapshotScheduleResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class SnapshotScheduleResponse implements ResponseObject { +public class SnapshotScheduleResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/StoragePoolResponse.java b/server/src/com/cloud/api/response/StoragePoolResponse.java index 518fdea6ef7..4c12ecc5649 100644 --- a/server/src/com/cloud/api/response/StoragePoolResponse.java +++ b/server/src/com/cloud/api/response/StoragePoolResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class StoragePoolResponse implements ResponseObject { +public class StoragePoolResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/SuccessResponse.java b/server/src/com/cloud/api/response/SuccessResponse.java index 9bf87bbac8d..c5a1e6cb1eb 100644 --- a/server/src/com/cloud/api/response/SuccessResponse.java +++ b/server/src/com/cloud/api/response/SuccessResponse.java @@ -1,9 +1,8 @@ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class SuccessResponse implements ResponseObject{ +public class SuccessResponse extends BaseResponse { @Param(name="success") private Boolean success; diff --git a/server/src/com/cloud/api/response/SystemVmResponse.java b/server/src/com/cloud/api/response/SystemVmResponse.java index d2bc6befff7..c66514629c2 100644 --- a/server/src/com/cloud/api/response/SystemVmResponse.java +++ b/server/src/com/cloud/api/response/SystemVmResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class SystemVmResponse implements ResponseObject { +public class SystemVmResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/TemplatePermissionsResponse.java b/server/src/com/cloud/api/response/TemplatePermissionsResponse.java index 66b17a7a810..1acb5d3c4e3 100644 --- a/server/src/com/cloud/api/response/TemplatePermissionsResponse.java +++ b/server/src/com/cloud/api/response/TemplatePermissionsResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.List; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class TemplatePermissionsResponse implements ResponseObject { +public class TemplatePermissionsResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/TemplateResponse.java b/server/src/com/cloud/api/response/TemplateResponse.java index bad36b25a26..85a9b46016f 100644 --- a/server/src/com/cloud/api/response/TemplateResponse.java +++ b/server/src/com/cloud/api/response/TemplateResponse.java @@ -19,11 +19,10 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; import com.cloud.storage.Storage.ImageFormat; -public class TemplateResponse implements ResponseObject { +public class TemplateResponse extends BaseResponse { @Param(name="id") private long id; diff --git a/server/src/com/cloud/api/response/UpgradeVmResponse.java b/server/src/com/cloud/api/response/UpgradeVmResponse.java index 196c259ba6c..2d9aee4b124 100644 --- a/server/src/com/cloud/api/response/UpgradeVmResponse.java +++ b/server/src/com/cloud/api/response/UpgradeVmResponse.java @@ -19,280 +19,277 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class UpgradeVmResponse implements ResponseObject -{ - @Param(name="id") - private long id; - - public String getName() { - return name; - } +public class UpgradeVmResponse extends BaseResponse { + @Param(name = "id") + private long id; - public void setName(String name) { - this.name = name; - } - - public Date getCreated() { - return created; - } - - public void setCreated(Date created) { - this.created = created; - } - - public String getIpAddress() { - return ipAddress; - } - - public void setIpAddress(String ipAddress) { - this.ipAddress = ipAddress; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public String getAccount() { - return account; - } - - public void setAccount(String account) { - this.account = account; - } - - public long getDomainId() { - return domainId; - } - - public void setDomainId(long domainId) { - this.domainId = domainId; - } - - public String getDomain() { - return domain; - } - - public void setDomain(String domain) { - this.domain = domain; - } - - public boolean isHaEnable() { - return haEnable; - } - - public void setHaEnable(boolean haEnable) { - this.haEnable = haEnable; - } - - public long getZoneId() { - return zoneId; - } - - public void setZoneId(long zoneId) { - this.zoneId = zoneId; - } - - public String getDisplayName() { - return displayName; - } - - public void setDisplayName(String displayName) { - this.displayName = displayName; - } - - public String getZoneName() { - return zoneName; - } - - public void setZoneName(String zoneName) { - this.zoneName = zoneName; - } - - public long getHostId() { - return hostId; - } - - public void setHostId(long hostId) { - this.hostId = hostId; - } - - public String getHostName() { - return hostName; - } - - public void setHostName(String hostName) { - this.hostName = hostName; - } - - public long getTemplateId() { - return templateId; - } - - public void setTemplateId(long templateId) { - this.templateId = templateId; - } - - public String getTemplateName() { - return templateName; - } - - public void setTemplateName(String templateName) { - this.templateName = templateName; - } - - public String getTemplateDisplayText() { - return templateDisplayText; - } - - public void setTemplateDisplayText(String templateDisplayText) { - this.templateDisplayText = templateDisplayText; - } - - public boolean isPasswordEnabled() { - return passwordEnabled; - } - - public void setPasswordEnabled(boolean passwordEnabled) { - this.passwordEnabled = passwordEnabled; - } - - public long getServiceOfferingId() { - return serviceOfferingId; - } - - public void setServiceOfferingId(long serviceOfferingId) { - this.serviceOfferingId = serviceOfferingId; - } - - public String getServiceOfferingName() { - return serviceOfferingName; - } - - public void setServiceOfferingName(String serviceOfferingName) { - this.serviceOfferingName = serviceOfferingName; - } - - public long getCpuSpeed() { - return cpuSpeed; - } - - public void setCpuSpeed(long cpuSpeed) { - this.cpuSpeed = cpuSpeed; - } - - public long getMemory() { - return memory; - } - - public void setMemory(long memory) { - this.memory = memory; - } - - public long getCpuUsed() { - return cpuUsed; - } - - public void setCpuUsed(long cpuUsed) { - this.cpuUsed = cpuUsed; - } - - public long getNetworkKbsRead() { - return networkKbsRead; - } - - public void setNetworkKbsRead(long networkKbsRead) { - this.networkKbsRead = networkKbsRead; - } - - public long getNetworkKbsWrite() { - return networkKbsWrite; - } - - public void setNetworkKbsWrite(long networkKbsWrite) { - this.networkKbsWrite = networkKbsWrite; - } - - public long isId() - { - return id; - } - - @Param(name="name") - private String name; - - @Param(name="created") - private Date created; - - @Param(name="ipaddress") - private String ipAddress; - - @Param(name="state") - private String state; - - @Param(name="account") - private String account; - - @Param(name="domainid") - private long domainId; - - @Param(name="domain") - private String domain; - - @Param(name="haenable") - private boolean haEnable; - - @Param(name="zoneid") - private long zoneId; - - @Param(name="displayname") - private String displayName; - - @Param(name="zonename") - private String zoneName; - - @Param(name="hostid") - private long hostId; - - @Param(name="hostname") - private String hostName; - - @Param(name="templateid") - private long templateId; - - @Param(name="templatename") - private String templateName; - - @Param(name="templatedisplaytext") - private String templateDisplayText; - - @Param(name="passwordenabled") - private boolean passwordEnabled; - - @Param(name="serviceofferingid") - private long serviceOfferingId; - - @Param(name="serviceofferingname") - private String serviceOfferingName; - - @Param(name="cpunumber") - private long cpuSpeed; - - @Param(name="memory") - private long memory; - - @Param(name="cpuused") - private long cpuUsed; - - @Param(name="networkkbsread") - private long networkKbsRead; - - @Param(name="networkkbswrite") - private long networkKbsWrite; + public String getName() { + return name; } + + public void setName(String name) { + this.name = name; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public String getIpAddress() { + return ipAddress; + } + + public void setIpAddress(String ipAddress) { + this.ipAddress = ipAddress; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public long getDomainId() { + return domainId; + } + + public void setDomainId(long domainId) { + this.domainId = domainId; + } + + public String getDomain() { + return domain; + } + + public void setDomain(String domain) { + this.domain = domain; + } + + public boolean isHaEnable() { + return haEnable; + } + + public void setHaEnable(boolean haEnable) { + this.haEnable = haEnable; + } + + public long getZoneId() { + return zoneId; + } + + public void setZoneId(long zoneId) { + this.zoneId = zoneId; + } + + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public String getZoneName() { + return zoneName; + } + + public void setZoneName(String zoneName) { + this.zoneName = zoneName; + } + + public long getHostId() { + return hostId; + } + + public void setHostId(long hostId) { + this.hostId = hostId; + } + + public String getHostName() { + return hostName; + } + + public void setHostName(String hostName) { + this.hostName = hostName; + } + + public long getTemplateId() { + return templateId; + } + + public void setTemplateId(long templateId) { + this.templateId = templateId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getTemplateDisplayText() { + return templateDisplayText; + } + + public void setTemplateDisplayText(String templateDisplayText) { + this.templateDisplayText = templateDisplayText; + } + + public boolean isPasswordEnabled() { + return passwordEnabled; + } + + public void setPasswordEnabled(boolean passwordEnabled) { + this.passwordEnabled = passwordEnabled; + } + + public long getServiceOfferingId() { + return serviceOfferingId; + } + + public void setServiceOfferingId(long serviceOfferingId) { + this.serviceOfferingId = serviceOfferingId; + } + + public String getServiceOfferingName() { + return serviceOfferingName; + } + + public void setServiceOfferingName(String serviceOfferingName) { + this.serviceOfferingName = serviceOfferingName; + } + + public long getCpuSpeed() { + return cpuSpeed; + } + + public void setCpuSpeed(long cpuSpeed) { + this.cpuSpeed = cpuSpeed; + } + + public long getMemory() { + return memory; + } + + public void setMemory(long memory) { + this.memory = memory; + } + + public long getCpuUsed() { + return cpuUsed; + } + + public void setCpuUsed(long cpuUsed) { + this.cpuUsed = cpuUsed; + } + + public long getNetworkKbsRead() { + return networkKbsRead; + } + + public void setNetworkKbsRead(long networkKbsRead) { + this.networkKbsRead = networkKbsRead; + } + + public long getNetworkKbsWrite() { + return networkKbsWrite; + } + + public void setNetworkKbsWrite(long networkKbsWrite) { + this.networkKbsWrite = networkKbsWrite; + } + + public long isId() { + return id; + } + + @Param(name = "name") + private String name; + + @Param(name = "created") + private Date created; + + @Param(name = "ipaddress") + private String ipAddress; + + @Param(name = "state") + private String state; + + @Param(name = "account") + private String account; + + @Param(name = "domainid") + private long domainId; + + @Param(name = "domain") + private String domain; + + @Param(name = "haenable") + private boolean haEnable; + + @Param(name = "zoneid") + private long zoneId; + + @Param(name = "displayname") + private String displayName; + + @Param(name = "zonename") + private String zoneName; + + @Param(name = "hostid") + private long hostId; + + @Param(name = "hostname") + private String hostName; + + @Param(name = "templateid") + private long templateId; + + @Param(name = "templatename") + private String templateName; + + @Param(name = "templatedisplaytext") + private String templateDisplayText; + + @Param(name = "passwordenabled") + private boolean passwordEnabled; + + @Param(name = "serviceofferingid") + private long serviceOfferingId; + + @Param(name = "serviceofferingname") + private String serviceOfferingName; + + @Param(name = "cpunumber") + private long cpuSpeed; + + @Param(name = "memory") + private long memory; + + @Param(name = "cpuused") + private long cpuUsed; + + @Param(name = "networkkbsread") + private long networkKbsRead; + + @Param(name = "networkkbswrite") + private long networkKbsWrite; +} diff --git a/server/src/com/cloud/api/response/UserResponse.java b/server/src/com/cloud/api/response/UserResponse.java index 86eacdac46c..8a1b3b0e3aa 100644 --- a/server/src/com/cloud/api/response/UserResponse.java +++ b/server/src/com/cloud/api/response/UserResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class UserResponse implements ResponseObject { +public class UserResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/UserVmResponse.java b/server/src/com/cloud/api/response/UserVmResponse.java index a872df81fde..f142f68b8d1 100644 --- a/server/src/com/cloud/api/response/UserVmResponse.java +++ b/server/src/com/cloud/api/response/UserVmResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class UserVmResponse implements ResponseObject { +public class UserVmResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/VlanIpRangeResponse.java b/server/src/com/cloud/api/response/VlanIpRangeResponse.java index 3a87250422b..daaba9a3231 100644 --- a/server/src/com/cloud/api/response/VlanIpRangeResponse.java +++ b/server/src/com/cloud/api/response/VlanIpRangeResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class VlanIpRangeResponse implements ResponseObject { +public class VlanIpRangeResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/VolumeResponse.java b/server/src/com/cloud/api/response/VolumeResponse.java index 87e8ce2edce..29da831bc03 100644 --- a/server/src/com/cloud/api/response/VolumeResponse.java +++ b/server/src/com/cloud/api/response/VolumeResponse.java @@ -19,10 +19,9 @@ package com.cloud.api.response; import java.util.Date; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class VolumeResponse implements ResponseObject { +public class VolumeResponse extends BaseResponse { @Param(name="id") private Long id; diff --git a/server/src/com/cloud/api/response/ZoneResponse.java b/server/src/com/cloud/api/response/ZoneResponse.java index c41e185ca08..3f508c177f8 100644 --- a/server/src/com/cloud/api/response/ZoneResponse.java +++ b/server/src/com/cloud/api/response/ZoneResponse.java @@ -17,10 +17,9 @@ */ package com.cloud.api.response; -import com.cloud.api.ResponseObject; import com.cloud.serializer.Param; -public class ZoneResponse implements ResponseObject { +public class ZoneResponse extends BaseResponse { @Param(name="id") private Long id;