You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/11/20 16:35:12 UTC

[25/51] [partial] Reformat all source code. Added checkstyle to check the source code

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java
index b4cf5e7..3616bbf 100644
--- a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java
@@ -26,70 +26,100 @@ import com.cloud.network.Site2SiteVpnConnection;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
-@EntityReference(value=Site2SiteVpnConnection.class)
+@EntityReference(value = Site2SiteVpnConnection.class)
 @SuppressWarnings("unused")
 public class Site2SiteVpnConnectionResponse extends BaseResponse implements ControlledEntityResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the vpn gateway ID")
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "the vpn gateway ID")
     private String id;
 
-    @SerializedName(ApiConstants.S2S_VPN_GATEWAY_ID) @Param(description="the vpn gateway ID")
+    @SerializedName(ApiConstants.S2S_VPN_GATEWAY_ID)
+    @Param(description = "the vpn gateway ID")
     private String vpnGatewayId;
 
-    @SerializedName(ApiConstants.PUBLIC_IP) @Param(description="the public IP address") //from VpnGateway
+    @SerializedName(ApiConstants.PUBLIC_IP)
+    @Param(description = "the public IP address")
+    //from VpnGateway
     private String ip;
 
-    @SerializedName(ApiConstants.S2S_CUSTOMER_GATEWAY_ID) @Param(description="the customer gateway ID")
+    @SerializedName(ApiConstants.S2S_CUSTOMER_GATEWAY_ID)
+    @Param(description = "the customer gateway ID")
     private String customerGatewayId;
 
-    @SerializedName(ApiConstants.GATEWAY) @Param(description="public ip address id of the customer gateway") //from CustomerGateway
+    @SerializedName(ApiConstants.GATEWAY)
+    @Param(description = "public ip address id of the customer gateway")
+    //from CustomerGateway
     private String gatewayIp;
 
-    @SerializedName(ApiConstants.CIDR_LIST) @Param(description="guest cidr list of the customer gateway") //from CustomerGateway
+    @SerializedName(ApiConstants.CIDR_LIST)
+    @Param(description = "guest cidr list of the customer gateway")
+    //from CustomerGateway
     private String guestCidrList;
 
-    @SerializedName(ApiConstants.IPSEC_PSK) @Param(description="IPsec Preshared-Key of the customer gateway") //from CustomerGateway
+    @SerializedName(ApiConstants.IPSEC_PSK)
+    @Param(description = "IPsec Preshared-Key of the customer gateway")
+    //from CustomerGateway
     private String ipsecPsk;
 
-    @SerializedName(ApiConstants.IKE_POLICY) @Param(description="IKE policy of the customer gateway") //from CustomerGateway
+    @SerializedName(ApiConstants.IKE_POLICY)
+    @Param(description = "IKE policy of the customer gateway")
+    //from CustomerGateway
     private String ikePolicy;
 
-    @SerializedName(ApiConstants.ESP_POLICY) @Param(description="ESP policy of the customer gateway") //from CustomerGateway
+    @SerializedName(ApiConstants.ESP_POLICY)
+    @Param(description = "ESP policy of the customer gateway")
+    //from CustomerGateway
     private String espPolicy;
 
-    @SerializedName(ApiConstants.IKE_LIFETIME) @Param(description="Lifetime of IKE SA of customer gateway") //from CustomerGateway
+    @SerializedName(ApiConstants.IKE_LIFETIME)
+    @Param(description = "Lifetime of IKE SA of customer gateway")
+    //from CustomerGateway
     private Long ikeLifetime;
 
-    @SerializedName(ApiConstants.ESP_LIFETIME) @Param(description="Lifetime of ESP SA of customer gateway") //from CustomerGateway
+    @SerializedName(ApiConstants.ESP_LIFETIME)
+    @Param(description = "Lifetime of ESP SA of customer gateway")
+    //from CustomerGateway
     private Long espLifetime;
 
-    @SerializedName(ApiConstants.DPD) @Param(description="if DPD is enabled for customer gateway") //from CustomerGateway
+    @SerializedName(ApiConstants.DPD)
+    @Param(description = "if DPD is enabled for customer gateway")
+    //from CustomerGateway
     private Boolean dpd;
 
-    @SerializedName(ApiConstants.STATE) @Param(description="State of vpn connection")
+    @SerializedName(ApiConstants.STATE)
+    @Param(description = "State of vpn connection")
     private String state;
 
-    @SerializedName(ApiConstants.PASSIVE) @Param(description="State of vpn connection")
+    @SerializedName(ApiConstants.PASSIVE)
+    @Param(description = "State of vpn connection")
     private boolean passive;
 
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner")
+    @SerializedName(ApiConstants.ACCOUNT)
+    @Param(description = "the owner")
     private String accountName;
 
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id")
+    @SerializedName(ApiConstants.PROJECT_ID)
+    @Param(description = "the project id")
     private String projectId;
 
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name")
+    @SerializedName(ApiConstants.PROJECT)
+    @Param(description = "the project name")
     private String projectName;
 
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the owner")
+    @SerializedName(ApiConstants.DOMAIN_ID)
+    @Param(description = "the domain id of the owner")
     private String domainId;
 
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the owner")
+    @SerializedName(ApiConstants.DOMAIN)
+    @Param(description = "the domain name of the owner")
     private String domain;
 
-    @SerializedName(ApiConstants.CREATED) @Param(description="the date and time the host was created")
+    @SerializedName(ApiConstants.CREATED)
+    @Param(description = "the date and time the host was created")
     private Date created;
 
-    @SerializedName(ApiConstants.REMOVED) @Param(description="the date and time the host was removed")
+    @SerializedName(ApiConstants.REMOVED)
+    @Param(description = "the date and time the host was removed")
     private Date removed;
 
     public void setId(String id) {
@@ -137,16 +167,16 @@ public class Site2SiteVpnConnectionResponse extends BaseResponse implements Cont
     }
 
     public void setDpd(Boolean dpd) {
-        this.dpd= dpd;
+        this.dpd = dpd;
     }
 
     public void setState(String state) {
         this.state = state;
     }
 
-	public void setPassive(boolean passive) {
-		this.passive = passive;
-	}
+    public void setPassive(boolean passive) {
+        this.passive = passive;
+    }
 
     public void setCreated(Date created) {
         this.created = created;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java
index 06dbf37..d9dc920 100644
--- a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java
@@ -26,34 +26,43 @@ import com.cloud.network.Site2SiteVpnGateway;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
-@EntityReference(value=Site2SiteVpnGateway.class)
+@EntityReference(value = Site2SiteVpnGateway.class)
 @SuppressWarnings("unused")
 public class Site2SiteVpnGatewayResponse extends BaseResponse implements ControlledEntityResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the vpn gateway ID")
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "the vpn gateway ID")
     private String id;
 
-    @SerializedName(ApiConstants.PUBLIC_IP) @Param(description="the public IP address")
+    @SerializedName(ApiConstants.PUBLIC_IP)
+    @Param(description = "the public IP address")
     private String ip;
 
-    @SerializedName(ApiConstants.VPC_ID) @Param(description="the vpc id of this gateway")
+    @SerializedName(ApiConstants.VPC_ID)
+    @Param(description = "the vpc id of this gateway")
     private String vpcId;
 
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner")
+    @SerializedName(ApiConstants.ACCOUNT)
+    @Param(description = "the owner")
     private String accountName;
 
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id")
+    @SerializedName(ApiConstants.PROJECT_ID)
+    @Param(description = "the project id")
     private String projectId;
 
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name")
+    @SerializedName(ApiConstants.PROJECT)
+    @Param(description = "the project name")
     private String projectName;
 
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the owner")
+    @SerializedName(ApiConstants.DOMAIN_ID)
+    @Param(description = "the domain id of the owner")
     private String domainId;
 
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the owner")
+    @SerializedName(ApiConstants.DOMAIN)
+    @Param(description = "the domain name of the owner")
     private String domain;
 
-    @SerializedName(ApiConstants.REMOVED) @Param(description="the date and time the host was removed")
+    @SerializedName(ApiConstants.REMOVED)
+    @Param(description = "the date and time the host was removed")
     private Date removed;
 
     public void setId(String id) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java b/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
index 2b7f9f4..419d505 100644
--- a/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
@@ -23,24 +23,30 @@ import com.cloud.serializer.Param;
 import com.cloud.storage.snapshot.SnapshotPolicy;
 import com.google.gson.annotations.SerializedName;
 
