You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/12/04 11:02:56 UTC

[36/55] [abbrv] api_refactor: refactor project apis

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/NetworkOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/NetworkOfferingResponse.java b/api/src/com/cloud/api/response/NetworkOfferingResponse.java
index 310afe9..af6bbe1 100644
--- a/api/src/com/cloud/api/response/NetworkOfferingResponse.java
+++ b/api/src/com/cloud/api/response/NetworkOfferingResponse.java
@@ -31,52 +31,52 @@ public class NetworkOfferingResponse extends BaseResponse{
 
     @SerializedName(ApiConstants.NAME) @Param(description="the name of the network offering")
     private String name;
-    
+
     @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="an alternate display text of the network offering.")
     private String displayText;
-    
+
     @SerializedName(ApiConstants.TAGS) @Param(description="the tags for the network offering")
     private String tags;
-    
+
     @SerializedName(ApiConstants.CREATED) @Param(description="the date this network offering was created")
     private Date created;
-    
+
     @SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="the traffic type for the network offering, supported types are Public, Management, Control, Guest, Vlan or Storage.")
     private String trafficType;
-    
+
     @SerializedName(ApiConstants.IS_DEFAULT) @Param(description="true if network offering is default, false otherwise")
     private Boolean isDefault;
-   
+
     @SerializedName(ApiConstants.SPECIFY_VLAN) @Param(description="true if network offering supports vlans, false otherwise")
     private Boolean specifyVlan;
-    
+
     @SerializedName(ApiConstants.CONSERVE_MODE) @Param(description="true if network offering is ip conserve mode enabled")
     private Boolean conserveMode;
 
     @SerializedName(ApiConstants.SPECIFY_IP_RANGES) @Param(description="true if network offering supports specifying ip ranges, false otherwise")
     private Boolean specifyIpRanges;
-    
+
     @SerializedName(ApiConstants.AVAILABILITY) @Param(description="availability of the network offering")
     private String availability;
-    
+
     @SerializedName(ApiConstants.NETWORKRATE) @Param(description="data transfer rate in megabits per second allowed.")
     private Integer networkRate;
 
     @SerializedName(ApiConstants.STATE) @Param(description="state of the network offering. Can be Disabled/Enabled/Inactive")
     private String state;
-    
+
     @SerializedName(ApiConstants.GUEST_IP_TYPE) @Param(description="guest type of the network offering, can be Shared or Isolated")
     private String guestIpType;
-    
+
     @SerializedName(ApiConstants.SERVICE_OFFERING_ID) @Param(description="the ID of the service offering used by virtual router provider")
     private IdentityProxy serviceOfferingId = new IdentityProxy("disk_offering");
-   
+
     @SerializedName(ApiConstants.SERVICE) @Param(description="the list of supported services", responseObject = ServiceResponse.class)
     private List<ServiceResponse> services;
-    
+
     @SerializedName(ApiConstants.FOR_VPC) @Param(description="true if network offering can be used by VPC networks only")
     private Boolean forVpc;
