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/01/19 01:00:12 UTC

[44/51] [abbrv] fixed unit tests from merge

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java b/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java
index ded0fb5..95b8af2 100644
--- a/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java
@@ -17,9 +17,10 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class ConfigurationResponse extends BaseResponse {
     @SerializedName(ApiConstants.CATEGORY) @Param(description="the category of the configuration")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/CounterResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/CounterResponse.java b/api/src/org/apache/cloudstack/api/response/CounterResponse.java
index 4dc44e7..4f5784a 100644
--- a/api/src/org/apache/cloudstack/api/response/CounterResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/CounterResponse.java
@@ -18,12 +18,12 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
 import com.cloud.network.as.Counter;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 @SuppressWarnings("unused")
 @EntityReference(value=Counter.class)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java b/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java
index f45b0c8..59c108e 100644
--- a/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java
@@ -16,9 +16,10 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class CustomCertificateResponse extends BaseResponse {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
index de3daf5..04c318f 100644
--- a/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
 
 import java.util.Date;
 
-import com.cloud.offering.DiskOffering;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.offering.DiskOffering;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=DiskOffering.class)
 public class DiskOfferingResponse extends BaseResponse {
     @SerializedName(ApiConstants.ID) @Param(description="unique ID of the disk offering")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/DomainResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/DomainResponse.java b/api/src/org/apache/cloudstack/api/response/DomainResponse.java
index c74e7c9..736a96c 100644
--- a/api/src/org/apache/cloudstack/api/response/DomainResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/DomainResponse.java
@@ -19,6 +19,7 @@ package org.apache.cloudstack.api.response;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
+
 import com.cloud.domain.Domain;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
index cf2f3f4..c9aa197 100644
--- a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
@@ -20,14 +20,14 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-
-import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+
 import com.cloud.serializer.Param;
+import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.State;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
-import org.apache.cloudstack.api.EntityReference;
 
 @EntityReference(value=VirtualMachine.class)
 @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/EventResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/EventResponse.java b/api/src/org/apache/cloudstack/api/response/EventResponse.java
index b2148db..c2bf757 100644
--- a/api/src/org/apache/cloudstack/api/response/EventResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/EventResponse.java
@@ -19,11 +19,12 @@ package org.apache.cloudstack.api.response;
 import java.util.Date;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+
 import com.cloud.event.Event;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
-import org.apache.cloudstack.api.EntityReference;
 
 @EntityReference(value=Event.class)
 @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java b/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java
index 4dcc441..b526435 100644
--- a/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java
@@ -17,9 +17,10 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class EventTypeResponse extends BaseResponse {
     @SerializedName(ApiConstants.NAME) @Param(description="Event Type")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java b/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java
index 5f8e642..3afd516 100644
--- a/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java
@@ -18,9 +18,10 @@ package org.apache.cloudstack.api.response;
 
 import java.util.ArrayList;
 
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class ExceptionResponse extends BaseResponse {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java b/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java
index 30fe86f..50f5233 100644
--- a/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java
@@ -17,9 +17,9 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.response.NetworkDeviceResponse;
 
 public class ExternalFirewallResponse extends NetworkDeviceResponse {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java
index 6f80c10..5a323a7 100644
--- a/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java
@@ -17,9 +17,9 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.response.NetworkDeviceResponse;
 
 public class ExternalLoadBalancerResponse extends NetworkDeviceResponse {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ExtractResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ExtractResponse.java b/api/src/org/apache/cloudstack/api/response/ExtractResponse.java
index 5d415e9..f5595f9 100644
--- a/api/src/org/apache/cloudstack/api/response/ExtractResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ExtractResponse.java
@@ -19,9 +19,10 @@ package org.apache.cloudstack.api.response;
 import java.util.Date;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class ExtractResponse extends BaseResponse {
     @SerializedName(ApiConstants.ID) @Param(description="the id of extracted object")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
index 2799256..f4c777b 100644
--- a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
@@ -19,9 +19,10 @@ package org.apache.cloudstack.api.response;
 import java.util.List;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 @SuppressWarnings("unused")
 public class FirewallResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
index 0009658..08722ae 100644
--- a/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
 
 import java.util.List;
 
-import com.cloud.network.rules.FirewallRule;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.rules.FirewallRule;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=FirewallRule.class)
 @SuppressWarnings("unused")
 public class FirewallRuleResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java b/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
index 8147df3..56ced5b 100644
--- a/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
@@ -16,9 +16,10 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class GetVMPasswordResponse extends BaseResponse {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java b/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java
index a14ce59..eab6bba 100644
--- a/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java
@@ -16,13 +16,14 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
-import com.cloud.storage.GuestOsCategory;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.serializer.Param;
+import com.cloud.storage.GuestOsCategory;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=GuestOsCategory.class)
 public class GuestOSCategoryResponse extends BaseResponse {
     @SerializedName(ApiConstants.ID) @Param(description="the ID of the OS category")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java b/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java
index 0bc5dd2..af3aea9 100644
--- a/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java
@@ -16,13 +16,14 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
-import com.cloud.storage.GuestOS;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.serializer.Param;
+import com.cloud.storage.GuestOS;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=GuestOS.class)
 public class GuestOSResponse extends BaseResponse {
     @SerializedName(ApiConstants.ID) @Param(description="the ID of the OS type")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/HostResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/HostResponse.java b/api/src/org/apache/cloudstack/api/response/HostResponse.java
index 35b07dd..f5aa8f9 100644
--- a/api/src/org/apache/cloudstack/api/response/HostResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/HostResponse.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response;
 import java.util.Date;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+
 import com.cloud.host.Host;
 import com.cloud.host.Status;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
-import org.apache.cloudstack.api.EntityReference;
 
 @EntityReference(value=Host.class)
 public class HostResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java b/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
index 44e0513..3602187 100644
--- a/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
@@ -16,13 +16,14 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
-import com.cloud.hypervisor.HypervisorCapabilities;
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.hypervisor.HypervisorCapabilities;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
-import org.apache.cloudstack.api.EntityReference;
 
 @EntityReference(value=HypervisorCapabilities.class)
 public class HypervisorCapabilitiesResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java b/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java
index 3828539..8bfb15e 100644
--- a/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java
@@ -17,9 +17,10 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class HypervisorResponse extends BaseResponse {
     @SerializedName(ApiConstants.NAME) @Param(description="Hypervisor name")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java b/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java
index 4d18aef..251b2dd 100644
--- a/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response;
 import java.util.Date;
 import java.util.List;
 
-import com.cloud.network.IpAddress;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.IpAddress;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=IpAddress.class)
 @SuppressWarnings("unused")
 public class IPAddressResponse extends BaseResponse implements ControlledEntityResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java b/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java
index 24706ab..b04f2b8 100644
--- a/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java
@@ -21,8 +21,9 @@ import java.util.Date;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
-import com.cloud.vm.InstanceGroup;
+
 import com.cloud.serializer.Param;
+import com.cloud.vm.InstanceGroup;
 import com.google.gson.annotations.SerializedName;
 
 @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java b/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java
index 93c86c3..d6a42f7 100644
--- a/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java
@@ -17,9 +17,10 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class IpForwardingRuleResponse extends BaseResponse {
     @SerializedName(ApiConstants.ID) @Param(description="the ID of the port forwarding rule")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java b/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java
index a667e50..14803d5 100644
--- a/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java
@@ -16,9 +16,10 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class IsoVmResponse extends BaseResponse {
     @SerializedName("id") @Param(description="the ISO ID")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java b/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java
index 0eb4d58..626d0ea 100644
--- a/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java
@@ -16,15 +16,16 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.network.rules.StickinessPolicy;
 import com.cloud.serializer.Param;
 import com.cloud.utils.Pair;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
-
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
 
 public class LBStickinessPolicyResponse extends BaseResponse {
     @SerializedName("id")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java b/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java
index 7887e7c..cd44aa7 100644
--- a/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java
@@ -16,14 +16,15 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
-import com.cloud.network.rules.StickinessPolicy;
+import java.util.List;
+
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
-import java.util.List;
+import com.cloud.network.rules.StickinessPolicy;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
 
 @EntityReference(value=StickinessPolicy.class)
 public class LBStickinessResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/LDAPConfigResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/LDAPConfigResponse.java b/api/src/org/apache/cloudstack/api/response/LDAPConfigResponse.java
index e851e38..aa10229 100644
--- a/api/src/org/apache/cloudstack/api/response/LDAPConfigResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/LDAPConfigResponse.java
@@ -17,9 +17,10 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class LDAPConfigResponse  extends BaseResponse {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java
index bd5efdb..79b01b1 100644
--- a/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java
@@ -19,9 +19,10 @@ package org.apache.cloudstack.api.response;
 import java.util.List;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 @SuppressWarnings("unused")
 public class LoadBalancerResponse extends BaseResponse implements ControlledEntityResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java
index e16a1a5..b45b43c 100644
--- a/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java
@@ -19,9 +19,10 @@ package org.apache.cloudstack.api.response;
 import java.util.List;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 @SuppressWarnings("unused")
 public class NetworkACLResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java
index dc67b53..8eb3987 100644
--- a/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java
@@ -17,9 +17,10 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class NetworkDeviceResponse extends BaseResponse {
     @SerializedName(ApiConstants.ID)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
index 5c14791..aad593c 100644
--- a/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response;
 import java.util.Date;
 import java.util.List;
 
-import com.cloud.offering.NetworkOffering;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.offering.NetworkOffering;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=NetworkOffering.class)
 @SuppressWarnings("unused")
 public class NetworkOfferingResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
index 64cc953..4c29f98 100644
--- a/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
@@ -18,10 +18,11 @@ package org.apache.cloudstack.api.response;
 
 import java.util.List;
 
-import com.cloud.network.Network;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
+
+import com.cloud.network.Network;
 import com.cloud.projects.ProjectAccount;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/NicResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NicResponse.java b/api/src/org/apache/cloudstack/api/response/NicResponse.java
index a6ca5b8..bfc488d 100644
--- a/api/src/org/apache/cloudstack/api/response/NicResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NicResponse.java
@@ -17,9 +17,10 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 @SuppressWarnings("unused")
 public class NicResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java b/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java
index 78257b1..1f93b46 100644
--- a/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
 
 import java.util.List;
 
-import com.cloud.network.PhysicalNetwork;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.PhysicalNetwork;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=PhysicalNetwork.class)
 @SuppressWarnings("unused")
 public class PhysicalNetworkResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/PodResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/PodResponse.java b/api/src/org/apache/cloudstack/api/response/PodResponse.java
index 7119279..f31c289 100644
--- a/api/src/org/apache/cloudstack/api/response/PodResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/PodResponse.java
@@ -19,12 +19,12 @@ package org.apache.cloudstack.api.response;
 import java.util.List;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
 import com.cloud.dc.Pod;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 @EntityReference(value = Pod.class)
 public class PodResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java b/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java
index 37c96ff..4123477 100644
--- a/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java
@@ -15,13 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 package org.apache.cloudstack.api.response;
-import com.cloud.network.vpc.VpcGateway;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.vpc.VpcGateway;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=VpcGateway.class)
 @SuppressWarnings("unused")
 public class PrivateGatewayResponse extends BaseResponse implements ControlledEntityResponse{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java b/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java
index 134841c..cb69ee5 100644
--- a/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
 
 import java.util.List;
 
-import com.cloud.projects.ProjectAccount;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.projects.ProjectAccount;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=ProjectAccount.class)
 @SuppressWarnings("unused")
 public class ProjectAccountResponse extends BaseResponse implements ControlledViewEntityResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java b/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java
index 0c9ce68..1ece690 100644
--- a/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java
@@ -16,13 +16,14 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
-import com.cloud.projects.ProjectInvitation;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.projects.ProjectInvitation;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=ProjectInvitation.class)
 @SuppressWarnings("unused")
 public class ProjectInvitationResponse extends BaseResponse implements ControlledViewEntityResponse{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ProjectResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ProjectResponse.java b/api/src/org/apache/cloudstack/api/response/ProjectResponse.java
index 7ecda23..cff27e5 100644
--- a/api/src/org/apache/cloudstack/api/response/ProjectResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ProjectResponse.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.cloud.projects.Project;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.projects.Project;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=Project.class)
 @SuppressWarnings("unused")
 public class ProjectResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ProviderResponse.java b/api/src/org/apache/cloudstack/api/response/ProviderResponse.java
index b83c234..fd09949 100644
--- a/api/src/org/apache/cloudstack/api/response/ProviderResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ProviderResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
 
 import java.util.List;
 
-import com.cloud.network.PhysicalNetworkServiceProvider;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.PhysicalNetworkServiceProvider;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=PhysicalNetworkServiceProvider.class)
 @SuppressWarnings("unused")
 public class ProviderResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/RegisterResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/RegisterResponse.java b/api/src/org/apache/cloudstack/api/response/RegisterResponse.java
index eee9249..c2bd2b5 100644
--- a/api/src/org/apache/cloudstack/api/response/RegisterResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/RegisterResponse.java
@@ -16,9 +16,10 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class RegisterResponse extends BaseResponse {
     @SerializedName("apikey") @Param(description="the api key of the registered user")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
index 3fd7d7a..7db5663 100644
--- a/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
@@ -16,13 +16,14 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
-import com.cloud.network.RemoteAccessVpn;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.RemoteAccessVpn;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=RemoteAccessVpn.class)
 @SuppressWarnings("unused")
 public class RemoteAccessVpnResponse extends BaseResponse implements ControlledEntityResponse{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java
index 7a29194..9d4f6c5 100644
--- a/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java
@@ -17,9 +17,10 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 @SuppressWarnings("unused")
 public class ResourceCountResponse extends BaseResponse implements ControlledEntityResponse{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java
index c01e12f..beead24 100644
--- a/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java
@@ -16,13 +16,14 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
-import com.cloud.configuration.ResourceLimit;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.configuration.ResourceLimit;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value = ResourceLimit.class)
 @SuppressWarnings("unused")
 public class ResourceLimitResponse extends BaseResponse implements ControlledEntityResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
index 30bcbfd..47b0625 100644
--- a/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
@@ -17,9 +17,10 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 @SuppressWarnings("unused")
 public class ResourceTagResponse extends BaseResponse implements ControlledViewEntityResponse{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/S3Response.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/S3Response.java b/api/src/org/apache/cloudstack/api/response/S3Response.java
index 4dab217..259a308 100644
--- a/api/src/org/apache/cloudstack/api/response/S3Response.java
+++ b/api/src/org/apache/cloudstack/api/response/S3Response.java
@@ -18,11 +18,20 @@
  */
 package org.apache.cloudstack.api.response;
 
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
+import static org.apache.cloudstack.api.ApiConstants.ID;
+import static org.apache.cloudstack.api.ApiConstants.S3_ACCESS_KEY;
+import static org.apache.cloudstack.api.ApiConstants.S3_BUCKET_NAME;
+import static org.apache.cloudstack.api.ApiConstants.S3_CONNECTION_TIMEOUT;
+import static org.apache.cloudstack.api.ApiConstants.S3_END_POINT;
+import static org.apache.cloudstack.api.ApiConstants.S3_HTTPS_FLAG;
+import static org.apache.cloudstack.api.ApiConstants.S3_MAX_ERROR_RETRY;
+import static org.apache.cloudstack.api.ApiConstants.S3_SECRET_KEY;
+import static org.apache.cloudstack.api.ApiConstants.S3_SOCKET_TIMEOUT;
+
 import org.apache.cloudstack.api.BaseResponse;
 
-import static org.apache.cloudstack.api.ApiConstants.*;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
 
 public class S3Response extends BaseResponse {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java b/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
index 6066363..2791853 100644
--- a/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
@@ -17,9 +17,10 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class SSHKeyPairResponse extends BaseResponse {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java b/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java
index f3b9beb..1130ec0 100644
--- a/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java
@@ -22,6 +22,7 @@ import java.util.Set;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
+
 import com.cloud.network.security.SecurityGroup;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java b/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java
index 19aaa45..5aeee6f 100644
--- a/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java
@@ -17,11 +17,12 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
+
 import com.cloud.network.security.SecurityGroupRules;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 @EntityReference(value = SecurityGroupRules.class)
 public class SecurityGroupRuleResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
index 7a10f7f..f35e87e 100644
--- a/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
 
 import java.util.Date;
 
-import com.cloud.offering.ServiceOffering;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.offering.ServiceOffering;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value = ServiceOffering.class)
 public class ServiceOfferingResponse extends BaseResponse {
     @SerializedName("id") @Param(description="the id of the service offering")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ServiceResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ServiceResponse.java b/api/src/org/apache/cloudstack/api/response/ServiceResponse.java
index 11f7d71..445afcf 100644
--- a/api/src/org/apache/cloudstack/api/response/ServiceResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ServiceResponse.java
@@ -19,9 +19,10 @@ package org.apache.cloudstack.api.response;
 import java.util.List;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 @SuppressWarnings("unused")
 public class ServiceResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java b/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java
index d164580..dbaa451 100644
--- a/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
 
 import java.util.Date;
 
-import com.cloud.network.Site2SiteCustomerGateway;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.Site2SiteCustomerGateway;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=Site2SiteCustomerGateway.class)
 @SuppressWarnings("unused")
 public class Site2SiteCustomerGatewayResponse extends BaseResponse implements ControlledEntityResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 c398116..99075b5 100644
--- a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
 
 import java.util.Date;
 
-import com.cloud.network.Site2SiteVpnConnection;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.Site2SiteVpnConnection;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=Site2SiteVpnConnection.class)
 @SuppressWarnings("unused")
 public class Site2SiteVpnConnectionResponse extends BaseResponse implements ControlledEntityResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 8cb06fc..06dbf37 100644
--- a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
 
 import java.util.Date;
 
-import com.cloud.network.Site2SiteVpnGateway;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.Site2SiteVpnGateway;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=Site2SiteVpnGateway.class)
 @SuppressWarnings("unused")
 public class Site2SiteVpnGatewayResponse extends BaseResponse implements ControlledEntityResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 6bf77a0..2b7f9f4 100644
--- a/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
@@ -16,11 +16,12 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+
 import com.cloud.serializer.Param;
 import com.cloud.storage.snapshot.SnapshotPolicy;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
-import org.apache.cloudstack.api.EntityReference;
 
 @EntityReference(value=SnapshotPolicy.class)
 public class SnapshotPolicyResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 8ea0d7f..9b5f8c1 100644
--- a/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
@@ -20,11 +20,12 @@ import java.util.Date;
 import java.util.List;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+
 import com.cloud.serializer.Param;
 import com.cloud.storage.Snapshot;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
-import org.apache.cloudstack.api.EntityReference;
 
 @EntityReference(value=Snapshot.class)
 @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 19bb189..a25d02f 100644
--- a/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java
@@ -18,9 +18,10 @@ package org.apache.cloudstack.api.response;
 
 import java.util.Date;
 
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class SnapshotScheduleResponse extends BaseResponse {
     @SerializedName("id") @Param(description="the ID of the snapshot schedule")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 e7383e3..9001252 100644
--- a/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
 
 import java.util.List;
 
-import com.cloud.network.vpc.StaticRoute;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.vpc.StaticRoute;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=StaticRoute.class)
 @SuppressWarnings("unused")
 public class StaticRouteResponse extends BaseResponse implements ControlledEntityResponse{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 ffe7c7c..28776b7 100644
--- a/api/src/org/apache/cloudstack/api/response/StatusResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StatusResponse.java
@@ -16,9 +16,10 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 
+import com.google.gson.annotations.SerializedName;
+
 public class StatusResponse extends BaseResponse {
     @SerializedName("status")
     private Boolean status;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 328180f..c72d1e2 100644
--- a/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java
@@ -16,13 +16,14 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
-import com.cloud.dc.StorageNetworkIpRange;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.dc.StorageNetworkIpRange;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=StorageNetworkIpRange.class)
 public class StorageNetworkIpRangeResponse extends BaseResponse {
     @SerializedName(ApiConstants.ID) @Param(description="the uuid of storage network IP range.")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 7afce71..66dde36 100644
--- a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
 
 import java.util.Date;
 
-import com.cloud.storage.StoragePool;
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+
 import com.cloud.serializer.Param;
+import com.cloud.storage.StoragePool;
 import com.cloud.storage.StoragePoolStatus;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
-import org.apache.cloudstack.api.EntityReference;
 
 @EntityReference(value=StoragePool.class)
 public class StoragePoolResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 47c65b6..8647d19 100644
--- a/api/src/org/apache/cloudstack/api/response/SuccessResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SuccessResponse.java
@@ -16,9 +16,10 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class SuccessResponse extends BaseResponse {
      @SerializedName("success") @Param(description="true if operation is executed successfully")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/SwiftResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SwiftResponse.java b/api/src/org/apache/cloudstack/api/response/SwiftResponse.java
index 83fceb3..08b2609 100644
--- a/api/src/org/apache/cloudstack/api/response/SwiftResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SwiftResponse.java
@@ -19,9 +19,10 @@ package org.apache.cloudstack.api.response;
 import java.util.Date;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class SwiftResponse extends BaseResponse {
     @SerializedName(ApiConstants.ID)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 48df854..43411c7 100644
--- a/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
@@ -16,9 +16,10 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 /*
  * This is the generic response for all types of System VMs (SSVM, consoleproxy, domain routers(router, LB, DHCP))

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 8b0f80b..8d2798a 100644
--- a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
 
 import java.util.Date;
 
-import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.serializer.Param;
+import com.cloud.vm.VirtualMachine;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=VirtualMachine.class)
 public class SystemVmResponse extends BaseResponse {
     @SerializedName("id") @Param(description="the ID of the system VM")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 f1e08e3..c4b10ab 100644
--- a/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
@@ -18,13 +18,14 @@ package org.apache.cloudstack.api.response;
 
 import java.util.List;
 
-import com.cloud.template.VirtualMachineTemplate;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.serializer.Param;
+import com.cloud.template.VirtualMachineTemplate;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=VirtualMachineTemplate.class)
 @SuppressWarnings("unused")
 public class TemplatePermissionsResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 033c2e2..ed933ff 100644
--- a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
@@ -20,13 +20,14 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import com.cloud.template.VirtualMachineTemplate;
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+
 import com.cloud.serializer.Param;
 import com.cloud.storage.Storage.ImageFormat;
+import com.cloud.template.VirtualMachineTemplate;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
-import org.apache.cloudstack.api.EntityReference;
 
 @EntityReference(value=VirtualMachineTemplate.class)
 @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 366e5d6..7e0646e 100644
--- a/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java
@@ -18,6 +18,7 @@ package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 30adc3d..56beca5 100644
--- a/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
@@ -17,9 +17,10 @@
 package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class TrafficTypeImplementorResponse extends BaseResponse {
      @SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="network traffic type")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 43760f2..494048e 100644
--- a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
@@ -16,13 +16,14 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
-import com.cloud.network.PhysicalNetworkTrafficType;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.PhysicalNetworkTrafficType;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=PhysicalNetworkTrafficType.class)
 public class TrafficTypeResponse extends BaseResponse {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 767f783..544a9bb 100644
--- a/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java
@@ -19,9 +19,10 @@ package org.apache.cloudstack.api.response;
 import java.util.Date;
 
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
-import org.apache.cloudstack.api.BaseResponse;
 
 public class UpgradeVmResponse extends BaseResponse {
     @SerializedName("id")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 9679575..4b355cb 100644
--- a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
@@ -18,7 +18,7 @@ package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
-import org.apache.cloudstack.api.response.ControlledEntityResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/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 b21d26f..3dbb27a 100644
--- a/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java
@@ -18,6 +18,7 @@ package org.apache.cloudstack.api.response;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/UserResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UserResponse.java b/api/src/org/apache/cloudstack/api/response/UserResponse.java
index 9ab6248..9cd25cb 100644
--- a/api/src/org/apache/cloudstack/api/response/UserResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UserResponse.java
@@ -18,13 +18,13 @@ package org.apache.cloudstack.api.response;
 
 import java.util.Date;
 
-import com.google.gson.annotations.SerializedName;
-import com.cloud.serializer.Param;
-import com.cloud.user.User;
-
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.serializer.Param;
+import com.cloud.user.User;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value = User.class)
 public class UserResponse extends BaseResponse {
     @SerializedName("id") @Param(description="the user ID")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
index 5450bfb..cb2113e 100644
--- a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
@@ -20,13 +20,14 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.cloud.network.router.VirtualRouter;
-import com.cloud.uservm.UserVm;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
-import com.cloud.vm.VirtualMachine;
+
+import com.cloud.network.router.VirtualRouter;
 import com.cloud.serializer.Param;
+import com.cloud.uservm.UserVm;
+import com.cloud.vm.VirtualMachine;
 import com.google.gson.annotations.SerializedName;
 
 @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java b/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
index dcb2322..92d9a1d 100644
--- a/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
@@ -16,13 +16,14 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
-import com.cloud.network.VirtualRouterProvider;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.VirtualRouterProvider;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=VirtualRouterProvider.class)
 public class VirtualRouterProviderResponse extends BaseResponse implements ControlledEntityResponse {
     @SerializedName(ApiConstants.ID) @Param(description="the id of the router")

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java b/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
index bfde739..3dc46f9 100644
--- a/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
@@ -16,13 +16,14 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
-import com.cloud.dc.Vlan;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.dc.Vlan;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=Vlan.class)
 @SuppressWarnings("unused")
 public class VlanIpRangeResponse extends BaseResponse implements ControlledEntityResponse{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
index d92153d..b10da0c 100644
--- a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
@@ -20,13 +20,14 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.cloud.storage.Volume;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.serializer.Param;
+import com.cloud.storage.Volume;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=Volume.class)
 @SuppressWarnings("unused")
 public class VolumeResponse extends BaseResponse implements ControlledViewEntityResponse{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
index 3e196fe..70120d1 100644
--- a/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response;
 import java.util.Date;
 import java.util.List;
 
-import com.cloud.network.vpc.VpcOffering;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.vpc.VpcOffering;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=VpcOffering.class)
 @SuppressWarnings("unused")
 public class VpcOfferingResponse extends BaseResponse {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/VpcResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VpcResponse.java b/api/src/org/apache/cloudstack/api/response/VpcResponse.java
index 94ea598..3dfd23b 100644
--- a/api/src/org/apache/cloudstack/api/response/VpcResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VpcResponse.java
@@ -19,13 +19,14 @@ package org.apache.cloudstack.api.response;
 import java.util.Date;
 import java.util.List;
 
-import com.cloud.network.vpc.Vpc;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.vpc.Vpc;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value=Vpc.class)
 @SuppressWarnings("unused")
 public class VpcResponse extends BaseResponse implements ControlledEntityResponse{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java b/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java
index 958c8b5..e654e8a 100644
--- a/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java
@@ -16,13 +16,14 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
-import com.cloud.network.VpnUser;
 import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.VpnUser;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value = VpnUser.class)
 @SuppressWarnings("unused")
 public class VpnUsersResponse extends BaseResponse implements ControlledEntityResponse{

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ZoneResponse.java b/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
index 72e0bb2..4ce4816 100644
--- a/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
@@ -21,6 +21,7 @@ import java.util.List;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
+
 import com.cloud.dc.DataCenter;
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe6f0457/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
index 426a3b5..bc22804 100644
--- a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
+++ b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
@@ -19,12 +19,13 @@ package org.apache.cloudstack.network;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.cloud.network.Network;
 import org.apache.cloudstack.api.command.admin.network.AddNetworkDeviceCmd;
 import org.apache.cloudstack.api.command.admin.network.DeleteNetworkDeviceCmd;
 import org.apache.cloudstack.api.command.admin.network.ListNetworkDeviceCmd;
-import com.cloud.host.Host;
 import org.apache.cloudstack.api.response.NetworkDeviceResponse;
+
+import com.cloud.host.Host;
+import com.cloud.network.Network;
 import com.cloud.utils.component.Manager;
 
 public interface ExternalNetworkDeviceManager extends Manager {