-@EntityReference(value=SnapshotPolicy.class)
+@EntityReference(value = SnapshotPolicy.class)
 public class SnapshotPolicyResponse extends BaseResponse {
-    @SerializedName("id") @Param(description="the ID of the snapshot policy")
+    @SerializedName("id")
+    @Param(description = "the ID of the snapshot policy")
     private String id;
 
-    @SerializedName("volumeid") @Param(description="the ID of the disk volume")
+    @SerializedName("volumeid")
+    @Param(description = "the ID of the disk volume")
     private String volumeId;
 
-    @SerializedName("schedule") @Param(description="time the snapshot is scheduled to be taken.")
+    @SerializedName("schedule")
+    @Param(description = "time the snapshot is scheduled to be taken.")
     private String schedule;
 
-    @SerializedName("intervaltype") @Param(description="the interval type of the snapshot policy")
+    @SerializedName("intervaltype")
+    @Param(description = "the interval type of the snapshot policy")
     private short intervalType;
 
-    @SerializedName("maxsnaps") @Param(description="maximum number of snapshots retained")
+    @SerializedName("maxsnaps")
+    @Param(description = "maximum number of snapshots retained")
     private int maxSnaps;
 
-    @SerializedName("timezone") @Param(description="the time zone of the snapshot policy")
+    @SerializedName("timezone")
+    @Param(description = "the time zone of the snapshot policy")
     private String timezone;
 
     public String getId() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java b/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
index 7c2b4a9..841f3f2 100644
--- a/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
@@ -27,7 +27,7 @@ import com.cloud.serializer.Param;
 import com.cloud.storage.Snapshot;
 import com.google.gson.annotations.SerializedName;
 
-@EntityReference(value=Snapshot.class)
+@EntityReference(value = Snapshot.class)
 public class SnapshotResponse extends BaseResponse implements ControlledEntityResponse {
     @SerializedName(ApiConstants.ID)
     @Param(description = "ID of the snapshot")
@@ -45,10 +45,12 @@ public class SnapshotResponse extends BaseResponse implements ControlledEntityRe
     @Param(description = "the domain name of the snapshot's account")
     private String domainName;
 
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the snapshot")
+    @SerializedName(ApiConstants.PROJECT_ID)
+    @Param(description = "the project id of the snapshot")
     private String projectId;
 
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the snapshot")
+    @SerializedName(ApiConstants.PROJECT)
+    @Param(description = "the project name of the snapshot")
     private String projectName;
 
     @SerializedName(ApiConstants.SNAPSHOT_TYPE)
@@ -87,11 +89,12 @@ public class SnapshotResponse extends BaseResponse implements ControlledEntityRe
     @Param(description = "id of the availability zone")
     private String zoneId;
 
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with snapshot", responseObject = ResourceTagResponse.class)
+    @SerializedName(ApiConstants.TAGS)
+    @Param(description = "the list of resource tags associated with snapshot", responseObject = ResourceTagResponse.class)
     private List<ResourceTagResponse> tags;
 
     @SerializedName(ApiConstants.REVERTABLE)
-    @Param(description="indicates whether the underlying storage supports reverting the volume to this snapshot")
+    @Param(description = "indicates whether the underlying storage supports reverting the volume to this snapshot")
     private boolean revertable;
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java b/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java
index a25d02f..7934602 100644
--- a/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java
@@ -24,16 +24,20 @@ import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
 public class SnapshotScheduleResponse extends BaseResponse {
-    @SerializedName("id") @Param(description="the ID of the snapshot schedule")
+    @SerializedName("id")
+    @Param(description = "the ID of the snapshot schedule")
     private String id;
 
-    @SerializedName("volumeid") @Param(description="the volume ID the snapshot schedule applied for")
+    @SerializedName("volumeid")
+    @Param(description = "the volume ID the snapshot schedule applied for")
     private String volumeId;
 
-    @SerializedName("snapshotpolicyid") @Param(description="the snapshot policy ID used by the snapshot schedule")
+    @SerializedName("snapshotpolicyid")
+    @Param(description = "the snapshot policy ID used by the snapshot schedule")
     private String snapshotPolicyId;
 
-    @SerializedName("scheduled") @Param(description="time the snapshot is scheduled to be taken")
+    @SerializedName("scheduled")
+    @Param(description = "time the snapshot is scheduled to be taken")
     private Date scheduled;
 
     public String getId() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/SslCertResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SslCertResponse.java b/api/src/org/apache/cloudstack/api/response/SslCertResponse.java
index 3e8b7ae..17cad57 100644
--- a/api/src/org/apache/cloudstack/api/response/SslCertResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SslCertResponse.java
@@ -24,9 +24,10 @@ import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
 import java.util.List;
+
 //import org.apache.cloudstack.api.EntityReference;
 
-@EntityReference(value= SslCert.class)
+@EntityReference(value = SslCert.class)
 public class SslCertResponse extends BaseResponse {
 
     @SerializedName(ApiConstants.ID)
@@ -80,11 +81,11 @@ public class SslCertResponse extends BaseResponse {
         this.certchain = chain;
     }
 
-    public void setFingerprint(String fingerprint){
+    public void setFingerprint(String fingerprint) {
         this.fingerprint = fingerprint;
     }
 
-    public void setLbIds(List<String> lbIds){
+    public void setLbIds(List<String> lbIds) {
         this.lbIds = lbIds;
     }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java b/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java
index 9001252..3ebe1e5 100644
--- a/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java
@@ -26,32 +26,39 @@ import com.cloud.network.vpc.StaticRoute;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
-@EntityReference(value=StaticRoute.class)
+@EntityReference(value = StaticRoute.class)
 @SuppressWarnings("unused")
-public class StaticRouteResponse extends BaseResponse implements ControlledEntityResponse{
-    @SerializedName(ApiConstants.ID) @Param(description="the ID of static route")
+public class StaticRouteResponse extends BaseResponse implements ControlledEntityResponse {
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "the ID of static route")
     private String id;
 
-    @SerializedName(ApiConstants.STATE) @Param(description="the state of the static route")
+    @SerializedName(ApiConstants.STATE)
+    @Param(description = "the state of the static route")
     private String state;
 
-    @SerializedName(ApiConstants.VPC_ID) @Param(description="VPC the static route belongs to")
+    @SerializedName(ApiConstants.VPC_ID)
+    @Param(description = "VPC the static route belongs to")
     private String vpcId;
 
-    @SerializedName(ApiConstants.GATEWAY_ID) @Param(description="VPC gateway the route is created for")
+    @SerializedName(ApiConstants.GATEWAY_ID)
+    @Param(description = "VPC gateway the route is created for")
     private String gatewayId;
 
-    @SerializedName(ApiConstants.CIDR) @Param(description="static route CIDR")
+    @SerializedName(ApiConstants.CIDR)
+    @Param(description = "static route CIDR")
     private String cidr;
 
     @SerializedName(ApiConstants.ACCOUNT)
     @Param(description = "the account associated with the static route")
     private String accountName;
 
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the static route")
+    @SerializedName(ApiConstants.PROJECT_ID)
+    @Param(description = "the project id of the static route")
     private String projectId;
 
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the static route")
+    @SerializedName(ApiConstants.PROJECT)
+    @Param(description = "the project name of the static route")
     private String projectName;
 
     @SerializedName(ApiConstants.DOMAIN_ID)
@@ -62,11 +69,10 @@ public class StaticRouteResponse extends BaseResponse implements ControlledEntit
     @Param(description = "the domain associated with the static route")
     private String domainName;
 
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with static route",
-            responseObject = ResourceTagResponse.class)
+    @SerializedName(ApiConstants.TAGS)
+    @Param(description = "the list of resource tags associated with static route", responseObject = ResourceTagResponse.class)
     private List<ResourceTagResponse> tags;
 
-
     @Override
     public String getObjectId() {
         return this.id;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/StatusResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/StatusResponse.java b/api/src/org/apache/cloudstack/api/response/StatusResponse.java
index 28776b7..1cb4d8f 100644
--- a/api/src/org/apache/cloudstack/api/response/StatusResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StatusResponse.java
@@ -25,10 +25,10 @@ public class StatusResponse extends BaseResponse {
     private Boolean status;
 
     public Boolean getStatus() {
-       return status;
+        return status;
     }
 
-   public void setStatus(Boolean status) {
-       this.status = status;
-   }
+    public void setStatus(Boolean status) {
+        this.status = status;
+    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java b/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java
index c72d1e2..1e4cad4 100644
--- a/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java
@@ -24,33 +24,42 @@ import com.cloud.dc.StorageNetworkIpRange;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
-@EntityReference(value=StorageNetworkIpRange.class)
+@EntityReference(value = StorageNetworkIpRange.class)
 public class StorageNetworkIpRangeResponse extends BaseResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the uuid of storage network IP range.")
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "the uuid of storage network IP range.")
     private String uuid;
 
-    @SerializedName(ApiConstants.VLAN) @Param(description="the ID or VID of the VLAN.")
+    @SerializedName(ApiConstants.VLAN)
+    @Param(description = "the ID or VID of the VLAN.")
     private Integer vlan;
 
-    @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod uuid for the storage network IP range")
+    @SerializedName(ApiConstants.POD_ID)
+    @Param(description = "the Pod uuid for the storage network IP range")
     private String podUuid;
 
-    @SerializedName(ApiConstants.START_IP) @Param(description="the start ip of the storage network IP range")
+    @SerializedName(ApiConstants.START_IP)
+    @Param(description = "the start ip of the storage network IP range")
     private String startIp;
 
-    @SerializedName(ApiConstants.END_IP) @Param(description="the end ip of the storage network IP range")
+    @SerializedName(ApiConstants.END_IP)
+    @Param(description = "the end ip of the storage network IP range")
     private String endIp;
 
-    @SerializedName(ApiConstants.GATEWAY) @Param(description="the gateway of the storage network IP range")
+    @SerializedName(ApiConstants.GATEWAY)
+    @Param(description = "the gateway of the storage network IP range")
     private String gateway;
 
-    @SerializedName(ApiConstants.NETWORK_ID) @Param(description="the network uuid of storage network IP range")
+    @SerializedName(ApiConstants.NETWORK_ID)
+    @Param(description = "the network uuid of storage network IP range")
     private String networkUuid;
 
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the Zone uuid of the storage network IP range")
+    @SerializedName(ApiConstants.ZONE_ID)
+    @Param(description = "the Zone uuid of the storage network IP range")
     private String zoneUuid;
 
-    @SerializedName(ApiConstants.NETMASK) @Param(description="the netmask of the storage network IP range")
+    @SerializedName(ApiConstants.NETMASK)
+    @Param(description = "the netmask of the storage network IP range")
     private String netmask;
 
     public void setUuid(String uuid) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
index 1c94377..1cc8f6f 100644
--- a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
@@ -27,74 +27,94 @@ import org.apache.cloudstack.api.EntityReference;
 import java.util.Date;
 import java.util.Map;
 
-@EntityReference(value=StoragePool.class)
+@EntityReference(value = StoragePool.class)
 public class StoragePoolResponse extends BaseResponse {
-    @SerializedName("id") @Param(description="the ID of the storage pool")
+    @SerializedName("id")
+    @Param(description = "the ID of the storage pool")
     private String id;
 
-    @SerializedName("zoneid") @Param(description="the Zone ID of the storage pool")
+    @SerializedName("zoneid")
+    @Param(description = "the Zone ID of the storage pool")
     private String zoneId;
 
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the storage pool")
+    @SerializedName(ApiConstants.ZONE_NAME)
+    @Param(description = "the Zone name of the storage pool")
     private String zoneName;
 
-
-    @SerializedName("podid") @Param(description="the Pod ID of the storage pool")
+    @SerializedName("podid")
+    @Param(description = "the Pod ID of the storage pool")
     private String podId;
 
-    @SerializedName("podname") @Param(description="the Pod name of the storage pool")
+    @SerializedName("podname")
+    @Param(description = "the Pod name of the storage pool")
     private String podName;
 
-    @SerializedName("name") @Param(description="the name of the storage pool")
+    @SerializedName("name")
+    @Param(description = "the name of the storage pool")
     private String name;
 
-    @SerializedName("ipaddress") @Param(description="the IP address of the storage pool")
+    @SerializedName("ipaddress")
+    @Param(description = "the IP address of the storage pool")
     private String ipAddress;
 
-    @SerializedName("path") @Param(description="the storage pool path")
+    @SerializedName("path")
+    @Param(description = "the storage pool path")
     private String path;
 
-    @SerializedName("created") @Param(description="the date and time the storage pool was created")
+    @SerializedName("created")
+    @Param(description = "the date and time the storage pool was created")
     private Date created;
 
-    @SerializedName("type") @Param(description="the storage pool type")
+    @SerializedName("type")
+    @Param(description = "the storage pool type")
     private String type;
 
-    @SerializedName("clusterid") @Param(description="the ID of the cluster for the storage pool")
+    @SerializedName("clusterid")
+    @Param(description = "the ID of the cluster for the storage pool")
     private String clusterId;
 
-    @SerializedName("clustername") @Param(description="the name of the cluster for the storage pool")
+    @SerializedName("clustername")
+    @Param(description = "the name of the cluster for the storage pool")
     private String clusterName;
 
-    @SerializedName("disksizetotal") @Param(description="the total disk size of the storage pool")
+    @SerializedName("disksizetotal")
+    @Param(description = "the total disk size of the storage pool")
     private Long diskSizeTotal;
 
-    @SerializedName("disksizeallocated") @Param(description="the host's currently allocated disk size")
+    @SerializedName("disksizeallocated")
+    @Param(description = "the host's currently allocated disk size")
     private Long diskSizeAllocated;
 
-    @SerializedName("disksizeused") @Param(description="the host's currently used disk size")
+    @SerializedName("disksizeused")
+    @Param(description = "the host's currently used disk size")
     private Long diskSizeUsed;
 
-    @SerializedName("capacityiops") @Param(description="IOPS CloudStack can provision from this storage pool")
+    @SerializedName("capacityiops")
+    @Param(description = "IOPS CloudStack can provision from this storage pool")
     private Long capacityIops;
 
-    @SerializedName("tags") @Param(description="the tags for the storage pool")
+    @SerializedName("tags")
+    @Param(description = "the tags for the storage pool")
     private String tags;
 
-    @SerializedName(ApiConstants.STATE) @Param(description="the state of the storage pool")
+    @SerializedName(ApiConstants.STATE)
+    @Param(description = "the state of the storage pool")
     private StoragePoolStatus state;
 
-    @SerializedName(ApiConstants.SCOPE) @Param(description="the scope of the storage pool")
+    @SerializedName(ApiConstants.SCOPE)
+    @Param(description = "the scope of the storage pool")
     private String scope;
 
-    @SerializedName(ApiConstants.HYPERVISOR) @Param(description="the hypervisor type of the storage pool")
+    @SerializedName(ApiConstants.HYPERVISOR)
+    @Param(description = "the hypervisor type of the storage pool")
     private String hypervisor;
 
-    @SerializedName("suitableformigration") @Param(description="true if this pool is suitable to migrate a volume," +
-            " false otherwise")
+    @SerializedName("suitableformigration")
+    @Param(description = "true if this pool is suitable to migrate a volume," + " false otherwise")
     private Boolean suitableForMigration;
 
-    @SerializedName(ApiConstants.STORAGE_CAPABILITIES) @Param(description="the storage pool capabilities")
+    @SerializedName(ApiConstants.STORAGE_CAPABILITIES)
+    @Param(description = "the storage pool capabilities")
     private Map<String, String> caps;
 
     public Map<String, String> getCaps() {
@@ -104,6 +124,7 @@ public class StoragePoolResponse extends BaseResponse {
     public void setCaps(Map<String, String> cap) {
         this.caps = cap;
     }
+
     /**
      * @return the scope
      */

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java b/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java
index 4baf486..344f8e7 100644
--- a/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java
@@ -24,12 +24,14 @@ import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
 public class StorageProviderResponse extends BaseResponse {
-    @SerializedName("name") @Param(description="the name of the storage provider")
+    @SerializedName("name")
+    @Param(description = "the name of the storage provider")
     private String name;
-    
-    @SerializedName("type") @Param(description="the type of the storage provider: primary or image provider")
+
+    @SerializedName("type")
+    @Param(description = "the type of the storage provider: primary or image provider")
     private String type;
-    
+
     /**
      * @return the type
      */
@@ -58,5 +60,4 @@ public class StorageProviderResponse extends BaseResponse {
         this.name = name;
     }
 
-  
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/SuccessResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SuccessResponse.java b/api/src/org/apache/cloudstack/api/response/SuccessResponse.java
index 8647d19..815b837 100644
--- a/api/src/org/apache/cloudstack/api/response/SuccessResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SuccessResponse.java
@@ -22,15 +22,17 @@ import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
 public class SuccessResponse extends BaseResponse {
-     @SerializedName("success") @Param(description="true if operation is executed successfully")
-     private Boolean success = true;
+    @SerializedName("success")
+    @Param(description = "true if operation is executed successfully")
+    private Boolean success = true;
 
-     @SerializedName("displaytext") @Param(description="any text associated with the success or failure")
-     private String displayText;
+    @SerializedName("displaytext")
+    @Param(description = "any text associated with the success or failure")
+    private String displayText;
 
-     public Boolean getSuccess() {
+    public Boolean getSuccess() {
         return success;
-     }
+    }
 
     public void setSuccess(Boolean success) {
         this.success = success;
@@ -44,7 +46,8 @@ public class SuccessResponse extends BaseResponse {
         this.displayText = displayText;
     }
 
-    public SuccessResponse() {}
+    public SuccessResponse() {
+    }
 
     public SuccessResponse(String responseName) {
         super.setResponseName(responseName);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java b/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
index 43411c7..94e404a 100644
--- a/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
@@ -25,26 +25,30 @@ import com.google.gson.annotations.SerializedName;
  * This is the generic response for all types of System VMs (SSVM, consoleproxy, domain routers(router, LB, DHCP))
  */
 public class SystemVmInstanceResponse extends BaseResponse {
-    @SerializedName("id") @Param(description="the ID of the system VM")
+    @SerializedName("id")
+    @Param(description = "the ID of the system VM")
     private String id;
 
-    @SerializedName("systemvmtype") @Param(description="the system VM type")
+    @SerializedName("systemvmtype")
+    @Param(description = "the system VM type")
     private String systemVmType;
 
-    @SerializedName("name") @Param(description="the name of the system VM")
+    @SerializedName("name")
+    @Param(description = "the name of the system VM")
     private String name;
 
-    @SerializedName("hostid") @Param(description="the host ID for the system VM")
+    @SerializedName("hostid")
+    @Param(description = "the host ID for the system VM")
     private String hostId;
 
-    @SerializedName("state") @Param(description="the state of the system VM")
+    @SerializedName("state")
+    @Param(description = "the state of the system VM")
     private String state;
 
-    @SerializedName("role") @Param(description="the role of the system VM")
+    @SerializedName("role")
+    @Param(description = "the role of the system VM")
     private String role;
 
-
-
     public String getId() {
         return id;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
index 8d2798a..c843d89 100644
--- a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
@@ -26,99 +26,123 @@ import com.cloud.serializer.Param;
 import com.cloud.vm.VirtualMachine;
 import com.google.gson.annotations.SerializedName;
 
-@EntityReference(value=VirtualMachine.class)
+@EntityReference(value = VirtualMachine.class)
 public class SystemVmResponse extends BaseResponse {
-    @SerializedName("id") @Param(description="the ID of the system VM")
+    @SerializedName("id")
+    @Param(description = "the ID of the system VM")
     private String id;
 
-    @SerializedName("systemvmtype") @Param(description="the system VM type")
+    @SerializedName("systemvmtype")
+    @Param(description = "the system VM type")
     private String systemVmType;
 
-    @SerializedName("jobid") @Param(description="the job ID associated with the system VM. This is only displayed if the router listed is part of a currently running asynchronous job.")
+    @SerializedName("jobid")
+    @Param(description = "the job ID associated with the system VM. This is only displayed if the router listed is part of a currently running asynchronous job.")
     private String jobId;
 
-    @SerializedName("jobstatus") @Param(description="the job status associated with the system VM.  This is only displayed if the router listed is part of a currently running asynchronous job.")
+    @SerializedName("jobstatus")
+    @Param(description = "the job status associated with the system VM.  This is only displayed if the router listed is part of a currently running asynchronous job.")
     private Integer jobStatus;
 
-    @SerializedName("zoneid") @Param(description="the Zone ID for the system VM")
+    @SerializedName("zoneid")
+    @Param(description = "the Zone ID for the system VM")
     private String zoneId;
 
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name for the system VM")
+    @SerializedName(ApiConstants.ZONE_NAME)
+    @Param(description = "the Zone name for the system VM")
     private String zoneName;
 
-    @SerializedName("dns1") @Param(description="the first DNS for the system VM")
+    @SerializedName("dns1")
+    @Param(description = "the first DNS for the system VM")
     private String dns1;
 
-    @SerializedName("dns2") @Param(description="the second DNS for the system VM")
+    @SerializedName("dns2")
+    @Param(description = "the second DNS for the system VM")
     private String dns2;
 
-    @SerializedName("networkdomain") @Param(description="the network domain for the system VM")
+    @SerializedName("networkdomain")
+    @Param(description = "the network domain for the system VM")
     private String networkDomain;
 
-    @SerializedName("gateway") @Param(description="the gateway for the system VM")
+    @SerializedName("gateway")
+    @Param(description = "the gateway for the system VM")
     private String gateway;
 
-    @SerializedName("name") @Param(description="the name of the system VM")
+    @SerializedName("name")
+    @Param(description = "the name of the system VM")
     private String name;
 
-    @SerializedName("podid") @Param(description="the Pod ID for the system VM")
+    @SerializedName("podid")
+    @Param(description = "the Pod ID for the system VM")
     private String podId;
 
-    @SerializedName("hostid") @Param(description="the host ID for the system VM")
+    @SerializedName("hostid")
+    @Param(description = "the host ID for the system VM")
     private String hostId;
 
-    @SerializedName("hostname") @Param(description="the hostname for the system VM")
+    @SerializedName("hostname")
+    @Param(description = "the hostname for the system VM")
     private String hostName;
 
-    @SerializedName(ApiConstants.PRIVATE_IP) @Param(description="the private IP address for the system VM")
+    @SerializedName(ApiConstants.PRIVATE_IP)
+    @Param(description = "the private IP address for the system VM")
     private String privateIp;
 
-    @SerializedName(ApiConstants.PRIVATE_MAC_ADDRESS) @Param(description="the private MAC address for the system VM")
+    @SerializedName(ApiConstants.PRIVATE_MAC_ADDRESS)
+    @Param(description = "the private MAC address for the system VM")
     private String privateMacAddress;
 
-    @SerializedName(ApiConstants.PRIVATE_NETMASK) @Param(description="the private netmask for the system VM")
+    @SerializedName(ApiConstants.PRIVATE_NETMASK)
+    @Param(description = "the private netmask for the system VM")
     private String privateNetmask;
 
-    @SerializedName(ApiConstants.LINK_LOCAL_IP) @Param(description="the link local IP address for the system vm")
+    @SerializedName(ApiConstants.LINK_LOCAL_IP)
+    @Param(description = "the link local IP address for the system vm")
     private String linkLocalIp;
 
-    @SerializedName(ApiConstants.LINK_LOCAL_MAC_ADDRESS) @Param(description="the link local MAC address for the system vm")
+    @SerializedName(ApiConstants.LINK_LOCAL_MAC_ADDRESS)
+    @Param(description = "the link local MAC address for the system vm")
     private String linkLocalMacAddress;
 
-    @SerializedName(ApiConstants.LINK_LOCAL_MAC_NETMASK) @Param(description="the link local netmask for the system vm")
+    @SerializedName(ApiConstants.LINK_LOCAL_MAC_NETMASK)
+    @Param(description = "the link local netmask for the system vm")
     private String linkLocalNetmask;
 
-    @SerializedName("publicip") @Param(description="the public IP address for the system VM")
+    @SerializedName("publicip")
+    @Param(description = "the public IP address for the system VM")
     private String publicIp;
 
-    @SerializedName("publicmacaddress") @Param(description="the public MAC address for the system VM")
+    @SerializedName("publicmacaddress")
+    @Param(description = "the public MAC address for the system VM")
     private String publicMacAddress;
 
-    @SerializedName("publicnetmask") @Param(description="the public netmask for the system VM")
+    @SerializedName("publicnetmask")
+    @Param(description = "the public netmask for the system VM")
     private String publicNetmask;
 
-    @SerializedName("templateid") @Param(description="the template ID for the system VM")
+    @SerializedName("templateid")
+    @Param(description = "the template ID for the system VM")
     private String templateId;
 
-    @SerializedName("created") @Param(description="the date and time the system VM was created")
+    @SerializedName("created")
+    @Param(description = "the date and time the system VM was created")
     private Date created;
 
-    @SerializedName("state") @Param(description="the state of the system VM")
+    @SerializedName("state")
+    @Param(description = "the state of the system VM")
     private String state;
 
-    @SerializedName("activeviewersessions") @Param(description="the number of active console sessions for the console proxy system vm")
+    @SerializedName("activeviewersessions")
+    @Param(description = "the number of active console sessions for the console proxy system vm")
     private Integer activeViewerSessions;
 
-   // private Long objectId;
-
-
+    // private Long objectId;
 
     @Override
     public String getObjectId() {
         return this.getId();
     }
 
-
     public String getId() {
         return id;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java b/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
index c4b10ab..2ff11ec 100644
--- a/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
@@ -26,25 +26,29 @@ import com.cloud.serializer.Param;
 import com.cloud.template.VirtualMachineTemplate;
 import com.google.gson.annotations.SerializedName;
 
-@EntityReference(value=VirtualMachineTemplate.class)
+@EntityReference(value = VirtualMachineTemplate.class)
 @SuppressWarnings("unused")
 public class TemplatePermissionsResponse extends BaseResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the template ID")
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "the template ID")
     private String id;
 
-    @SerializedName(ApiConstants.IS_PUBLIC) @Param(description="true if this template is a public template, false otherwise")
+    @SerializedName(ApiConstants.IS_PUBLIC)
+    @Param(description = "true if this template is a public template, false otherwise")
     private Boolean publicTemplate;
 
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the ID of the domain to which the template belongs")
+    @SerializedName(ApiConstants.DOMAIN_ID)
+    @Param(description = "the ID of the domain to which the template belongs")
     private String domainId;
 
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the list of accounts the template is available for")
+    @SerializedName(ApiConstants.ACCOUNT)
+    @Param(description = "the list of accounts the template is available for")
     private List<String> accountNames;
 
-    @SerializedName(ApiConstants.PROJECT_IDS) @Param(description="the list of projects the template is available for")
+    @SerializedName(ApiConstants.PROJECT_IDS)
+    @Param(description = "the list of projects the template is available for")
     private List<String> projectIds;
 
-
     public void setId(String id) {
         this.id = id;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
index 17ea037..e7d81cf 100644
--- a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
@@ -30,110 +30,143 @@ import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.template.VirtualMachineTemplate;
 import com.google.gson.annotations.SerializedName;
 
-@EntityReference(value=VirtualMachineTemplate.class)
+@EntityReference(value = VirtualMachineTemplate.class)
 @SuppressWarnings("unused")
 public class TemplateResponse extends BaseResponse implements ControlledViewEntityResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the template ID")
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "the template ID")
     private String id;
 
-    @SerializedName(ApiConstants.NAME) @Param(description="the template name")
+    @SerializedName(ApiConstants.NAME)
+    @Param(description = "the template name")
     private String name;
 
-    @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="the template display text")
+    @SerializedName(ApiConstants.DISPLAY_TEXT)
+    @Param(description = "the template display text")
     private String displayText;
 
-    @SerializedName(ApiConstants.IS_PUBLIC) // propName="public"  (FIXME:  this used to be part of Param annotation, do we need it?)
-    @Param(description="true if this template is a public template, false otherwise")
+    @SerializedName(ApiConstants.IS_PUBLIC)
+    // propName="public"  (FIXME:  this used to be part of Param annotation, do we need it?)
+    @Param(description = "true if this template is a public template, false otherwise")
     private boolean isPublic;
 
-    @SerializedName(ApiConstants.CREATED) @Param(description="the date this template was created")
+    @SerializedName(ApiConstants.CREATED)
+    @Param(description = "the date this template was created")
     private Date created;
 
-    @SerializedName("removed") @Param(description="the date this template was removed")
+    @SerializedName("removed")
+    @Param(description = "the date this template was removed")
     private Date removed;
 
-    @SerializedName(ApiConstants.IS_READY) // propName="ready"  (FIXME:  this used to be part of Param annotation, do we need it?)
-    @Param(description="true if the template is ready to be deployed from, false otherwise.")
+    @SerializedName(ApiConstants.IS_READY)
+    // propName="ready"  (FIXME:  this used to be part of Param annotation, do we need it?)
+    @Param(description = "true if the template is ready to be deployed from, false otherwise.")
     private boolean isReady;
 
-    @SerializedName(ApiConstants.PASSWORD_ENABLED) @Param(description="true if the reset password feature is enabled, false otherwise")
+    @SerializedName(ApiConstants.PASSWORD_ENABLED)
+    @Param(description = "true if the reset password feature is enabled, false otherwise")
     private Boolean passwordEnabled;
 
-    @SerializedName(ApiConstants.FORMAT) @Param(description="the format of the template.")
+    @SerializedName(ApiConstants.FORMAT)
+    @Param(description = "the format of the template.")
     private ImageFormat format;
 
-    @SerializedName(ApiConstants.BOOTABLE) @Param(description="true if the ISO is bootable, false otherwise")
+    @SerializedName(ApiConstants.BOOTABLE)
+    @Param(description = "true if the ISO is bootable, false otherwise")
     private Boolean bootable;
 
-    @SerializedName(ApiConstants.IS_FEATURED) @Param(description="true if this template is a featured template, false otherwise")
+    @SerializedName(ApiConstants.IS_FEATURED)
+    @Param(description = "true if this template is a featured template, false otherwise")
     private boolean featured;
 
-    @SerializedName("crossZones") @Param(description="true if the template is managed across all Zones, false otherwise")
+    @SerializedName("crossZones")
+    @Param(description = "true if the template is managed across all Zones, false otherwise")
     private boolean crossZones;
 
-    @SerializedName(ApiConstants.OS_TYPE_ID) @Param(description="the ID of the OS type for this template.")
+    @SerializedName(ApiConstants.OS_TYPE_ID)
+    @Param(description = "the ID of the OS type for this template.")
     private String osTypeId;
 
-    @SerializedName("ostypename") @Param(description="the name of the OS type for this template.")
+    @SerializedName("ostypename")
+    @Param(description = "the name of the OS type for this template.")
     private String osTypeName;
 
-    @SerializedName(ApiConstants.ACCOUNT_ID) @Param(description="the account id to which the template belongs")
+    @SerializedName(ApiConstants.ACCOUNT_ID)
+    @Param(description = "the account id to which the template belongs")
     private String accountId;
 
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account name to which the template belongs")
+    @SerializedName(ApiConstants.ACCOUNT)
+    @Param(description = "the account name to which the template belongs")
     private String account;
 
     //TODO: since a template can be associated to more than one zones, this model is not accurate. For backward-compatibility, keep these fields
     // here, but add a zones field to capture multiple zones.
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the ID of the zone for this template")
+    @SerializedName(ApiConstants.ZONE_ID)
+    @Param(description = "the ID of the zone for this template")
     private String zoneId;
 
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone for this template")
+    @SerializedName(ApiConstants.ZONE_NAME)
+    @Param(description = "the name of the zone for this template")
     private String zoneName;
 
-    @SerializedName(ApiConstants.STATUS) @Param(description="the status of the template")
+    @SerializedName(ApiConstants.STATUS)
+    @Param(description = "the status of the template")
     private String status;
 
-    @SerializedName(ApiConstants.SIZE) @Param(description="the size of the template")
+    @SerializedName(ApiConstants.SIZE)
+    @Param(description = "the size of the template")
     private Long size;
 
-    @SerializedName("templatetype") @Param(description="the type of the template")
+    @SerializedName("templatetype")
+    @Param(description = "the type of the template")
     private String templateType;
 
-    @SerializedName(ApiConstants.HYPERVISOR) @Param(description="the hypervisor on which the template runs")
+    @SerializedName(ApiConstants.HYPERVISOR)
+    @Param(description = "the hypervisor on which the template runs")
     private String hypervisor;
 
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the name of the domain to which the template belongs")
+    @SerializedName(ApiConstants.DOMAIN)
+    @Param(description = "the name of the domain to which the template belongs")
     private String domainName;
 
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the ID of the domain to which the template belongs")
+    @SerializedName(ApiConstants.DOMAIN_ID)
+    @Param(description = "the ID of the domain to which the template belongs")
     private String domainId;
 
-    @SerializedName(ApiConstants.IS_EXTRACTABLE) @Param(description="true if the template is extractable, false otherwise")
+    @SerializedName(ApiConstants.IS_EXTRACTABLE)
+    @Param(description = "true if the template is extractable, false otherwise")
     private Boolean extractable;
 
-    @SerializedName(ApiConstants.CHECKSUM) @Param(description="checksum of the template")
+    @SerializedName(ApiConstants.CHECKSUM)
+    @Param(description = "checksum of the template")
     private String checksum;
 
-    @SerializedName("sourcetemplateid") @Param(description="the template ID of the parent template if present")
+    @SerializedName("sourcetemplateid")
+    @Param(description = "the template ID of the parent template if present")
     private String sourcetemplateId;
 
-    @SerializedName(ApiConstants.HOST_ID) @Param(description="the ID of the secondary storage host for the template")
+    @SerializedName(ApiConstants.HOST_ID)
+    @Param(description = "the ID of the secondary storage host for the template")
     private String hostId;
 
-    @SerializedName("hostname") @Param(description="the name of the secondary storage host for the template")
+    @SerializedName("hostname")
+    @Param(description = "the name of the secondary storage host for the template")
     private String hostName;
 
-    @SerializedName(ApiConstants.TEMPLATE_TAG) @Param(description="the tag of this template")
+    @SerializedName(ApiConstants.TEMPLATE_TAG)
+    @Param(description = "the tag of this template")
     private String templateTag;
 
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the template")
+    @SerializedName(ApiConstants.PROJECT_ID)
+    @Param(description = "the project id of the template")
     private String projectId;
 
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the template")
+    @SerializedName(ApiConstants.PROJECT)
+    @Param(description = "the project name of the template")
     private String projectName;
 
-    @SerializedName(ApiConstants.DETAILS) @Param(description="additional key/value details tied with template")
+    @SerializedName(ApiConstants.DETAILS)
+    @Param(description = "additional key/value details tied with template")
     private Map details;
 
     // To avoid breaking backwards compatibility, we still treat a template at different zones as different templates, so not embedding
@@ -141,21 +174,23 @@ public class TemplateResponse extends BaseResponse implements ControlledViewEnti
     //    @SerializedName("zones")  @Param(description="list of zones associated with tempate", responseObject = TemplateZoneResponse.class)
     //    private Set<TemplateZoneResponse> zones;
 
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with tempate", responseObject = ResourceTagResponse.class)
+    @SerializedName(ApiConstants.TAGS)
+    @Param(description = "the list of resource tags associated with tempate", responseObject = ResourceTagResponse.class)
     private Set<ResourceTagResponse> tags;
 
-    @SerializedName(ApiConstants.SSHKEY_ENABLED) @Param(description="true if template is sshkey enabled, false otherwise")
+    @SerializedName(ApiConstants.SSHKEY_ENABLED)
+    @Param(description = "true if template is sshkey enabled, false otherwise")
     private Boolean sshKeyEnabled;
 
-    @SerializedName(ApiConstants.IS_DYNAMICALLY_SCALABLE) @Param(description="true if template contains XS/VMWare tools inorder to support dynamic scaling of VM cpu/memory")
+    @SerializedName(ApiConstants.IS_DYNAMICALLY_SCALABLE)
+    @Param(description = "true if template contains XS/VMWare tools inorder to support dynamic scaling of VM cpu/memory")
     private Boolean isDynamicallyScalable;
 
-    public TemplateResponse(){
+    public TemplateResponse() {
         //  zones = new LinkedHashSet<TemplateZoneResponse>();
         tags = new LinkedHashSet<ResourceTagResponse>();
     }
 
-
     @Override
     public String getObjectId() {
         return this.getId();
@@ -310,11 +345,10 @@ public class TemplateResponse extends BaseResponse implements ControlledViewEnti
         this.tags = tags;
     }
 
-    public void addTag(ResourceTagResponse tag){
+    public void addTag(ResourceTagResponse tag) {
         this.tags.add(tag);
     }
 
-
     public void setSshKeyEnabled(boolean sshKeyEnabled) {
         this.sshKeyEnabled = sshKeyEnabled;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/TemplateZoneResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TemplateZoneResponse.java b/api/src/org/apache/cloudstack/api/response/TemplateZoneResponse.java
index 3af9a2f..cb1fd98 100644
--- a/api/src/org/apache/cloudstack/api/response/TemplateZoneResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TemplateZoneResponse.java
@@ -25,34 +25,37 @@ import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
 public class TemplateZoneResponse extends BaseResponse {
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the ID of the zone for the template")
+    @SerializedName(ApiConstants.ZONE_ID)
+    @Param(description = "the ID of the zone for the template")
     private String zoneId;
 
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone for the template")
+    @SerializedName(ApiConstants.ZONE_NAME)
+    @Param(description = "the name of the zone for the template")
     private String zoneName;
 
-    @SerializedName(ApiConstants.STATUS) @Param(description="the status of the template")
+    @SerializedName(ApiConstants.STATUS)
+    @Param(description = "the status of the template")
     private String status;
 
-    @SerializedName(ApiConstants.IS_READY) // propName="ready"  (FIXME:  this used to be part of Param annotation, do we need it?)
-    @Param(description="true if the template is ready to be deployed from, false otherwise.")
+    @SerializedName(ApiConstants.IS_READY)
+    // propName="ready"  (FIXME:  this used to be part of Param annotation, do we need it?)
+    @Param(description = "true if the template is ready to be deployed from, false otherwise.")
     private boolean isReady;
 
-    @SerializedName(ApiConstants.CREATED) @Param(description="the date this template was created")
+    @SerializedName(ApiConstants.CREATED)
+    @Param(description = "the date this template was created")
     private Date created;
 
-    public TemplateZoneResponse(){
+    public TemplateZoneResponse() {
         super();
     }
 
-    public TemplateZoneResponse(String zoneId, String zoneName){
+    public TemplateZoneResponse(String zoneId, String zoneName) {
         super();
         this.zoneId = zoneId;
         this.zoneName = zoneName;
     }
 
-
-
     public String getZoneId() {
         return zoneId;
     }
@@ -69,7 +72,6 @@ public class TemplateZoneResponse extends BaseResponse {
         this.zoneName = zoneName;
     }
 
-
     public String getStatus() {
         return status;
     }
@@ -99,7 +101,7 @@ public class TemplateZoneResponse extends BaseResponse {
         final int prime = 31;
         int result = 1;
         String oid = this.getZoneId();
-        result = prime * result + ((oid== null) ? 0 : oid.hashCode());
+        result = prime * result + ((oid == null) ? 0 : oid.hashCode());
         return result;
     }
 
@@ -114,7 +116,7 @@ public class TemplateZoneResponse extends BaseResponse {
         if (getClass() != obj.getClass()) {
             return false;
         }
-        TemplateZoneResponse other = (TemplateZoneResponse) obj;
+        TemplateZoneResponse other = (TemplateZoneResponse)obj;
         String oid = this.getZoneId();
         if (oid == null) {
             if (other.getZoneId() != null) {
@@ -122,7 +124,7 @@ public class TemplateZoneResponse extends BaseResponse {
             }
         } else if (!oid.equals(other.getZoneId())) {
             return false;
-        } else if ( this.getZoneName().equals(other.getZoneName())) {
+        } else if (this.getZoneName().equals(other.getZoneName())) {
             return false;
         }
         return true;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java
index 7e0646e..2c2d013 100644
--- a/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java
@@ -24,58 +24,63 @@ import com.google.gson.annotations.SerializedName;
 
 public class TrafficMonitorResponse extends BaseResponse {
 
-    @SerializedName(ApiConstants.ID) @Param(description="the ID of the external firewall")
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "the ID of the external firewall")
     private String id;
 
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the zone ID of the external firewall")
+    @SerializedName(ApiConstants.ZONE_ID)
+    @Param(description = "the zone ID of the external firewall")
     private String zoneId;
 
-    @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the management IP address of the external firewall")
+    @SerializedName(ApiConstants.IP_ADDRESS)
+    @Param(description = "the management IP address of the external firewall")
     private String ipAddress;
 
-    @SerializedName(ApiConstants.NUM_RETRIES) @Param(description="the number of times to retry requests to the external firewall")
+    @SerializedName(ApiConstants.NUM_RETRIES)
+    @Param(description = "the number of times to retry requests to the external firewall")
     private String numRetries;
 
-    @SerializedName(ApiConstants.TIMEOUT) @Param(description="the timeout (in seconds) for requests to the external firewall")
+    @SerializedName(ApiConstants.TIMEOUT)
+    @Param(description = "the timeout (in seconds) for requests to the external firewall")
     private String timeout;
 
     public String getId() {
-    	return id;
+        return id;
     }
 
     public void setId(String id) {
-    	this.id = id;
+        this.id = id;
     }
 
     public String getZoneId() {
-    	return zoneId;
+        return zoneId;
     }
 
     public void setZoneId(String zoneId) {
-    	this.zoneId = zoneId;
+        this.zoneId = zoneId;
     }
 
     public String getIpAddress() {
-    	return ipAddress;
+        return ipAddress;
     }
 
     public void setIpAddress(String ipAddress) {
-    	this.ipAddress = ipAddress;
+        this.ipAddress = ipAddress;
     }
 
     public String getNumRetries() {
-    	return numRetries;
+        return numRetries;
     }
 
     public void setNumRetries(String numRetries) {
-    	this.numRetries = numRetries;
+        this.numRetries = numRetries;
     }
 
     public String getTimeout() {
-    	return timeout;
+        return timeout;
     }
 
     public void setTimeout(String timeout) {
-    	this.timeout = timeout;
+        this.timeout = timeout;
     }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
index 56beca5..6532a3f 100644
--- a/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
@@ -23,17 +23,19 @@ import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
 public class TrafficTypeImplementorResponse extends BaseResponse {
-     @SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="network traffic type")
-     private String trafficType;
+    @SerializedName(ApiConstants.TRAFFIC_TYPE)
+    @Param(description = "network traffic type")
+    private String trafficType;
 
-     @SerializedName(ApiConstants.TRAFFIC_TYPE_IMPLEMENTOR) @Param(description="implementor of network traffic type")
-     private String implementor;
+    @SerializedName(ApiConstants.TRAFFIC_TYPE_IMPLEMENTOR)
+    @Param(description = "implementor of network traffic type")
+    private String implementor;
 
-     public void setTrafficType(String type) {
-         this.trafficType = type;
-     }
+    public void setTrafficType(String type) {
+        this.trafficType = type;
+    }
 
-     public void setImplementor(String impl) {
-         this.implementor = impl;
-     }
+    public void setImplementor(String impl) {
+        this.implementor = impl;
+    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
index 0205daa..7ab8532 100644
--- a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
@@ -24,31 +24,37 @@ import com.cloud.network.PhysicalNetworkTrafficType;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
-@EntityReference(value=PhysicalNetworkTrafficType.class)
+@EntityReference(value = PhysicalNetworkTrafficType.class)
 public class TrafficTypeResponse extends BaseResponse {
 
-    @SerializedName(ApiConstants.ID) @Param(description="id of the network provider")
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "id of the network provider")
     private String id;
 
-    @SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="the trafficType to be added to the physical network")
+    @SerializedName(ApiConstants.TRAFFIC_TYPE)
+    @Param(description = "the trafficType to be added to the physical network")
     private String trafficType;
 
-    @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network this belongs to")
+    @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID)
+    @Param(description = "the physical network this belongs to")
     private String physicalNetworkId;
 
-    @SerializedName(ApiConstants.XEN_NETWORK_LABEL) @Param(description="The network name label of the physical device dedicated to this traffic on a XenServer host")
+    @SerializedName(ApiConstants.XEN_NETWORK_LABEL)
+    @Param(description = "The network name label of the physical device dedicated to this traffic on a XenServer host")
     private String xenNetworkLabel;
 
-    @SerializedName(ApiConstants.KVM_NETWORK_LABEL) @Param(description="The network name label of the physical device dedicated to this traffic on a KVM host")
+    @SerializedName(ApiConstants.KVM_NETWORK_LABEL)
+    @Param(description = "The network name label of the physical device dedicated to this traffic on a KVM host")
     private String kvmNetworkLabel;
 
-    @SerializedName(ApiConstants.VMWARE_NETWORK_LABEL) @Param(description="The network name label of the physical device dedicated to this traffic on a VMware host")
+    @SerializedName(ApiConstants.VMWARE_NETWORK_LABEL)
+    @Param(description = "The network name label of the physical device dedicated to this traffic on a VMware host")
     private String vmwareNetworkLabel;
 
-    @SerializedName(ApiConstants.HYPERV_NETWORK_LABEL) @Param(description="The network name label of the physical device dedicated to this traffic on a HyperV host")
+    @SerializedName(ApiConstants.HYPERV_NETWORK_LABEL)
+    @Param(description = "The network name label of the physical device dedicated to this traffic on a HyperV host")
     private String hypervNetworkLabel;
 
-
     @Override
     public String getObjectId() {
         return this.id;
@@ -85,6 +91,7 @@ public class TrafficTypeResponse extends BaseResponse {
     public String getKvmLabel() {
         return kvmNetworkLabel;
     }
+
     public String getHypervLabel() {
         return hypervNetworkLabel;
     }
@@ -92,7 +99,7 @@ public class TrafficTypeResponse extends BaseResponse {
     public void setXenLabel(String xenLabel) {
         this.xenNetworkLabel = xenLabel;
     }
-    
+
     public void setHypervLabel(String hypervLabel) {
         this.hypervNetworkLabel = hypervLabel;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java b/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java
index ba0049b..b4910b4 100644
--- a/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java
@@ -32,7 +32,8 @@ import java.util.Set;
 @EntityReference(value = JobInfo.class)
 @SuppressWarnings("unused")
 public class UpgradeRouterTemplateResponse extends BaseResponse {
-    @SerializedName(ApiConstants.JOB_ID) @Param(description="the id of AsyncJob")
+    @SerializedName(ApiConstants.JOB_ID)
+    @Param(description = "the id of AsyncJob")
     private String asyncJobId;
 
     public String getAsyncJobId() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java b/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java
index 544a9bb..09f33c9 100644
--- a/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java
@@ -224,75 +224,99 @@ public class UpgradeVmResponse extends BaseResponse {
         return id;
     }
 
-    @SerializedName("name") @Param(description="the ID of the virtual machine")
+    @SerializedName("name")
+    @Param(description = "the ID of the virtual machine")
     private String name;
 
-    @SerializedName("created") @Param(description="the date when this virtual machine was created")
+    @SerializedName("created")
+    @Param(description = "the date when this virtual machine was created")
     private Date created;
 
-    @SerializedName("ipaddress") @Param(description="the ip address of the virtual machine")
+    @SerializedName("ipaddress")
+    @Param(description = "the ip address of the virtual machine")
     private String ipAddress;
 
-    @SerializedName("state") @Param(description="the state of the virtual machine")
+    @SerializedName("state")
+    @Param(description = "the state of the virtual machine")
     private String state;
 
-    @SerializedName("account") @Param(description="the account associated with the virtual machine")
+    @SerializedName("account")
+    @Param(description = "the account associated with the virtual machine")
     private String account;
 
-    @SerializedName("domainid") @Param(description="the ID of the domain in which the virtual machine exists")
+    @SerializedName("domainid")
+    @Param(description = "the ID of the domain in which the virtual machine exists")
     private String domainId;
 
-    @SerializedName("domain") @Param(description="the name of the domain in which the virtual machine exists")
+    @SerializedName("domain")
+    @Param(description = "the name of the domain in which the virtual machine exists")
     private String domain;
 
-    @SerializedName("haenable") @Param(description="true if high-availability is enabled, false otherwise")
+    @SerializedName("haenable")
+    @Param(description = "true if high-availability is enabled, false otherwise")
     private boolean haEnable;
 
-    @SerializedName("zoneid") @Param(description="the ID of the availablility zone for the virtual machine")
+    @SerializedName("zoneid")
+    @Param(description = "the ID of the availablility zone for the virtual machine")
     private String zoneId;
 
-    @SerializedName("displayname") @Param(description="user generated name. The name of the virtual machine is returned if no displayname exists.")
+    @SerializedName("displayname")
+    @Param(description = "user generated name. The name of the virtual machine is returned if no displayname exists.")
     private String displayName;
 
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the availability zone for the virtual machine")
+    @SerializedName(ApiConstants.ZONE_NAME)
+    @Param(description = "the name of the availability zone for the virtual machine")
     private String zoneName;
 
-    @SerializedName("hostid") @Param(description="the ID of the host for the virtual machine")
+    @SerializedName("hostid")
+    @Param(description = "the ID of the host for the virtual machine")
     private String hostId;
 
-    @SerializedName("hostname") @Param(description="the name of the host for the virtual machine")
+    @SerializedName("hostname")
+    @Param(description = "the name of the host for the virtual machine")
     private String hostName;
 
-    @SerializedName("templateid") @Param(description="the ID of the template for the virtual machine. A -1 is returned if the virtual machine was created from an ISO file.")
+    @SerializedName("templateid")
+    @Param(description = "the ID of the template for the virtual machine. A -1 is returned if the virtual machine was created from an ISO file.")
     private String templateId;
 
-    @SerializedName("templatename") @Param(description="the name of the template for the virtual machine")
+    @SerializedName("templatename")
+    @Param(description = "the name of the template for the virtual machine")
     private String templateName;
 
-    @SerializedName("templatedisplaytext") @Param(description=" an alternate display text of the template for the virtual machine")
+    @SerializedName("templatedisplaytext")
+    @Param(description = " an alternate display text of the template for the virtual machine")
     private String templateDisplayText;
 
-    @SerializedName("passwordenabled") @Param(description="true if the password rest feature is enabled, false otherwise")
+    @SerializedName("passwordenabled")
+    @Param(description = "true if the password rest feature is enabled, false otherwise")
     private boolean passwordEnabled;
 
-    @SerializedName("serviceofferingid") @Param(description="the ID of the service offering of the virtual machine")
+    @SerializedName("serviceofferingid")
+    @Param(description = "the ID of the service offering of the virtual machine")
     private String serviceOfferingId;
 
-    @SerializedName("serviceofferingname") @Param(description="the name of the service offering of the virtual machine")
+    @SerializedName("serviceofferingname")
+    @Param(description = "the name of the service offering of the virtual machine")
     private String serviceOfferingName;
 
-    @SerializedName("cpunumber") @Param(description="the number of cpu this virtual machine is running with")
+    @SerializedName("cpunumber")
+    @Param(description = "the number of cpu this virtual machine is running with")
     private long cpuSpeed;
 
-    @SerializedName("memory")  @Param(description="the memory allocated for the virtual machine")
+    @SerializedName("memory")
+    @Param(description = "the memory allocated for the virtual machine")
     private long memory;
 
-    @SerializedName("cpuused") @Param(description="the amount of the vm's CPU currently used")
+    @SerializedName("cpuused")
+    @Param(description = "the amount of the vm's CPU currently used")
     private long cpuUsed;
 
-    @SerializedName("networkkbsread") @Param(description="the incoming network traffic on the vm")
+    @SerializedName("networkkbsread")
+    @Param(description = "the incoming network traffic on the vm")
     private long networkKbsRead;
 
-    @SerializedName("networkkbswrite") @Param(description="the outgoing network traffic on the host")
+    @SerializedName("networkkbswrite")
+    @Param(description = "the outgoing network traffic on the host")
     private long networkKbsWrite;
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
index 4180ee9..abb9552 100644
--- a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
@@ -23,80 +23,105 @@ import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
 @SuppressWarnings("unused")
-public class UsageRecordResponse extends BaseResponse implements ControlledEntityResponse{
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the user account name")
+public class UsageRecordResponse extends BaseResponse implements ControlledEntityResponse {
+    @SerializedName(ApiConstants.ACCOUNT)
+    @Param(description = "the user account name")
     private String accountName;
 
-    @SerializedName(ApiConstants.ACCOUNT_ID) @Param(description="the user account Id")
+    @SerializedName(ApiConstants.ACCOUNT_ID)
+    @Param(description = "the user account Id")
     private String accountId;
 
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the resource")
+    @SerializedName(ApiConstants.PROJECT_ID)
+    @Param(description = "the project id of the resource")
     private String projectId;
 
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the resource")
+    @SerializedName(ApiConstants.PROJECT)
+    @Param(description = "the project name of the resource")
     private String projectName;
 
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID")
+    @SerializedName(ApiConstants.DOMAIN_ID)
+    @Param(description = "the domain ID")
     private String domainId;
 
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain the resource is associated with")
+    @SerializedName(ApiConstants.DOMAIN)
+    @Param(description = "the domain the resource is associated with")
     private String domainName;
 
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the zone ID")
+    @SerializedName(ApiConstants.ZONE_ID)
+    @Param(description = "the zone ID")
     private String zoneId;
 
-    @SerializedName(ApiConstants.DESCRIPTION) @Param(description="description of the usage record")
+    @SerializedName(ApiConstants.DESCRIPTION)
+    @Param(description = "description of the usage record")
     private String description;
 
-    @SerializedName("usage") @Param(description="usage in hours")
+    @SerializedName("usage")
+    @Param(description = "usage in hours")
     private String usage;
 
-    @SerializedName("usagetype") @Param(description="usage type ID")
+    @SerializedName("usagetype")
+    @Param(description = "usage type ID")
     private Integer usageType;
 
-    @SerializedName("rawusage") @Param(description="raw usage in hours")
+    @SerializedName("rawusage")
+    @Param(description = "raw usage in hours")
     private String rawUsage;
 
-    @SerializedName(ApiConstants.VIRTUAL_MACHINE_ID) @Param(description="virtual machine ID")
+    @SerializedName(ApiConstants.VIRTUAL_MACHINE_ID)
+    @Param(description = "virtual machine ID")
     private String virtualMachineId;
 
-    @SerializedName(ApiConstants.NAME) @Param(description="virtual machine name")
+    @SerializedName(ApiConstants.NAME)
+    @Param(description = "virtual machine name")
     private String vmName;
 
-    @SerializedName("offeringid") @Param(description="offering ID")
-    private String  offeringId;
+    @SerializedName("offeringid")
+    @Param(description = "offering ID")
+    private String offeringId;
 
-    @SerializedName(ApiConstants.TEMPLATE_ID) @Param(description="template ID")
+    @SerializedName(ApiConstants.TEMPLATE_ID)
+    @Param(description = "template ID")
     private String templateId;
 
-    @SerializedName("usageid") @Param(description="id of the resource")
+    @SerializedName("usageid")
+    @Param(description = "id of the resource")
     private String usageId;
 
-    @SerializedName(ApiConstants.TYPE) @Param(description="resource type")
+    @SerializedName(ApiConstants.TYPE)
+    @Param(description = "resource type")
     private String type;
 
-    @SerializedName(ApiConstants.SIZE) @Param(description="resource size")
+    @SerializedName(ApiConstants.SIZE)
+    @Param(description = "resource size")
     private Long size;
 
-    @SerializedName("virtualsize") @Param(description="virtual size of resource")
+    @SerializedName("virtualsize")
+    @Param(description = "virtual size of resource")
     private Long virtualSize;
 
-    @SerializedName(ApiConstants.START_DATE) @Param(description="start date of the usage record")
+    @SerializedName(ApiConstants.START_DATE)
+    @Param(description = "start date of the usage record")
     private String startDate;
 
-    @SerializedName(ApiConstants.END_DATE) @Param(description="end date of the usage record")
+    @SerializedName(ApiConstants.END_DATE)
+    @Param(description = "end date of the usage record")
     private String endDate;
 
-    @SerializedName("issourcenat") @Param(description="True if the IPAddress is source NAT")
+    @SerializedName("issourcenat")
+    @Param(description = "True if the IPAddress is source NAT")
     private Boolean isSourceNat;
 
-    @SerializedName(ApiConstants.IS_SYSTEM) @Param(description="True if the IPAddress is system IP - allocated during vm deploy or lb rule create")
+    @SerializedName(ApiConstants.IS_SYSTEM)
+    @Param(description = "True if the IPAddress is system IP - allocated during vm deploy or lb rule create")
     private Boolean isSystem;
 
-    @SerializedName("networkid") @Param(description="id of the network")
+    @SerializedName("networkid")
+    @Param(description = "id of the network")
     private String networkId;
 
-    @SerializedName("isdefault") @Param(description="True if the resource is default")
+    @SerializedName("isdefault")
+    @Param(description = "True if the resource is default")
     private Boolean isDefault;
 
     @Override
@@ -142,7 +167,7 @@ public class UsageRecordResponse extends BaseResponse implements ControlledEntit
     }
 
     public void setOfferingId(String offeringId) {
-        this.offeringId =  offeringId;
+        this.offeringId = offeringId;
     }
 
     public void setTemplateId(String templateId) {
@@ -193,7 +218,7 @@ public class UsageRecordResponse extends BaseResponse implements ControlledEntit
     }
 
     public void setNetworkId(String networkId) {
-        this.networkId =  networkId;
+        this.networkId = networkId;
     }
 
     public void setDefault(Boolean isDefault) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java b/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java
index 3dbb27a..897035a 100644
--- a/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java
@@ -24,13 +24,14 @@ import com.google.gson.annotations.SerializedName;
 
 public class UsageTypeResponse extends BaseResponse {
 
-    @SerializedName("usagetypeid") @Param(description="usage type")
+    @SerializedName("usagetypeid")
+    @Param(description = "usage type")
     private Integer usageType;
 
-    @SerializedName(ApiConstants.DESCRIPTION) @Param(description="description of usage type")
+    @SerializedName(ApiConstants.DESCRIPTION)
+    @Param(description = "description of usage type")
     private String description;
 
-    
     public String getDescription() {
         return description;
     }
@@ -47,10 +48,10 @@ public class UsageTypeResponse extends BaseResponse {
         this.usageType = usageType;
     }
 
-    public UsageTypeResponse(Integer usageType, String description){
-    	this.usageType = usageType;
-    	this.description = description;
-    	setObjectName("usagetype");
+    public UsageTypeResponse(Integer usageType, String description) {
+        this.usageType = usageType;
+        this.description = description;
+        setObjectName("usagetype");
     }
 
 }