-    
+
 
     public void setId(Long id) {
         this.id.setValue(id);
@@ -89,7 +89,7 @@ public class NetworkOfferingResponse extends BaseResponse{
     public void setDisplayText(String displayText) {
         this.displayText = displayText;
     }
-    
+
     public void setTags(String tags) {
         this.tags = tags;
     }
@@ -138,13 +138,13 @@ public class NetworkOfferingResponse extends BaseResponse{
         this.serviceOfferingId.setValue(serviceOfferingId);
     }
 
-	public void setServiceOfferingId(IdentityProxy serviceOfferingId) {
-		this.serviceOfferingId = serviceOfferingId;
-	}
+    public void setServiceOfferingId(IdentityProxy serviceOfferingId) {
+        this.serviceOfferingId = serviceOfferingId;
+    }
 
-	public void setSpecifyIpRanges(Boolean specifyIpRanges) {
-		this.specifyIpRanges = specifyIpRanges;
-	}
+    public void setSpecifyIpRanges(Boolean specifyIpRanges) {
+        this.specifyIpRanges = specifyIpRanges;
+    }
 
     public void setForVpc(Boolean forVpc) {
         this.forVpc = forVpc;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/NetworkResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/NetworkResponse.java b/api/src/com/cloud/api/response/NetworkResponse.java
index 9cf27db..78bae94 100644
--- a/api/src/com/cloud/api/response/NetworkResponse.java
+++ b/api/src/com/cloud/api/response/NetworkResponse.java
@@ -25,121 +25,121 @@ import com.google.gson.annotations.SerializedName;
 
 @SuppressWarnings("unused")
 public class NetworkResponse extends BaseResponse implements ControlledEntityResponse{
-    
+
     @SerializedName(ApiConstants.ID) @Param(description="the id of the network")
     private IdentityProxy id = new IdentityProxy("networks");
-    
+
     @SerializedName(ApiConstants.NAME) @Param(description="the name of the network")
     private String name;
-    
+
     @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="the displaytext of the network")
     private String displaytext;
-    
+
     @SerializedName("broadcastdomaintype") @Param(description="Broadcast domain type of the network")
     private String broadcastDomainType;
-    
+
     @SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="the traffic type of the network")
     private String trafficType;
-    
+
     @SerializedName(ApiConstants.GATEWAY) @Param(description="the network's gateway")
     private String gateway;
-    
+
     @SerializedName(ApiConstants.NETMASK) @Param(description="the network's netmask")
     private String netmask;
-    
+
     @SerializedName(ApiConstants.CIDR) @Param(description="the cidr the network")
     private String cidr;
-    
+
     @SerializedName(ApiConstants.ZONE_ID) @Param(description="zone id of the network")
     private IdentityProxy zoneId = new IdentityProxy("data_center");
-    
+
     @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone the network belongs to")
     private String zoneName;
-    
+
     @SerializedName("networkofferingid") @Param(description="network offering id the network is created from")
     private IdentityProxy networkOfferingId = new IdentityProxy("network_offerings");
-    
+
     @SerializedName("networkofferingname") @Param(description="name of the network offering the network is created from")
     private String networkOfferingName;
-    
+
     @SerializedName("networkofferingdisplaytext") @Param(description="display text of the network offering the network is created from")
     private String networkOfferingDisplayText;
-    
+
     @SerializedName("networkofferingavailability") @Param(description="availability of the network offering the network is created from")
     private String networkOfferingAvailability;
-    
+
     @SerializedName(ApiConstants.IS_SYSTEM) @Param(description="true if network is system, false otherwise")
     private Boolean isSystem;
-    
+
     @SerializedName(ApiConstants.STATE) @Param(description="state of the network")
     private String state;
 
     @SerializedName("related") @Param(description="related to what other network configuration")
     private IdentityProxy related = new IdentityProxy("networks");
-    
+
     @SerializedName("broadcasturi") @Param(description="broadcast uri of the network. This parameter is visible to ROOT admins only")
     private String broadcastUri;
-    
+
     @SerializedName(ApiConstants.DNS1) @Param(description="the first DNS for the network")
     private String dns1;
-    
+
     @SerializedName(ApiConstants.DNS2) @Param(description="the second DNS for the network")
     private String dns2;
-    
+
     @SerializedName(ApiConstants.TYPE) @Param(description="the type of the network")
     private String type;
-    
+
     @SerializedName(ApiConstants.VLAN) @Param(description="The vlan of the network. This parameter is visible to ROOT admins only")
     private String vlan;
-    
+
     @SerializedName(ApiConstants.ACL_TYPE) @Param(description="acl type - access type to the network")
     private String aclType;
-    
+
     @SerializedName(ApiConstants.SUBDOMAIN_ACCESS) @Param(description="true if users from subdomains can access the domain level network")
     private Boolean subdomainAccess;
-    
+
     @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner of the network")
     private String accountName;
-    
+
     @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the ipaddress")
     private IdentityProxy projectId = new IdentityProxy("projects");
-    
+
     @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the address")
     private String projectName;
 
     @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the network owner")
     private IdentityProxy domainId = new IdentityProxy("domain");
-    
+
     @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the network owner")
     private String domain;
-    
+
     @SerializedName("isdefault") @Param(description="true if network is default, false otherwise")
     private Boolean isDefault;
-    
+
     @SerializedName("service") @Param(description="the list of services", responseObject = ServiceResponse.class)
     private List<ServiceResponse> services;
-    
+
     @SerializedName(ApiConstants.NETWORK_DOMAIN) @Param(description="the network domain")
     private String networkDomain;
-    
+
     @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network id")
     private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
-    
+
     @SerializedName(ApiConstants.RESTART_REQUIRED) @Param(description="true network requires restart")
     private Boolean restartRequired;
-    
+
     @SerializedName(ApiConstants.SPECIFY_IP_RANGES) @Param(description="true if network supports specifying ip ranges, false otherwise")
     private Boolean specifyIpRanges;
-    
+
     @SerializedName(ApiConstants.VPC_ID) @Param(description="VPC the network belongs to")
     private IdentityProxy vpcId = new IdentityProxy("vpc");
 
     @SerializedName(ApiConstants.CAN_USE_FOR_DEPLOY) @Param(description="list networks available for vm deployment")
     private Boolean canUseForDeploy;
-    
+
     @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with network", responseObject = ResourceTagResponse.class)
     private List<ResourceTagResponse> tags;
-    
+
     public void setId(Long id) {
         this.id.setValue(id);
     }
@@ -163,7 +163,7 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
     public void setNetmask(String netmask) {
         this.netmask = netmask;
     }
-    
+
     public void setZoneId(Long zoneId) {
         this.zoneId.setValue(zoneId);
     }
@@ -224,14 +224,14 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
         this.isSystem = isSystem;
     }
 
-	public void setDomainName(String domain) {
-		this.domain = domain;
-	}
+    public void setDomainName(String domain) {
+        this.domain = domain;
+    }
 
     public void setNetworkOfferingAvailability(String networkOfferingAvailability) {
         this.networkOfferingAvailability = networkOfferingAvailability;
     }
-    
+
     public void setServices(List<ServiceResponse> services) {
         this.services = services;
     }
@@ -243,7 +243,7 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
     public void setNetworkDomain(String networkDomain) {
         this.networkDomain = networkDomain;
     }
-    
+
     @Override
     public void setProjectId(Long projectId) {
         this.projectId.setValue(projectId);
@@ -258,38 +258,38 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
         this.physicalNetworkId.setValue(physicalNetworkId);
     }
 
-	public void setAclType(String aclType) {
-		this.aclType = aclType;
-	}
+    public void setAclType(String aclType) {
+        this.aclType = aclType;
+    }
+
+    public void setSubdomainAccess(Boolean subdomainAccess) {
+        this.subdomainAccess = subdomainAccess;
+    }
+
+    public void setZoneName(String zoneName) {
+        this.zoneName = zoneName;
+    }
 
-	public void setSubdomainAccess(Boolean subdomainAccess) {
-		this.subdomainAccess = subdomainAccess;
-	}
+    public void setCidr(String cidr) {
+        this.cidr = cidr;
+    }
 
-	public void setZoneName(String zoneName) {
-		this.zoneName = zoneName;
-	}
+    public void setRestartRequired(Boolean restartRequired) {
+        this.restartRequired = restartRequired;
+    }
 
-	public void setCidr(String cidr) {
-		this.cidr = cidr;
-	}
+    public void setSpecifyIpRanges(Boolean specifyIpRanges) {
+        this.specifyIpRanges = specifyIpRanges;
+    }
 
-	public void setRestartRequired(Boolean restartRequired) {
-		this.restartRequired = restartRequired;
-	}
-	
-	public void setSpecifyIpRanges(Boolean specifyIpRanges) {
-		this.specifyIpRanges = specifyIpRanges;
-	}
-	
     public void setVpcId(Long vpcId) {
         this.vpcId.setValue(vpcId);
     }
-    
+
     public void setCanUseForDeploy(Boolean canUseForDeploy) {
         this.canUseForDeploy = canUseForDeploy;
     }
-    
+
     public void setTags(List<ResourceTagResponse> tags) {
         this.tags = tags;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/NicResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/NicResponse.java b/api/src/com/cloud/api/response/NicResponse.java
index e02256d..e27a8cf 100755
--- a/api/src/com/cloud/api/response/NicResponse.java
+++ b/api/src/com/cloud/api/response/NicResponse.java
@@ -23,43 +23,43 @@ import com.google.gson.annotations.SerializedName;
 
 @SuppressWarnings("unused")
 public class NicResponse extends BaseResponse {
-    
+
     @SerializedName("id") @Param(description="the ID of the nic")
     private final IdentityProxy id = new IdentityProxy("nics");
 
     @SerializedName("networkid") @Param(description="the ID of the corresponding network")
     private final IdentityProxy networkId = new IdentityProxy("networks");
- 
+
     @SerializedName("networkname") @Param(description="the name of the corresponding network")
     private String  networkName ;
-    
+
     @SerializedName(ApiConstants.NETMASK) @Param(description="the netmask of the nic")
     private String netmask;
-    
+
     @SerializedName(ApiConstants.GATEWAY) @Param(description="the gateway of the nic")
     private String gateway;
-    
+
     @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the ip address of the nic")
     private String ipaddress;
-    
+
     @SerializedName("isolationuri") @Param(description="the isolation uri of the nic")
     private String isolationUri;
-    
+
     @SerializedName("broadcasturi") @Param(description="the broadcast uri of the nic")
     private String broadcastUri;
-    
+
     @SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="the traffic type of the nic")
     private String trafficType;
-    
+
     @SerializedName(ApiConstants.TYPE) @Param(description="the type of the nic")
     private String type;
-    
+
     @SerializedName(ApiConstants.IS_DEFAULT) @Param(description="true if nic is default, false otherwise")
     private Boolean isDefault;
 
     @SerializedName("macaddress") @Param(description="true if nic is default, false otherwise")
     private String macAddress;
-    
+
     public Long getId() {
         return id.getValue();
     }
@@ -108,9 +108,9 @@ public class NicResponse extends BaseResponse {
         this.isDefault = isDefault;
     }
 
-	public void setMacAddress(String macAddress) {
-		this.macAddress = macAddress;
-	}
+    public void setMacAddress(String macAddress) {
+        this.macAddress = macAddress;
+    }
 
     @Override
     public int hashCode() {
@@ -136,5 +136,5 @@ public class NicResponse extends BaseResponse {
             return false;
         return true;
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/PhysicalNetworkResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/PhysicalNetworkResponse.java b/api/src/com/cloud/api/response/PhysicalNetworkResponse.java
index a9ba435..c390713 100644
--- a/api/src/com/cloud/api/response/PhysicalNetworkResponse.java
+++ b/api/src/com/cloud/api/response/PhysicalNetworkResponse.java
@@ -25,28 +25,28 @@ import com.google.gson.annotations.SerializedName;
 
 @SuppressWarnings("unused")
 public class PhysicalNetworkResponse extends BaseResponse{
-    
+
     @SerializedName(ApiConstants.ID) @Param(description="the uuid of the physical network")
     private String id;
-    
+
     @SerializedName(ApiConstants.NAME) @Param(description="name of the physical network")
     private String name;
-    
+
     @SerializedName(ApiConstants.BROADCAST_DOMAIN_RANGE) @Param(description="Broadcast domain range of the physical network")
     private String broadcastDomainRange;
-    
+
     @SerializedName(ApiConstants.ZONE_ID) @Param(description="zone id of the physical network")
     private IdentityProxy zoneId = new IdentityProxy("data_center");
-    
+
     @SerializedName(ApiConstants.STATE) @Param(description="state of the physical network")
     private String state;
 
     @SerializedName(ApiConstants.VLAN) @Param(description="the vlan of the physical network")
     private String vlan;
-    
+
     @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the physical network owner")
     private IdentityProxy domainId = new IdentityProxy("domain");
-    
+
     @SerializedName(ApiConstants.TAGS) @Param(description="comma separated tag")
     private String tags;
 
@@ -67,30 +67,30 @@ public class PhysicalNetworkResponse extends BaseResponse{
     public void setState(String state) {
         this.state = state;
     }
-    
+
 
     public void setDomainId(Long domainId) {
         this.domainId.setValue(domainId);
     }
-    
+
     public void setVlan(String vlan) {
         this.vlan = vlan;
     }
-    
+
 
     public void setTags(List<String> tags) {
         if (tags == null || tags.size() == 0) {
             return;
         }
-        
+
         StringBuilder buf = new StringBuilder();
         for (String tag : tags) {
             buf.append(tag).append(",");
         }
-        
+
         this.tags = buf.delete(buf.length()-1, buf.length()).toString();
     }
-    
+
     public void setBroadcastDomainRange(String broadcastDomainRange) {
         this.broadcastDomainRange = broadcastDomainRange;
     }
@@ -103,16 +103,16 @@ public class PhysicalNetworkResponse extends BaseResponse{
         if (isolationMethods == null || isolationMethods.size() == 0) {
             return;
         }
-        
+
         StringBuilder buf = new StringBuilder();
         for (String isolationMethod : isolationMethods) {
             buf.append(isolationMethod).append(",");
         }
-        
+
         this.isolationMethods = buf.delete(buf.length()-1, buf.length()).toString();
     }
 
-	public void setName(String name) {
-		this.name = name;
-	}
+    public void setName(String name) {
+        this.name = name;
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/PodResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/PodResponse.java b/api/src/com/cloud/api/response/PodResponse.java
index b2c44e1..c2cb946 100755
--- a/api/src/com/cloud/api/response/PodResponse.java
+++ b/api/src/com/cloud/api/response/PodResponse.java
@@ -47,13 +47,13 @@ public class PodResponse extends BaseResponse {
 
     @SerializedName("endip") @Param(description="the ending IP for the Pod")
     private String endIp;
-    
+
     @SerializedName("allocationstate") @Param(description="the allocation state of the Pod")
-    private String allocationState;    
+    private String allocationState;
 
     @SerializedName("capacity")  @Param(description="the capacity of the Pod", responseObject = CapacityResponse.class)
     private List<CapacityResponse> capacitites;
-    
+
     public Long getId() {
         return id.getValue();
     }
@@ -117,20 +117,20 @@ public class PodResponse extends BaseResponse {
     public void setEndIp(String endIp) {
         this.endIp = endIp;
     }
-    
+
     public String getAllocationState() {
-    	return allocationState;
+        return allocationState;
     }
-    
+
     public void setAllocationState(String allocationState) {
-    	this.allocationState = allocationState;
+        this.allocationState = allocationState;
     }
 
-	public List<CapacityResponse> getCapacitites() {
-		return capacitites;
-	}
+    public List<CapacityResponse> getCapacitites() {
+        return capacitites;
+    }
 
-	public void setCapacitites(List<CapacityResponse> capacitites) {
-		this.capacitites = capacitites;
-	}       
+    public void setCapacitites(List<CapacityResponse> capacitites) {
+        this.capacitites = capacitites;
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/PrivateGatewayResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/PrivateGatewayResponse.java b/api/src/com/cloud/api/response/PrivateGatewayResponse.java
index 97df61d..47ed05e 100644
--- a/api/src/com/cloud/api/response/PrivateGatewayResponse.java
+++ b/api/src/com/cloud/api/response/PrivateGatewayResponse.java
@@ -22,41 +22,41 @@ import com.google.gson.annotations.SerializedName;
 
 @SuppressWarnings("unused")
 public class PrivateGatewayResponse extends BaseResponse implements ControlledEntityResponse{
-    
+
     @SerializedName(ApiConstants.ID) @Param(description="the id of the private gateway")
     private IdentityProxy id = new IdentityProxy("vpc_gateways");
-    
+
     @SerializedName(ApiConstants.GATEWAY) @Param(description="the gateway")
     private String gateway;
-    
+
     @SerializedName(ApiConstants.NETMASK) @Param(description="the private gateway's netmask")
     private String netmask;
-    
+
     @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the private gateway's ip address")
     private String address;
-    
+
     @SerializedName(ApiConstants.ZONE_ID) @Param(description="zone id of the private gateway")
     private IdentityProxy zoneId = new IdentityProxy("data_center");
-    
+
     @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone the private gateway belongs to")
     private String zoneName;
-    
+
     @SerializedName(ApiConstants.VLAN) @Param(description="the vlan of the private gateway")
     private String vlan;
-    
+
     @SerializedName(ApiConstants.VPC_ID) @Param(description="VPC the private gateaway belongs to")
     private IdentityProxy vpcId = new IdentityProxy("vpc");
-    
+
     @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network id")
     private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
-    
+
     @SerializedName(ApiConstants.ACCOUNT)
     @Param(description = "the account associated with the private gateway")
     private String accountName;
-    
+
     @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the private gateway")
     private IdentityProxy projectId = new IdentityProxy("projects");
-    
+
     @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the private gateway")
     private String projectName;
 
@@ -67,11 +67,11 @@ public class PrivateGatewayResponse extends BaseResponse implements ControlledEn
     @SerializedName(ApiConstants.DOMAIN)
     @Param(description = "the domain associated with the private gateway")
     private String domainName;
-    
+
     @SerializedName(ApiConstants.STATE) @Param(description="State of the gateway, can be Creating, Ready, Deleting")
     private String state;
-    
-    
+
+
     public void setId(Long id) {
         this.id.setValue(id);
     }
@@ -83,7 +83,7 @@ public class PrivateGatewayResponse extends BaseResponse implements ControlledEn
     public void setNetmask(String netmask) {
         this.netmask = netmask;
     }
-    
+
     public void setZoneId(Long zoneId) {
         this.zoneId.setValue(zoneId);
     }
@@ -95,7 +95,7 @@ public class PrivateGatewayResponse extends BaseResponse implements ControlledEn
     public void setZoneName(String zoneName) {
         this.zoneName = zoneName;
     }
-    
+
     public void setVpcId(Long vpcId) {
         this.vpcId.setValue(vpcId);
     }
@@ -107,7 +107,7 @@ public class PrivateGatewayResponse extends BaseResponse implements ControlledEn
     public void setPhysicalNetworkId(Long physicalNetworkId) {
         this.physicalNetworkId.setValue(physicalNetworkId);
     }
-    
+
     @Override
     public void setAccountName(String accountName) {
         this.accountName = accountName;
@@ -117,12 +117,12 @@ public class PrivateGatewayResponse extends BaseResponse implements ControlledEn
     public void setDomainId(Long domainId) {
         this.domainId.setValue(domainId);
     }
-    
+
     @Override
     public void setDomainName(String domainName) {
         this.domainName = domainName;
     }
-    
+
     @Override
     public void setProjectId(Long projectId) {
         this.projectId.setValue(projectId);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/ProjectInvitationResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ProjectInvitationResponse.java b/api/src/com/cloud/api/response/ProjectInvitationResponse.java
index 5f10251..3533fa8 100644
--- a/api/src/com/cloud/api/response/ProjectInvitationResponse.java
+++ b/api/src/com/cloud/api/response/ProjectInvitationResponse.java
@@ -25,28 +25,28 @@ import com.google.gson.annotations.SerializedName;
 public class ProjectInvitationResponse extends BaseResponse implements ControlledEntityResponse{
     @SerializedName(ApiConstants.ID) @Param(description="the id of the invitation")
     private IdentityProxy id = new IdentityProxy("project_invitations");
-    
+
     @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the id of the project")
     private IdentityProxy projectId = new IdentityProxy("projects");
-    
+
     @SerializedName(ApiConstants.PROJECT) @Param(description="the name of the project")
     private String projectName;
-    
+
     @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id the project belongs to")
     private IdentityProxy domainId = new IdentityProxy("domain");
-    
+
     @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name where the project belongs to")
     private String domainName;
-    
+
     @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account name of the project's owner")
     private String accountName;
-    
+
     @SerializedName(ApiConstants.EMAIL) @Param(description="the email the invitation was sent to")
     private String email;
-    
+
     @SerializedName(ApiConstants.STATE) @Param(description="the invitation state")
     private String invitationState;
-    
+
     public void setId(Long id) {
         this.id.setValue(id);
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/ProjectResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ProjectResponse.java b/api/src/com/cloud/api/response/ProjectResponse.java
index 8600daf..e17b9dc 100644
--- a/api/src/com/cloud/api/response/ProjectResponse.java
+++ b/api/src/com/cloud/api/response/ProjectResponse.java
@@ -25,31 +25,31 @@ import com.google.gson.annotations.SerializedName;
 
 @SuppressWarnings("unused")
 public class ProjectResponse extends BaseResponse{
-    
+
     @SerializedName(ApiConstants.ID) @Param(description="the id of the project")
     private IdentityProxy id = new IdentityProxy("projects");
-    
+
     @SerializedName(ApiConstants.NAME) @Param(description="the name of the project")
     private String name;
-    
+
     @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="the displaytext of the project")
     private String displaytext;
 
     @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id the project belongs to")
     private IdentityProxy domainId = new IdentityProxy("domain");
-    
+
     @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name where the project belongs to")
     private String domain;
-    
+
     @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account name of the project's owner")
     private String ownerName;
-    
+
     @SerializedName(ApiConstants.STATE) @Param(description="the state of the project")
     private String state;
-    
+
     @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with vm", responseObject = ResourceTagResponse.class)
     private List<ResourceTagResponse> tags;
- 
+
 
     public void setId(Long id) {
         this.id.setValue(id);
@@ -78,7 +78,7 @@ public class ProjectResponse extends BaseResponse{
     public void setState(String state) {
         this.state = state;
     }
-    
+
     public void setTags(List<ResourceTagResponse> tags) {
         this.tags = tags;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/ProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ProviderResponse.java b/api/src/com/cloud/api/response/ProviderResponse.java
index 28e0a85..605d9f8 100644
--- a/api/src/com/cloud/api/response/ProviderResponse.java
+++ b/api/src/com/cloud/api/response/ProviderResponse.java
@@ -28,25 +28,25 @@ public class ProviderResponse extends BaseResponse {
 
     @SerializedName(ApiConstants.NAME) @Param(description="the provider name")
     private String name;
-    
+
     @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network this belongs to")
     private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
 
     @SerializedName(ApiConstants.DEST_PHYSICAL_NETWORK_ID) @Param(description="the destination physical network")
     private IdentityProxy destinationPhysicalNetworkId = new IdentityProxy("physical_network");
-    
+
     @SerializedName(ApiConstants.STATE) @Param(description="state of the network provider")
     private String state;
 
     @SerializedName(ApiConstants.ID) @Param(description="uuid of the network provider")
     private String id;
-    
+
     @SerializedName(ApiConstants.SERVICE_LIST) @Param(description="services for this provider")
     private List<String> services;
-    
+
     @SerializedName(ApiConstants.CAN_ENABLE_INDIVIDUAL_SERVICE) @Param(description="true if individual services can be enabled/disabled")
     private Boolean canEnableIndividualServices;
-    
+
     public void setName(String name) {
         this.name = name;
     }
@@ -54,7 +54,7 @@ public class ProviderResponse extends BaseResponse {
     public String getName() {
         return name;
     }
-    
+
     public void setPhysicalNetworkId(long physicalNetworkId) {
         this.physicalNetworkId.setValue(physicalNetworkId);
     }
@@ -62,7 +62,7 @@ public class ProviderResponse extends BaseResponse {
     public long getphysicalNetworkId() {
         return physicalNetworkId.getValue();
     }
-    
+
     public void setDestinationPhysicalNetworkId(long destPhysicalNetworkId) {
         this.destinationPhysicalNetworkId.setValue(destPhysicalNetworkId);
     }
@@ -74,7 +74,7 @@ public class ProviderResponse extends BaseResponse {
     public void setState(String state) {
         this.state = state;
     }
-    
+
     public String getState() {
         return this.state;
     }
@@ -82,24 +82,24 @@ public class ProviderResponse extends BaseResponse {
     public void setId(String uuid) {
         this.id = uuid;
     }
-    
+
     public String getId() {
         return this.id;
     }
-    
+
     public void setServices(List<String> services) {
         this.services = services;
     }
-    
+
     public List<String> getServices() {
         return services;
     }
-    
+
     public Boolean getCanEnableIndividualServices() {
         return canEnableIndividualServices;
     }
 
     public void setCanEnableIndividualServices(Boolean canEnableIndividualServices) {
         this.canEnableIndividualServices = canEnableIndividualServices;
-    }    
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java b/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java
index 40f0f3f..6a5acaf 100644
--- a/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java
+++ b/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java
@@ -23,13 +23,13 @@ import com.google.gson.annotations.SerializedName;
 
 @SuppressWarnings("unused")
 public class RemoteAccessVpnResponse extends BaseResponse implements ControlledEntityResponse{
-    
+
     @SerializedName(ApiConstants.PUBLIC_IP_ID) @Param(description="the public ip address of the vpn server")
     private IdentityProxy publicIpId = new IdentityProxy("user_ip_address");
-    
+
     @SerializedName(ApiConstants.PUBLIC_IP) @Param(description="the public ip address of the vpn server")
     private String publicIp;
-    
+
     @SerializedName("iprange") @Param(description="the range of ips to allocate to the clients")
     private String ipRange;
 
@@ -38,45 +38,45 @@ public class RemoteAccessVpnResponse extends BaseResponse implements ControlledE
 
     @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account of the remote access vpn")
     private String accountName;
-    
+
     @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vpn")
     private IdentityProxy projectId = new IdentityProxy("projects");
-    
+
     @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vpn")
     private String projectName;
 
     @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the account of the remote access vpn")
-	private IdentityProxy domainId = new IdentityProxy("domain");
+    private IdentityProxy domainId = new IdentityProxy("domain");
 
     @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the account of the remote access vpn")
-	private String domainName;
-    
+    private String domainName;
+
     @SerializedName(ApiConstants.STATE) @Param(description="the state of the rule")
     private String state;
 
-	public void setPublicIp(String publicIp) {
-		this.publicIp = publicIp;
-	}
+    public void setPublicIp(String publicIp) {
+        this.publicIp = publicIp;
+    }
 
-	public void setIpRange(String ipRange) {
-		this.ipRange = ipRange;
-	}
+    public void setIpRange(String ipRange) {
+        this.ipRange = ipRange;
+    }
 
-	public void setPresharedKey(String presharedKey) {
-		this.presharedKey = presharedKey;
-	}
+    public void setPresharedKey(String presharedKey) {
+        this.presharedKey = presharedKey;
+    }
 
-	public void setAccountName(String accountName) {
-		this.accountName = accountName;
-	}
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
 
-	public void setDomainId(Long domainId) {
-		this.domainId.setValue(domainId);
-	}
+    public void setDomainId(Long domainId) {
+        this.domainId.setValue(domainId);
+    }
 
-	public void setDomainName(String name) {
-		this.domainName = name;		
-	}
+    public void setDomainName(String name) {
+        this.domainName = name;
+    }
 
     public void setState(String state) {
         this.state = state;
@@ -95,5 +95,5 @@ public class RemoteAccessVpnResponse extends BaseResponse implements ControlledE
     public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/ResourceCountResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ResourceCountResponse.java b/api/src/com/cloud/api/response/ResourceCountResponse.java
index afd4d21..e308e54 100644
--- a/api/src/com/cloud/api/response/ResourceCountResponse.java
+++ b/api/src/com/cloud/api/response/ResourceCountResponse.java
@@ -25,10 +25,10 @@ import com.google.gson.annotations.SerializedName;
 public class ResourceCountResponse extends BaseResponse implements ControlledEntityResponse{
     @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account for which resource count's are updated")
     private String accountName;
-    
+
     @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id for which resource count's are updated")
     private IdentityProxy projectId = new IdentityProxy("projects");
-    
+
     @SerializedName(ApiConstants.PROJECT) @Param(description="the project name for which resource count's are updated")
     private String projectName;
 
@@ -67,7 +67,7 @@ public class ResourceCountResponse extends BaseResponse implements ControlledEnt
     public void setResourceCount(Long resourceCount) {
         this.resourceCount = resourceCount;
     }
-    
+
     @Override
     public void setProjectId(Long projectId) {
         this.projectId.setValue(projectId);
@@ -77,5 +77,5 @@ public class ResourceCountResponse extends BaseResponse implements ControlledEnt
     public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/ResourceLimitResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ResourceLimitResponse.java b/api/src/com/cloud/api/response/ResourceLimitResponse.java
index 7ba4ffd..6493917 100644
--- a/api/src/com/cloud/api/response/ResourceLimitResponse.java
+++ b/api/src/com/cloud/api/response/ResourceLimitResponse.java
@@ -37,18 +37,18 @@ public class ResourceLimitResponse extends BaseResponse implements ControlledEnt
 
     @SerializedName("max") @Param(description="the maximum number of the resource. A -1 means the resource currently has no limit.")
     private Long max;
-    
+
     @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the resource limit")
     private IdentityProxy projectId = new IdentityProxy("projects");
-    
+
     @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the resource limit")
     private String projectName;
-    
+
     @Override
     public void setAccountName(String accountName) {
         this.accountName = accountName;
     }
-    
+
     @Override
     public void setProjectName(String projectName) {
         this.projectName = projectName;
@@ -58,12 +58,12 @@ public class ResourceLimitResponse extends BaseResponse implements ControlledEnt
     public void setDomainId(Long domainId) {
         this.domainId.setValue(domainId);
     }
-    
+
     @Override
     public void setDomainName(String domainName) {
         this.domainName = domainName;
     }
-    
+
     public void setResourceType(String resourceType) {
         this.resourceType = resourceType;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/ResourceTagResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ResourceTagResponse.java b/api/src/com/cloud/api/response/ResourceTagResponse.java
index d60b069..04c2290 100644
--- a/api/src/com/cloud/api/response/ResourceTagResponse.java
+++ b/api/src/com/cloud/api/response/ResourceTagResponse.java
@@ -25,26 +25,26 @@ import com.google.gson.annotations.SerializedName;
 public class ResourceTagResponse extends BaseResponse implements ControlledEntityResponse{
     @SerializedName(ApiConstants.KEY) @Param(description="tag key name")
     private String key;
-    
+
     @SerializedName(ApiConstants.VALUE) @Param(description="tag value")
     private String value;
-    
+
     @SerializedName(ApiConstants.RESOURCE_TYPE) @Param(description="resource type")
     private String resourceType;
-    
+
     @SerializedName(ApiConstants.RESOURCE_ID) @Param(description="id of the resource")
     private String id;
-    
+
     @SerializedName(ApiConstants.ACCOUNT)
     @Param(description = "the account associated with the tag")
     private String accountName;
-    
+
     @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id the tag belongs to")
     private IdentityProxy projectId = new IdentityProxy("projects");
-    
+
     @SerializedName(ApiConstants.PROJECT) @Param(description="the project name where tag belongs to")
     private String projectName;
-    
+
     @SerializedName(ApiConstants.DOMAIN_ID)
     @Param(description = "the ID of the domain associated with the tag")
     private IdentityProxy domainId = new IdentityProxy("domain");
@@ -52,7 +52,7 @@ public class ResourceTagResponse extends BaseResponse implements ControlledEntit
     @SerializedName(ApiConstants.DOMAIN)
     @Param(description = "the domain associated with the tag")
     private String domainName;
-    
+
     @SerializedName(ApiConstants.CUSTOMER) @Param(description="customer associated with the tag")
     private String customer;
 
@@ -71,7 +71,7 @@ public class ResourceTagResponse extends BaseResponse implements ControlledEntit
     public void setId(String id) {
         this.id = id;
     }
-    
+
     public void setAccountName(String accountName) {
         this.accountName = accountName;
     }
@@ -79,21 +79,21 @@ public class ResourceTagResponse extends BaseResponse implements ControlledEntit
     public void setDomainId(Long domainId) {
         this.domainId.setValue(domainId);
     }
-    
+
     public void setDomainName(String domainName) {
         this.domainName = domainName;
     }
-    
+
     @Override
     public void setProjectId(Long projectId) {
         this.projectId.setValue(projectId);
     }
-    
+
     @Override
     public void setProjectName(String projectName) {
         this.projectName = projectName;
-    }   
-   
+    }
+
     public void setCustomer(String customer) {
         this.customer = customer;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/SSHKeyPairResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SSHKeyPairResponse.java b/api/src/com/cloud/api/response/SSHKeyPairResponse.java
index 45b8cd4..4f0bea4 100644
--- a/api/src/com/cloud/api/response/SSHKeyPairResponse.java
+++ b/api/src/com/cloud/api/response/SSHKeyPairResponse.java
@@ -21,50 +21,50 @@ import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
 public class SSHKeyPairResponse extends BaseResponse {
-	
+
     @SerializedName(ApiConstants.NAME) @Param(description="Name of the keypair")
     private String name;
 
     @SerializedName("fingerprint") @Param(description="Fingerprint of the public key")
     private String fingerprint;
-    
+
     @SerializedName("privatekey") @Param(description="Private key")
     private String privateKey;
 
     public SSHKeyPairResponse() {}
-    
+
     public SSHKeyPairResponse(String name, String fingerprint) {
-    	this(name, fingerprint, null);
+        this(name, fingerprint, null);
     }
-    
+
     public SSHKeyPairResponse(String name, String fingerprint, String privateKey) {
-    	this.name = name;
-    	this.fingerprint = fingerprint;
-    	this.privateKey = privateKey;
+        this.name = name;
+        this.fingerprint = fingerprint;
+        this.privateKey = privateKey;
+    }
+
+    public String getName() {
+        return name;
     }
-    
-	public String getName() {
-		return name;
-	}
 
-	public void setName(String name) {
-		this.name = name;
-	}
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getFingerprint() {
+        return fingerprint;
+    }
 
-	public String getFingerprint() {
-		return fingerprint;
-	}
+    public void setFingerprint(String fingerprint) {
+        this.fingerprint = fingerprint;
+    }
 
-	public void setFingerprint(String fingerprint) {
-		this.fingerprint = fingerprint;
-	}
+    public String getPrivateKey() {
+        return privateKey;
+    }
 
-	public String getPrivateKey() {
-		return privateKey;
-	}
+    public void setPrivateKey(String privateKey) {
+        this.privateKey = privateKey;
+    }
 
-	public void setPrivateKey(String privateKey) {
-		this.privateKey = privateKey;
-	}
-    
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/SecurityGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SecurityGroupResponse.java b/api/src/com/cloud/api/response/SecurityGroupResponse.java
index 6846187..46dbd04 100644
--- a/api/src/com/cloud/api/response/SecurityGroupResponse.java
+++ b/api/src/com/cloud/api/response/SecurityGroupResponse.java
@@ -36,10 +36,10 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledEnt
 
     @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account owning the security group")
     private String accountName;
-    
+
     @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the group")
     private IdentityProxy projectId = new IdentityProxy("projects");
-    
+
     @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the group")
     private String projectName;
 
@@ -54,14 +54,14 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledEnt
 
     @SerializedName("egressrule")  @Param(description="the list of egress rules associated with the security group", responseObject = SecurityGroupRuleResponse.class)
     private List<SecurityGroupRuleResponse> egressRules;
-    
+
     @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with the rule", responseObject = ResourceTagResponse.class)
     private List<ResourceTagResponse> tags;
-    
+
     public void setId(Long id) {
         this.id.setValue(id);
     }
-    
+
     public Long getId() {
         return id.getValue();
     }
@@ -93,7 +93,7 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledEnt
     public void setSecurityGroupEgressRules(List<SecurityGroupRuleResponse> securityGroupRules) {
         this.egressRules = securityGroupRules;
     }
-    
+
     @Override
     public Long getObjectId() {
         return getId();
@@ -123,7 +123,7 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledEnt
             return false;
         return true;
     }
-    
+
     @Override
     public void setProjectId(Long projectId) {
         this.projectId.setValue(projectId);
@@ -133,7 +133,7 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledEnt
     public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
-    
+
     public void setTags(List<ResourceTagResponse> tags) {
         this.tags = tags;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/ServiceOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ServiceOfferingResponse.java b/api/src/com/cloud/api/response/ServiceOfferingResponse.java
index 3f12350..2d6a288 100644
--- a/api/src/com/cloud/api/response/ServiceOfferingResponse.java
+++ b/api/src/com/cloud/api/response/ServiceOfferingResponse.java
@@ -50,21 +50,21 @@ public class ServiceOfferingResponse extends BaseResponse {
 
     @SerializedName("offerha") @Param(description="the ha support in the service offering")
     private Boolean offerHa;
-  
+
     @SerializedName("limitcpuuse") @Param(description="restrict the CPU usage to committed service offering")
     private Boolean limitCpuUse;
-        
+
     @SerializedName("tags") @Param(description="the tags for the service offering")
     private String tags;
 
-	@SerializedName("domainid") @Param(description="the domain id of the service offering")
+    @SerializedName("domainid") @Param(description="the domain id of the service offering")
     private IdentityProxy domainId = new IdentityProxy("domain");
-	
+
     @SerializedName(ApiConstants.DOMAIN) @Param(description="Domain name for the offering")
     private String domain;
-    
+
     @SerializedName(ApiConstants.HOST_TAGS) @Param(description="the host tag for the service offering")
-    private String hostTag; 
+    private String hostTag;
 
     @SerializedName(ApiConstants.IS_SYSTEM_OFFERING) @Param(description="is this a system vm offering")
     private Boolean isSystem;
@@ -74,7 +74,7 @@ public class ServiceOfferingResponse extends BaseResponse {
 
     @SerializedName(ApiConstants.SYSTEM_VM_TYPE) @Param(description="is this a the systemvm type for system vm offering")
     private String vm_type;
-    
+
     @SerializedName(ApiConstants.NETWORKRATE) @Param(description="data transfer rate in megabits per second allowed.")
     private Integer networkRate;
 
@@ -94,11 +94,11 @@ public class ServiceOfferingResponse extends BaseResponse {
     public void setName(String name) {
         this.name = name;
     }
-    
+
     public Boolean getIsSystem() {
         return isSystem;
     }
-    
+
     public void setIsSystemOffering(Boolean isSystem) {
         this.isSystem = isSystem;
     }
@@ -107,16 +107,16 @@ public class ServiceOfferingResponse extends BaseResponse {
     public Boolean getDefaultUse() {
         return defaultUse;
     }
-    
+
     public void setDefaultUse(Boolean defaultUse) {
         this.defaultUse = defaultUse;
     }
-    
+
 
     public String getSystemVmType() {
         return vm_type;
     }
-    
+
     public void setSystemVmType(String vmtype) {
         this.vm_type = vmtype;
     }
@@ -179,13 +179,13 @@ public class ServiceOfferingResponse extends BaseResponse {
     }
 
     public Boolean getLimitCpuUse() {
-    	return limitCpuUse;
+        return limitCpuUse;
     }
-    
+
     public void setLimitCpuUse(Boolean limitCpuUse) {
-    	this.limitCpuUse = limitCpuUse;
+        this.limitCpuUse = limitCpuUse;
     }
-        
+
     public String getTags() {
         return tags;
     }
@@ -195,28 +195,28 @@ public class ServiceOfferingResponse extends BaseResponse {
     }
 
     public Long getDomainId() {
-		return domainId.getValue();
-	}
-
-	public void setDomainId(Long domainId) {
-		this.domainId.setValue(domainId);
-	}
-
-	public String getDomain() {
-		return domain;
-	}
-
-	public void setDomain(String domain) {
-		this.domain = domain;
-	}
-	
-	public String getHostTag() {
-		return hostTag;
-	}
-
-	public void setHostTag(String hostTag) {
-		this.hostTag = hostTag;
-	}
+        return domainId.getValue();
+    }
+
+    public void setDomainId(Long domainId) {
+        this.domainId.setValue(domainId);
+    }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+
+    public String getHostTag() {
+        return hostTag;
+    }
+
+    public void setHostTag(String hostTag) {
+        this.hostTag = hostTag;
+    }
 
     public void setNetworkRate(Integer networkRate) {
         this.networkRate = networkRate;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/ServiceResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ServiceResponse.java b/api/src/com/cloud/api/response/ServiceResponse.java
index 7e72b51..ac7d88b 100644
--- a/api/src/com/cloud/api/response/ServiceResponse.java
+++ b/api/src/com/cloud/api/response/ServiceResponse.java
@@ -27,10 +27,10 @@ public class ServiceResponse extends BaseResponse {
 
     @SerializedName(ApiConstants.NAME) @Param(description="the service name")
     private String name;
-    
+
     @SerializedName(ApiConstants.PROVIDER) @Param(description="the service provider name")
     private List<ProviderResponse> providers;
-    
+
     @SerializedName("capability") @Param(description="the list of capabilities", responseObject = CapabilityResponse.class)
     private List<CapabilityResponse> capabilities;
 
@@ -45,4 +45,4 @@ public class ServiceResponse extends BaseResponse {
     public void setProviders(List<ProviderResponse> providers) {
         this.providers = providers;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java b/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java
index b17a46d..3b06033 100644
--- a/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java
+++ b/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java
@@ -45,41 +45,41 @@ public class Site2SiteCustomerGatewayResponse extends BaseResponse implements Co
 
     @SerializedName(ApiConstants.IKE_POLICY) @Param(description="IKE policy of customer gateway")
     private String ikePolicy;
-    
+
     @SerializedName(ApiConstants.ESP_POLICY) @Param(description="IPsec policy of customer gateway")
     private String espPolicy;
-    
+
     @SerializedName(ApiConstants.IKE_LIFETIME) @Param(description="Lifetime of IKE SA of customer gateway")
     private Long ikeLifetime;
-    
+
     @SerializedName(ApiConstants.ESP_LIFETIME) @Param(description="Lifetime of ESP SA of customer gateway")
     private Long espLifetime;
-    
+
     @SerializedName(ApiConstants.DPD) @Param(description="if DPD is enabled for customer gateway")
     private Boolean dpd;
-    
+
     @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner")
     private String accountName;
-    
+
     @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id")
     private IdentityProxy projectId = new IdentityProxy("projects");
-    
+
     @SerializedName(ApiConstants.PROJECT) @Param(description="the project name")
     private String projectName;
 
     @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the owner")
     private IdentityProxy domainId = new IdentityProxy("domain");
-    
+
     @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")
     private Date removed;
 
-	public void setId(Long id) {
-		this.id.setValue(id);
-	}
-	
+    public void setId(Long id) {
+        this.id.setValue(id);
+    }
+
     public void setName(String name) {
         this.name = name;
     }
@@ -98,32 +98,32 @@ public class Site2SiteCustomerGatewayResponse extends BaseResponse implements Co
 
     public void setIpsecPsk(String ipsecPsk) {
         this.ipsecPsk = ipsecPsk;
-    }	
-    
+    }
+
     public void setIkePolicy(String ikePolicy) {
         this.ikePolicy = ikePolicy;
-    }	
-    
+    }
+
     public void setEspPolicy(String espPolicy) {
         this.espPolicy = espPolicy;
-    }	
-    
+    }
+
     public void setIkeLifetime(Long ikeLifetime) {
         this.ikeLifetime = ikeLifetime;
-    }	
-    
+    }
+
     public void setEspLifetime(Long espLifetime) {
         this.espLifetime = espLifetime;
-    }	
-    
+    }
+
     public void setDpd(Boolean dpd) {
         this.dpd= dpd;
-    }	
-    
+    }
+
     public void setRemoved(Date removed) {
         this.removed = removed;
-    }	
-    
+    }
+
     @Override
     public void setAccountName(String accountName) {
         this.accountName = accountName;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java b/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java
index 86a7f31..911416b 100644
--- a/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java
+++ b/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java
@@ -30,13 +30,13 @@ public class Site2SiteVpnConnectionResponse extends BaseResponse implements Cont
 
     @SerializedName(ApiConstants.S2S_VPN_GATEWAY_ID) @Param(description="the vpn gateway ID")
     private IdentityProxy vpnGatewayId= new IdentityProxy("s2s_vpn_gateway");
-    
+
     @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")
     private IdentityProxy customerGatewayId = new IdentityProxy("s2s_customer_gateway");
-        
+
     @SerializedName(ApiConstants.GATEWAY) @Param(description="public ip address id of the customer gateway") //from CustomerGateway
     private String gatewayIp;
 
@@ -54,85 +54,85 @@ public class Site2SiteVpnConnectionResponse extends BaseResponse implements Cont
 
     @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
     private Long espLifetime;
-    
+
     @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")
     private String state;
-    
+
     @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner")
     private String accountName;
-    
+
     @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id")
     private IdentityProxy projectId = new IdentityProxy("projects");
-    
+
     @SerializedName(ApiConstants.PROJECT) @Param(description="the project name")
     private String projectName;
 
     @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the owner")
     private IdentityProxy domainId = new IdentityProxy("domain");
-    
+
     @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")
     private Date created;
 
     @SerializedName(ApiConstants.REMOVED) @Param(description="the date and time the host was removed")
     private Date removed;
 
-	public void setId(Long id) {
-		this.id.setValue(id);
-	}
-	
+    public void setId(Long id) {
+        this.id.setValue(id);
+    }
+
     public void setVpnGatewayId(Long vpnGatewayId) {
         this.vpnGatewayId.setValue(vpnGatewayId);
     }
 
     public void setIp(String ip) {
-		this.ip = ip;
-	}
-    
+        this.ip = ip;
+    }
+
     public void setCustomerGatewayId(Long customerGatewayId) {
         this.customerGatewayId.setValue(customerGatewayId);
     }
-    
+
     public void setGatewayIp(String gatewayIp) {
-    	this.gatewayIp = gatewayIp;
+        this.gatewayIp = gatewayIp;
     }
-    
+
     public void setGuestCidrList(String guestCidrList) {
-    	this.guestCidrList = guestCidrList;
+        this.guestCidrList = guestCidrList;
     }
-    
+
     public void setIpsecPsk(String ipsecPsk) {
-    	this.ipsecPsk = ipsecPsk;
+        this.ipsecPsk = ipsecPsk;
     }
-    
+
     public void setIkePolicy(String ikePolicy) {
-    	this.ikePolicy = ikePolicy;
+        this.ikePolicy = ikePolicy;
     }
-    
+
     public void setEspPolicy(String espPolicy) {
-    	this.espPolicy = espPolicy;
+        this.espPolicy = espPolicy;
     }
-    
+
     public void setIkeLifetime(Long ikeLifetime) {
         this.ikeLifetime = ikeLifetime;
-    }	
-    
+    }
+
     public void setEspLifetime(Long espLifetime) {
         this.espLifetime = espLifetime;
-    }	
-    
+    }
+
     public void setDpd(Boolean dpd) {
         this.dpd= dpd;
-    }	
-    
+    }
+
     public void setState(String state) {
         this.state = state;
     }
@@ -143,7 +143,7 @@ public class Site2SiteVpnConnectionResponse extends BaseResponse implements Cont
 
     public void setRemoved(Date removed) {
         this.removed = removed;
-    }	
+    }
 
     @Override
     public void setAccountName(String accountName) {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/Site2SiteVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/Site2SiteVpnGatewayResponse.java b/api/src/com/cloud/api/response/Site2SiteVpnGatewayResponse.java
index a7b9c32..0022019 100644
--- a/api/src/com/cloud/api/response/Site2SiteVpnGatewayResponse.java
+++ b/api/src/com/cloud/api/response/Site2SiteVpnGatewayResponse.java
@@ -36,38 +36,38 @@ public class Site2SiteVpnGatewayResponse extends BaseResponse implements Control
 
     @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner")
     private String accountName;
-    
+
     @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id")
     private IdentityProxy projectId = new IdentityProxy("projects");
-    
+
     @SerializedName(ApiConstants.PROJECT) @Param(description="the project name")
     private String projectName;
 
     @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the owner")
     private IdentityProxy domainId = new IdentityProxy("domain");
-    
+
     @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")
     private Date removed;
 
-	public void setId(Long id) {
-		this.id.setValue(id);
-	}
-	
-	public void setIp(String ip) {
-		this.ip = ip;
-	}
-	
-	public void setVpcId(Long vpcId) {
-		this.vpcId.setValue(vpcId);
-	}
-	
+    public void setId(Long id) {
+        this.id.setValue(id);
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public void setVpcId(Long vpcId) {
+        this.vpcId.setValue(vpcId);
+    }
+
     public void setRemoved(Date removed) {
         this.removed = removed;
-    }	
-    
+    }
+
     @Override
     public void setAccountName(String accountName) {
         this.accountName = accountName;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/SnapshotResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SnapshotResponse.java b/api/src/com/cloud/api/response/SnapshotResponse.java
index ba29fdb..9a6d53f 100644
--- a/api/src/com/cloud/api/response/SnapshotResponse.java
+++ b/api/src/com/cloud/api/response/SnapshotResponse.java
@@ -38,14 +38,14 @@ public class SnapshotResponse extends BaseResponse implements ControlledEntityRe
     @SerializedName(ApiConstants.DOMAIN_ID)
     @Param(description = "the domain ID of the snapshot's account")
     private IdentityProxy domainId = new IdentityProxy("domain");
-    
+
     @SerializedName(ApiConstants.DOMAIN)
     @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")
     private IdentityProxy projectId = new IdentityProxy("projects");
-    
+
     @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the snapshot")
     private String projectName;
 
@@ -66,7 +66,7 @@ public class SnapshotResponse extends BaseResponse implements ControlledEntityRe
     private String volumeType;
 
     @SerializedName(ApiConstants.CREATED)
-    @Param(description = "	the date the snapshot was created")
+    @Param(description = "  the date the snapshot was created")
     private Date created;
 
     @SerializedName(ApiConstants.NAME)
@@ -80,7 +80,7 @@ public class SnapshotResponse extends BaseResponse implements ControlledEntityRe
     @SerializedName(ApiConstants.STATE)
     @Param(description = "the state of the snapshot. BackedUp means that snapshot is ready to be used; Creating - the snapshot is being allocated on the primary storage; BackingUp - the snapshot is being backed up on secondary storage")
     private Snapshot.Status state;
-    
+
     @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with snapshot", responseObject = ResourceTagResponse.class)
     private List<ResourceTagResponse> tags;
 
@@ -88,7 +88,7 @@ public class SnapshotResponse extends BaseResponse implements ControlledEntityRe
     public Long getObjectId() {
         return getId();
     }
-   
+
     private Long getId() {
         return id.getValue();
     }
@@ -158,7 +158,7 @@ public class SnapshotResponse extends BaseResponse implements ControlledEntityRe
     public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
-    
+
     public void setTags(List<ResourceTagResponse> tags) {
         this.tags = tags;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/StaticRouteResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/StaticRouteResponse.java b/api/src/com/cloud/api/response/StaticRouteResponse.java
index dabae1c..b607e32 100644
--- a/api/src/com/cloud/api/response/StaticRouteResponse.java
+++ b/api/src/com/cloud/api/response/StaticRouteResponse.java
@@ -27,26 +27,26 @@ import com.google.gson.annotations.SerializedName;
 public class StaticRouteResponse extends BaseResponse implements ControlledEntityResponse{
     @SerializedName(ApiConstants.ID) @Param(description="the ID of static route")
     private IdentityProxy id = new IdentityProxy("static_routes");
-    
+
     @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")
     private IdentityProxy vpcId = new IdentityProxy("vpc");
-    
+
     @SerializedName(ApiConstants.GATEWAY_ID) @Param(description="VPC gateway the route is created for")
     private IdentityProxy gatewayId = new IdentityProxy("vpc_gateways");
-    
+
     @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")
     private IdentityProxy projectId = new IdentityProxy("projects");
-    
+
     @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the static route")
     private String projectName;
 
@@ -57,7 +57,7 @@ public class StaticRouteResponse extends BaseResponse implements ControlledEntit
     @SerializedName(ApiConstants.DOMAIN)
     @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)
     private List<ResourceTagResponse> tags;
@@ -81,7 +81,7 @@ public class StaticRouteResponse extends BaseResponse implements ControlledEntit
     public void setCidr(String cidr) {
         this.cidr = cidr;
     }
-    
+
     @Override
     public void setAccountName(String accountName) {
         this.accountName = accountName;
@@ -91,12 +91,12 @@ public class StaticRouteResponse extends BaseResponse implements ControlledEntit
     public void setDomainId(Long domainId) {
         this.domainId.setValue(domainId);
     }
-    
+
     @Override
     public void setDomainName(String domainName) {
         this.domainName = domainName;
     }
-    
+
     @Override
     public void setProjectId(Long projectId) {
         this.projectId.setValue(projectId);
@@ -106,7 +106,7 @@ public class StaticRouteResponse extends BaseResponse implements ControlledEntit
     public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
-    
+
     public void setTags(List<ResourceTagResponse> tags) {
         this.tags = tags;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/StatusResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/StatusResponse.java b/api/src/com/cloud/api/response/StatusResponse.java
index 336cad7..283766e 100644
--- a/api/src/com/cloud/api/response/StatusResponse.java
+++ b/api/src/com/cloud/api/response/StatusResponse.java
@@ -21,7 +21,7 @@ import com.google.gson.annotations.SerializedName;
 public class StatusResponse extends BaseResponse {
     @SerializedName("status")
     private Boolean status;
-    
+
     public Boolean getStatus() {
        return status;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.java b/api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.java
index f072dd9..18e122f 100755
--- a/api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.java
+++ b/api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.java
@@ -23,10 +23,10 @@ import com.google.gson.annotations.SerializedName;
 public class StorageNetworkIpRangeResponse extends BaseResponse {
     @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.")
     private Integer vlan;
-    
+
     @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod uuid for the storage network IP range")
     private String podUuid;
 
@@ -35,35 +35,35 @@ public class StorageNetworkIpRangeResponse extends BaseResponse {
 
     @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")
     private String gateway;
-    
+
     @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")
     private String zoneUuid;
-    
+
     @SerializedName(ApiConstants.NETMASK) @Param(description="the netmask of the storage network IP range")
     private String netmask;
-     
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-	
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
     public void setZoneUuid(String zoneUuid) {
         this.zoneUuid = zoneUuid;
     }
-    
+
     public void setVlan(Integer vlan) {
         this.vlan = vlan;
     }
-    
+
     public void setPodUuid(String podUuid) {
         this.podUuid = podUuid;
     }
-       
+
     public void setStartIp(String startIp) {
         this.startIp = startIp;
     }
@@ -75,12 +75,12 @@ public class StorageNetworkIpRangeResponse extends BaseResponse {
     public void setNetworkUuid(String networkUuid) {
         this.networkUuid = networkUuid;
     }
-    
+
     public void setNetmask(String netmask) {
-    	this.netmask = netmask;
+        this.netmask = netmask;
     }
-    
+
     public void setGateway(String gateway) {
-    	this.gateway = gateway;
+        this.gateway = gateway;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/StoragePoolResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/StoragePoolResponse.java b/api/src/com/cloud/api/response/StoragePoolResponse.java
index 4dbe104..d0d60ec 100755
--- a/api/src/com/cloud/api/response/StoragePoolResponse.java
+++ b/api/src/com/cloud/api/response/StoragePoolResponse.java
@@ -66,7 +66,7 @@ public class StoragePoolResponse extends BaseResponse {
 
     @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")
     private Long diskSizeUsed;
 
@@ -194,14 +194,14 @@ public class StoragePoolResponse extends BaseResponse {
     }
 
     public Long getDiskSizeUsed() {
-		return diskSizeUsed;
-	}
+        return diskSizeUsed;
+    }
 
-	public void setDiskSizeUsed(Long diskSizeUsed) {
-		this.diskSizeUsed = diskSizeUsed;
-	}
+    public void setDiskSizeUsed(Long diskSizeUsed) {
+        this.diskSizeUsed = diskSizeUsed;
+    }
 
-	public String getTags() {
+    public String getTags() {
         return tags;
     }
 
@@ -216,5 +216,5 @@ public class StoragePoolResponse extends BaseResponse {
     public void setState(StoragePoolStatus state) {
         this.state = state;
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/SuccessResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SuccessResponse.java b/api/src/com/cloud/api/response/SuccessResponse.java
index b390e0b..7f22116 100644
--- a/api/src/com/cloud/api/response/SuccessResponse.java
+++ b/api/src/com/cloud/api/response/SuccessResponse.java
@@ -22,10 +22,10 @@ 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("displaytext") @Param(description="any text associated with the success or failure")
      private String displayText;
-     
+
 	 public Boolean getSuccess() {
 	 	return success;
 	 }
@@ -41,9 +41,9 @@ public class SuccessResponse extends BaseResponse {
     public void setDisplayText(String displayText) {
         this.displayText = displayText;
     }
-    
+
     public SuccessResponse() {}
-    
+
     public SuccessResponse(String responseName) {
     	super.setResponseName(responseName);
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/SwiftResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SwiftResponse.java b/api/src/com/cloud/api/response/SwiftResponse.java
index 7471f82..bf77149 100755
--- a/api/src/com/cloud/api/response/SwiftResponse.java
+++ b/api/src/com/cloud/api/response/SwiftResponse.java
@@ -49,7 +49,7 @@ public class SwiftResponse extends BaseResponse {
     public Long getObjectId() {
         return id.getValue();
     }
-    
+
     public void setId(Long id) {
         this.id.setValue(id);
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/SystemVmInstanceResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SystemVmInstanceResponse.java b/api/src/com/cloud/api/response/SystemVmInstanceResponse.java
index cae526e..322c532 100644
--- a/api/src/com/cloud/api/response/SystemVmInstanceResponse.java
+++ b/api/src/com/cloud/api/response/SystemVmInstanceResponse.java
@@ -38,11 +38,11 @@ public class SystemVmInstanceResponse extends BaseResponse {
 
     @SerializedName("state") @Param(description="the state of the system VM")
     private String state;
-    
+
     @SerializedName("role") @Param(description="the role of the system VM")
     private String role;
-    
-    
+
+
     public Long getObjectId() {
     	return getId();
     }
@@ -86,13 +86,13 @@ public class SystemVmInstanceResponse extends BaseResponse {
     public void setState(String state) {
         this.state = state;
     }
-    
+
     public String getRole() {
         return role;
     }
 
     public void setRole(String role) {
         this.role = role;
-    }    
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/SystemVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SystemVmResponse.java b/api/src/com/cloud/api/response/SystemVmResponse.java
index 86b8493..40ca34b 100644
--- a/api/src/com/cloud/api/response/SystemVmResponse.java
+++ b/api/src/com/cloud/api/response/SystemVmResponse.java
@@ -74,7 +74,7 @@ public class SystemVmResponse extends BaseResponse {
 
     @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")
     private String linkLocalIp;
 
@@ -101,18 +101,18 @@ public class SystemVmResponse extends BaseResponse {
 
     @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")
     private Integer activeViewerSessions;
-    
+
     private Long objectId;
-    
+
     public Long getObjectId() {
-    	return objectId;
+        return objectId;
     }
-    
+
     public void setObjectId(Long objectId) {
-    	this.objectId = objectId;
+        this.objectId = objectId;
     }
 
     public Long getId() {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/TemplatePermissionsResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/TemplatePermissionsResponse.java b/api/src/com/cloud/api/response/TemplatePermissionsResponse.java
index 9058afb..b578f66 100644
--- a/api/src/com/cloud/api/response/TemplatePermissionsResponse.java
+++ b/api/src/com/cloud/api/response/TemplatePermissionsResponse.java
@@ -36,10 +36,10 @@ public class TemplatePermissionsResponse extends BaseResponse {
 
     @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")
     private List<String> projectIds;
-    
+
 
     public void setId(Long id) {
         this.id.setValue(id);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/TemplateResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/TemplateResponse.java b/api/src/com/cloud/api/response/TemplateResponse.java
index 950071a..3cb6938 100755
--- a/api/src/com/cloud/api/response/TemplateResponse.java
+++ b/api/src/com/cloud/api/response/TemplateResponse.java
@@ -97,7 +97,7 @@ public class TemplateResponse extends BaseResponse implements ControlledEntityRe
     private String hypervisor;
 
     @SerializedName(ApiConstants.DOMAIN) @Param(description="the name of the domain to which the template belongs")
-    private String domainName;  
+    private String domainName;
 
     @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the ID of the domain to which the template belongs")
     private IdentityProxy domainId = new IdentityProxy("domain");
@@ -109,7 +109,7 @@ public class TemplateResponse extends BaseResponse implements ControlledEntityRe
     private String checksum;
 
     @SerializedName("sourcetemplateid") @Param(description="the template ID of the parent template if present")
-    private IdentityProxy sourcetemplateId = new IdentityProxy("vm_template");    
+    private IdentityProxy sourcetemplateId = new IdentityProxy("vm_template");
 
     @SerializedName(ApiConstants.HOST_ID) @Param(description="the ID of the secondary storage host for the template")
     private IdentityProxy hostId = new IdentityProxy("host");
@@ -119,25 +119,25 @@ public class TemplateResponse extends BaseResponse implements ControlledEntityRe
 
     @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")
     private IdentityProxy projectId = new IdentityProxy("projects");
-    
+
     @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")
     private Map details;
-    
+
     @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with tempate", responseObject = ResourceTagResponse.class)
     private List<ResourceTagResponse> tags;
-    
+
 
     @Override
     public Long getObjectId() {
         return getId();
     }
-    
+
     public Long getId() {
         return id.getValue();
     }
@@ -229,7 +229,7 @@ public class TemplateResponse extends BaseResponse implements ControlledEntityRe
     public void setHypervisor(String hypervisor) {
         this.hypervisor = hypervisor;
     }
-    
+
     @Override
     public void setDomainName(String domainName) {
         this.domainName = domainName;
@@ -250,7 +250,7 @@ public class TemplateResponse extends BaseResponse implements ControlledEntityRe
 
     public void setSourceTemplateId(Long sourcetemplateId) {
         this.sourcetemplateId.setValue(sourcetemplateId);
-    }    
+    }
 
     public void setHostId(Long hostId) {
         this.hostId.setValue(hostId);
@@ -263,7 +263,7 @@ public class TemplateResponse extends BaseResponse implements ControlledEntityRe
     public void setTemplateTag(String templateTag) {
         this.templateTag = templateTag;
     }
-    
+
     @Override
     public void setProjectId(Long projectId) {
         this.projectId.setValue(projectId);
@@ -273,15 +273,15 @@ public class TemplateResponse extends BaseResponse implements ControlledEntityRe
     public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
-    
+
     public Map getDetails() {
-    	return this.details;
+        return this.details;
     }
-    
+
     public void setDetails(Map details) {
-    	this.details = details;
+        this.details = details;
     }
-    
+
     public void setTags(List<ResourceTagResponse> tags) {
         this.tags = tags;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/TrafficTypeImplementorResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/TrafficTypeImplementorResponse.java b/api/src/com/cloud/api/response/TrafficTypeImplementorResponse.java
index 29d6b95..b2691b3 100755
--- a/api/src/com/cloud/api/response/TrafficTypeImplementorResponse.java
+++ b/api/src/com/cloud/api/response/TrafficTypeImplementorResponse.java
@@ -21,17 +21,17 @@ 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_IMPLEMENTOR) @Param(description="implementor of network traffic type")
-	 private String implementor;
-	 
-	 public void setTrafficType(String type) {
-		 this.trafficType = type;
-	 }
-	 
-	 public void setImplementor(String impl) {
-		 this.implementor = impl;
-	 }
+     @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;
+
+     public void setTrafficType(String type) {
+         this.trafficType = type;
+     }
+
+     public void setImplementor(String impl) {
+         this.implementor = impl;
+     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/api/response/TrafficTypeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/TrafficTypeResponse.java b/api/src/com/cloud/api/response/TrafficTypeResponse.java
index 3b63683..cca7f63 100644
--- a/api/src/com/cloud/api/response/TrafficTypeResponse.java
+++ b/api/src/com/cloud/api/response/TrafficTypeResponse.java
@@ -28,10 +28,10 @@ public class TrafficTypeResponse extends BaseResponse {
 
     @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")
     private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
-    
+
     @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;
 
@@ -48,23 +48,23 @@ public class TrafficTypeResponse extends BaseResponse {
     public long getphysicalNetworkId() {
         return physicalNetworkId.getValue();
     }
-    
+
     public void setId(String uuid) {
         this.id = uuid;
     }
-    
+
     public String getId() {
         return this.id;
     }
-    
+
     public String getTrafficType() {
         return trafficType;
     }
-    
+
     public void setTrafficType(String trafficType) {
         this.trafficType = trafficType;
     }
-    
+
     public String getXenLabel() {
         return xenNetworkLabel;
     }
@@ -72,7 +72,7 @@ public class TrafficTypeResponse extends BaseResponse {
     public String getKvmLabel() {
         return kvmNetworkLabel;
     }
-    
+
     public void setXenLabel(String xenLabel) {
         this.xenNetworkLabel = xenLabel;
     }
@@ -83,8 +83,8 @@ public class TrafficTypeResponse extends BaseResponse {
 
     public void setVmwareLabel(String vmwareNetworkLabel) {
         this.vmwareNetworkLabel = vmwareNetworkLabel;
-    }    
-    
+    }
+
     public String getVmwareLabel() {
         return vmwareNetworkLabel;
     }