cleaning up imports, fixing up some compilation problems related to API refactoring

server/src/com/cloud/agent/manager/AgentManagerImpl.java

@@ -101,10 +101,10 @@ import com.cloud.exception.UnsupportedVersionException;
 import com.cloud.ha.HighAvailabilityManager;
 import com.cloud.host.DetailVO;
 import com.cloud.host.Host;
+import com.cloud.host.Host.Type;
 import com.cloud.host.HostStats;
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
-import com.cloud.host.Host.Type;
 import com.cloud.host.Status.Event;
 import com.cloud.host.dao.DetailsDao;
 import com.cloud.host.dao.HostDao;

server/src/com/cloud/agent/manager/ConnectedAgentAttache.java

@@ -18,10 +18,10 @@
 
 package com.cloud.agent.manager;
 
-import java.nio.channels.ClosedChannelException;
-
-import org.apache.log4j.Logger;
-
+import java.nio.channels.ClosedChannelException;
+
+import org.apache.log4j.Logger;
+
 import com.cloud.agent.transport.Request;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.host.Status;

server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java

@@ -34,8 +34,8 @@ import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.HostPodVO;
 import com.cloud.host.DetailVO;
 import com.cloud.host.Host;
-import com.cloud.host.HostVO;
 import com.cloud.host.Host.Type;
+import com.cloud.host.HostVO;
 import com.cloud.host.dao.DetailsDao;
 import com.cloud.host.dao.HostDao;
 import com.cloud.offering.ServiceOffering;

server/src/com/cloud/api/ApiServlet.java

@@ -161,12 +161,12 @@ public class ApiServlet extends HttpServlet {
             String userId = null;
 
             if (!isNew) {
-                userId = (String)session.getAttribute(BaseCmd.Properties.USER_ID.getName());
-                String account = (String)session.getAttribute(BaseCmd.Properties.ACCOUNT.getName());
-                String domainId = (String)session.getAttribute(BaseCmd.Properties.DOMAIN_ID.getName());
-                Object accountObj = session.getAttribute(BaseCmd.Properties.ACCOUNT_OBJ.getName());
-                String sessionKey = (String)session.getAttribute(BaseCmd.Properties.SESSION_KEY.getName());
-                String[] sessionKeyParam = (String[])params.get(BaseCmd.Properties.SESSION_KEY.getName());
+                userId = (String)session.getAttribute("userid");
+                String account = (String)session.getAttribute("account");
+                String domainId = (String)session.getAttribute("domainid");
+                Object accountObj = session.getAttribute("accountobj");
+                String sessionKey = (String)session.getAttribute("sessionkey");
+                String[] sessionKeyParam = (String[])params.get("sessionkey");
                 if ((sessionKeyParam == null) || (sessionKey == null) || !sessionKey.equals(sessionKeyParam[0])) {
                     session.invalidate();
                     resp.sendError(HttpServletResponse.SC_UNAUTHORIZED, "unable to verify user credentials");
@@ -275,7 +275,8 @@ public class ApiServlet extends HttpServlet {
             s_logger.error("unknown exception writing api response", ex);
         }
     }
-
+
+    @SuppressWarnings("rawtypes")
     private String getLoginSuccessResponse(HttpSession session, String responseType) {
         StringBuffer sb = new StringBuffer();
         int inactiveInterval = session.getMaxInactiveInterval();

server/src/com/cloud/api/BaseAsyncCmd.java

@@ -1,7 +1,6 @@
 package com.cloud.api;
 
 import com.cloud.serializer.SerializerHelper;
-import com.cloud.user.Account;
 
 /**
  * A base command for supporting asynchronous API calls.  When an API command is received, the command will be

server/src/com/cloud/api/BaseCmd.java

@@ -18,8 +18,6 @@
 
 package com.cloud.api;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;

server/src/com/cloud/api/commands/AddHostCmd.java

@@ -20,10 +20,8 @@ package com.cloud.api.commands;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.api.BaseCmd;
 import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
-import com.cloud.api.Parameter;
 
 @Implementation(method="discoverHosts", manager=Manager.AgentManager)
 public class AddHostCmd extends AddHostOrStorageCmd {

server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java

@@ -20,10 +20,8 @@ package com.cloud.api.commands;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.api.BaseCmd;
 import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
-import com.cloud.api.Parameter;
 
 @Implementation(method="discoverHosts", manager=Manager.AgentManager)
 public class AddSecondaryStorageCmd extends AddHostOrStorageCmd {

server/src/com/cloud/api/commands/CreateVolumeCmd.java

@@ -111,7 +111,7 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd {
 
         VolumeResponse response = new VolumeResponse();
         response.setId(volume.getId());
-        response.setName(param.getName());
+        response.setName(volume.getName());
         response.setVolumeType(volume.getVolumeType().toString());
         response.setSize(volume.getSize());
         response.setCreated(volume.getCreated());

server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="deleteIpForwardingRule", manager=Manager.NetworkManager)
 public class DeleteIPForwardingRuleCmd extends BaseCmd {

server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="deleteLoadBalancerRule", manager=Manager.NetworkManager)
 public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/DeletePortForwardingServiceCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="deleteSecurityGroup", manager=Manager.ManagementServer)
 public class DeletePortForwardingServiceCmd extends BaseCmd {

server/src/com/cloud/api/commands/DeletePortForwardingServiceRuleCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="deleteNetworkRuleConfig", manager=Manager.NetworkManager)
 public class DeletePortForwardingServiceRuleCmd extends BaseCmd {

server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="deleteServiceOffering", manager=Manager.ConfigManager)
 public class DeleteServiceOfferingCmd extends BaseCmd{

server/src/com/cloud/api/commands/DeleteSnapshotCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="deleteSnapshot", manager=Manager.SnapshotManager)
 public class DeleteSnapshotCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java

@@ -23,9 +23,9 @@ import java.util.List;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="deleteSnapshotPolicies", manager=Manager.SnapshotManager)
 public class DeleteSnapshotPoliciesCmd extends BaseCmd {

server/src/com/cloud/api/commands/DeleteTemplateCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="deleteTemplate", manager=Manager.TemplateManager)
 public class DeleteTemplateCmd extends BaseCmd {

server/src/com/cloud/api/commands/DeleteUserCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="deleteUser", manager=Manager.ManagementServer)
 public class DeleteUserCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="deleteVlanIpRange", manager=Manager.ConfigManager)
 public class DeleteVlanIpRangeCmd extends BaseCmd {

server/src/com/cloud/api/commands/DeleteVolumeCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="deleteVolume", manager=Manager.StorageManager)
 public class DeleteVolumeCmd extends BaseCmd {

server/src/com/cloud/api/commands/DeleteZoneCmd.java

@@ -18,20 +18,12 @@
 
 package com.cloud.api.commands;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.ServerApiException;
-import com.cloud.api.BaseCmd.Manager;
-import com.cloud.dc.DataCenterVO;
-import com.cloud.user.User;
-import com.cloud.utils.Pair;
 
 @Implementation(method="deleteZone", manager=Manager.ConfigManager)
 public class DeleteZoneCmd extends BaseCmd {

server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="destroyConsoleProxy", manager=Manager.ConsoleProxyManager)
 public class DestroyConsoleProxyCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/DestroyVMCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="destroyVm", manager=Manager.UserVmManager)
 public class DestroyVMCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/DetachIsoCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="detachIso", manager=Manager.TemplateManager)
 public class DetachIsoCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/DetachVolumeCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="detachVolumeFromVM", manager=Manager.UserVmManager)
 public class DetachVolumeCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="disassociateIpAddress", manager=Manager.NetworkManager)
 public class DisassociateIPAddrCmd extends BaseCmd {

server/src/com/cloud/api/commands/EnableUserCmd.java

@@ -18,15 +18,12 @@
 
 package com.cloud.api.commands;
 
-import java.util.List;
-
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
 import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.utils.Pair;
 
 @Implementation(method="enableUser", manager=Manager.ManagementServer)
 public class EnableUserCmd extends BaseCmd {

server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java

@@ -18,15 +18,12 @@
 
 package com.cloud.api.commands;
 
-import java.util.List;
-
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
 import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.utils.Pair;
 
 @Implementation(method="getCloudIdentifierResponse", manager=Manager.ManagementServer)
 public class GetCloudIdentifierCmd extends BaseCmd {

server/src/com/cloud/api/commands/ListCapacityCmd.java

@@ -29,18 +29,15 @@ import java.util.StringTokenizer;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.api.BaseCmd;
 import com.cloud.api.BaseListCmd;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.ServerApiException;
 import com.cloud.api.response.CapacityResponse;
 import com.cloud.capacity.CapacityVO;
 import com.cloud.serializer.SerializerHelper;
 import com.cloud.server.Criteria;
 import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.storage.StoragePoolVO;
-import com.cloud.utils.Pair;
 
 @Implementation(method="listCapacities")
 public class ListCapacityCmd extends BaseListCmd {

server/src/com/cloud/api/commands/ListHostsCmd.java

@@ -27,7 +27,6 @@ import java.util.Set;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.api.BaseCmd;
 import com.cloud.api.BaseListCmd;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
@@ -40,7 +39,6 @@ import com.cloud.host.Status.Event;
 import com.cloud.offering.ServiceOffering;
 import com.cloud.serializer.SerializerHelper;
 import com.cloud.storage.GuestOSCategoryVO;
-import com.cloud.utils.Pair;
 import com.cloud.vm.UserVmVO;
 
 @Implementation(method="searchForServers")

server/src/com/cloud/api/commands/ListIsoPermissionsCmd.java

@@ -2,8 +2,8 @@ package com.cloud.api.commands;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.Storage.ImageFormat;
+import com.cloud.storage.VMTemplateVO;
 
 public class ListIsoPermissionsCmd extends ListTemplateOrIsoPermissionsCmd {
 	protected String getResponseName() {

server/src/com/cloud/api/commands/ListIsosCmd.java

@@ -25,15 +25,12 @@ import java.util.Map;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.api.BaseCmd;
 import com.cloud.api.BaseListCmd;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.ServerApiException;
 import com.cloud.api.response.TemplateResponse;
 import com.cloud.async.AsyncJobVO;
 import com.cloud.dc.DataCenterVO;
-import com.cloud.domain.DomainVO;
 import com.cloud.host.HostVO;
 import com.cloud.serializer.SerializerHelper;
 import com.cloud.storage.GuestOS;
@@ -43,7 +40,6 @@ import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.dao.VMTemplateDao.TemplateFilter;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
-import com.cloud.utils.Pair;
 
 @Implementation(method="listTemplates")
 public class ListIsosCmd extends BaseListCmd {

server/src/com/cloud/api/commands/ListRoutersCmd.java

@@ -20,22 +20,16 @@ package com.cloud.api.commands;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.api.BaseCmd;
 import com.cloud.api.BaseListCmd;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.ServerApiException;
 import com.cloud.api.response.DomainRouterResponse;
 import com.cloud.async.AsyncJobVO;
-import com.cloud.domain.DomainVO;
 import com.cloud.serializer.SerializerHelper;
-import com.cloud.server.Criteria;
 import com.cloud.user.Account;
-import com.cloud.utils.Pair;
 import com.cloud.vm.DomainRouterVO;
 
 @Implementation(method="searchForRouters")

server/src/com/cloud/api/commands/LockAccountCmd.java

@@ -20,9 +20,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="lockAccount", manager=Manager.ManagementServer)
 public class LockAccountCmd extends BaseCmd {

server/src/com/cloud/api/commands/LockUserCmd.java

@@ -20,9 +20,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="lockUser", manager=Manager.ManagementServer)
 public class LockUserCmd extends BaseCmd {

server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="maintain", manager=Manager.AgentManager)
 public class PrepareForMaintenanceCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="preparePrimaryStorageForMaintenance", manager=Manager.StorageManager)
 public class PreparePrimaryStorageForMaintenanceCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/RebootSystemVmCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="rebootSystemVM", manager=Manager.ManagementServer)
 public class RebootSystemVmCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/RebootVMCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="rebootVirtualMachine", manager=Manager.UserVmManager)
 public class RebootVMCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/ReconnectHostCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="reconnectHost", manager=Manager.AgentManager)
 public class ReconnectHostCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/RecoverVMCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="recoverVirtualMachine", manager=Manager.UserVmManager)
 public class RecoverVMCmd extends BaseCmd {

server/src/com/cloud/api/commands/RegisterCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="createApiKeyAndSecretKey", manager=Manager.ManagementServer)
 public class RegisterCmd extends BaseCmd {

server/src/com/cloud/api/commands/RegisterIsoCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="registerIso", manager=Manager.TemplateManager)
 public class RegisterIsoCmd extends BaseCmd {

server/src/com/cloud/api/commands/RegisterTemplateCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="registerTemplate", manager=Manager.TemplateManager)
 public class RegisterTemplateCmd extends BaseCmd {

server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java

@@ -23,9 +23,9 @@ import java.util.List;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="removeFromLoadBalancer", manager=Manager.NetworkManager)
 public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/RemovePortForwardingServiceCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="removeSecurityGroup", manager=Manager.ManagementServer)
 public class RemovePortForwardingServiceCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/ResetVMPasswordCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="resetVMPassword", manager=Manager.UserVmManager)
 public class ResetVMPasswordCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java

@@ -5,9 +5,9 @@ import java.util.Map;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="revokeNetworkGroupIngress", manager=Manager.NetworkGroupManager)
 public class RevokeNetworkGroupIngressCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/StartSystemVMCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="stopSystemVM", manager=Manager.ManagementServer)
 public class StartSystemVMCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/StartVMCmd.java

@@ -18,22 +18,13 @@
 
 package com.cloud.api.commands;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.log4j.Logger;
 
 import com.cloud.api.ApiConstants;
 import com.cloud.api.BaseAsyncCmd;
-import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.ServerApiException;
-import com.cloud.api.BaseCmd.Manager;
-import com.cloud.user.Account;
-import com.cloud.utils.Pair;
-import com.cloud.vm.UserVmVO;
 
 @Implementation(method="startVirtualMachine", manager=Manager.UserVmManager)
 public class StartVMCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/StopRouterCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 
 @Implementation(method="stopRouter", manager=Manager.NetworkManager)

server/src/com/cloud/api/commands/StopSystemVmCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="stopSystemVM", manager=Manager.ManagementServer)
 public class StopSystemVmCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/StopVMCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseAsyncCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="stopVirtualMachine", manager=Manager.UserVmManager)
 public class StopVMCmd extends BaseAsyncCmd {

server/src/com/cloud/api/commands/UpdateIsoCmd.java

@@ -20,10 +20,8 @@ package com.cloud.api.commands;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.api.BaseCmd;
 import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
-import com.cloud.api.Parameter;
 
 @Implementation(method="updateTemplate", manager=Manager.ManagementServer)
 public class UpdateIsoCmd extends UpdateTemplateOrIsoCmd {

server/src/com/cloud/api/commands/UpdateIsoPermissionsCmd.java

@@ -2,8 +2,8 @@ package com.cloud.api.commands;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.api.Implementation;
 import com.cloud.api.BaseCmd.Manager;
+import com.cloud.api.Implementation;
 
 @Implementation(method="updateTemplatePermissions", manager=Manager.ManagementServer)
 public class UpdateIsoPermissionsCmd extends UpdateTemplateOrIsoPermissionsCmd {

server/src/com/cloud/api/commands/UpdatePodCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="editPod", manager=Manager.ConfigManager)
 public class UpdatePodCmd extends BaseCmd {

server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java

@@ -18,24 +18,12 @@
 
 package com.cloud.api.commands;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.ServerApiException;
-import com.cloud.api.BaseCmd.Manager;
-import com.cloud.configuration.ResourceCount.ResourceType;
-import com.cloud.configuration.ResourceLimitVO;
-import com.cloud.domain.DomainVO;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.server.Criteria;
-import com.cloud.user.Account;
-import com.cloud.utils.Pair;
 
 @Implementation(method="updateResourceLimit", manager=Manager.AccountManager)
 public class UpdateResourceLimitCmd extends BaseCmd {

server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="updateServiceOffering", manager=Manager.ConfigManager)
 public class UpdateServiceOfferingCmd extends BaseCmd

server/src/com/cloud/api/commands/UpdateStoragePoolCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="updateStoragePool", manager=Manager.StorageManager)
 public class UpdateStoragePoolCmd extends BaseCmd {

server/src/com/cloud/api/commands/UpdateTemplateCmd.java

@@ -20,10 +20,8 @@ package com.cloud.api.commands;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.api.BaseCmd;
 import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
-import com.cloud.api.Parameter;
 
 @Implementation(method="updateTemplate", manager=Manager.ManagementServer)
 public class UpdateTemplateCmd extends UpdateTemplateOrIsoCmd {

server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java

@@ -5,9 +5,9 @@ import java.util.List;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 
 @Implementation(method="updateTemplatePermissions", manager=Manager.ManagementServer)
 public abstract class UpdateTemplateOrIsoPermissionsCmd extends BaseCmd {

server/src/com/cloud/api/commands/UpdateTemplatePermissionsCmd.java

@@ -20,8 +20,8 @@ package com.cloud.api.commands;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.api.Implementation;
 import com.cloud.api.BaseCmd.Manager;
+import com.cloud.api.Implementation;
 
 @Implementation(method="updateTemplatePermissions", manager=Manager.ManagementServer)
 public class UpdateTemplatePermissionsCmd extends UpdateTemplateOrIsoPermissionsCmd {

server/src/com/cloud/api/commands/UpdateVMCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.response.UpgradeVmResponse;
 import com.cloud.vm.UserVmVO;
 

server/src/com/cloud/api/commands/UpdateZoneCmd.java

@@ -21,10 +21,10 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
 import com.cloud.api.ServerApiException;
-import com.cloud.api.BaseCmd.Manager;
 import com.cloud.dc.DataCenterVO;
 import com.cloud.serializer.Param;
 import com.cloud.serializer.SerializerHelper;

server/src/com/cloud/api/commands/UpgradeVMCmd.java

@@ -21,9 +21,9 @@ package com.cloud.api.commands;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.BaseCmd.Manager;
 import com.cloud.api.response.UpgradeVmResponse;
 import com.cloud.vm.UserVmVO;
 

server/src/com/cloud/async/AsyncJobExecutor.java

@@ -18,8 +18,6 @@
 
 package com.cloud.async;
 
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.SyncQueueItemVO;
 
 public interface AsyncJobExecutor {
 	public AsyncJobManager getAsyncJobMgr();

server/src/com/cloud/async/AsyncJobManager.java

@@ -18,8 +18,6 @@
 
 package com.cloud.async;
 
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
 import com.cloud.utils.component.Manager;
 
 public interface AsyncJobManager extends Manager {

server/src/com/cloud/async/BaseAsyncJobExecutor.java

@@ -18,8 +18,6 @@
 
 package com.cloud.async;
 
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.SyncQueueItemVO;
 
 public abstract class BaseAsyncJobExecutor implements AsyncJobExecutor {
 	private SyncQueueItemVO _syncSource;

server/src/com/cloud/async/SyncQueueManager.java

@@ -18,10 +18,8 @@
 
 package com.cloud.async;
 
-import java.util.List;
-
-import com.cloud.async.SyncQueueItemVO;
-import com.cloud.async.SyncQueueVO;
+import java.util.List;
+
 import com.cloud.utils.component.Manager;
 
 public interface SyncQueueManager extends Manager {

server/src/com/cloud/async/SyncQueueManagerImpl.java

@@ -18,25 +18,23 @@
 
 package com.cloud.async;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import javax.ejb.Local;
-import javax.naming.ConfigurationException;
-import com.cloud.utils.exception.CloudRuntimeException;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.async.SyncQueueItemVO;
-import com.cloud.async.SyncQueueVO;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.ejb.Local;
+import javax.naming.ConfigurationException;
+
+import org.apache.log4j.Logger;
+
 import com.cloud.async.dao.SyncQueueDao;
 import com.cloud.async.dao.SyncQueueItemDao;
 import com.cloud.utils.DateUtil;
 import com.cloud.utils.component.ComponentLocator;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.Transaction;
+import com.cloud.utils.exception.CloudRuntimeException;
 
 @Local(value={SyncQueueManager.class})
 public class SyncQueueManagerImpl implements SyncQueueManager {

server/src/com/cloud/async/executor/AssignSecurityGroupExecutor.java

@@ -18,8 +18,8 @@
 
 package com.cloud.async.executor;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobResult;
@@ -35,7 +35,7 @@ import com.cloud.vm.DomainRouterVO;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.dao.DomainRouterDao;
 import com.cloud.vm.dao.UserVmDao;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class AssignSecurityGroupExecutor extends BaseAsyncJobExecutor {
     public static final Logger s_logger = Logger.getLogger(AssignSecurityGroupExecutor.class.getName());

server/src/com/cloud/async/executor/AssignToLoadBalancerExecutor.java

@@ -21,13 +21,13 @@ package com.cloud.async.executor;
 import java.lang.reflect.Type;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobVO;
 import com.cloud.async.BaseAsyncJobExecutor;
 import com.cloud.serializer.GsonHelper;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
 public class AssignToLoadBalancerExecutor extends BaseAsyncJobExecutor {

server/src/com/cloud/async/executor/CompleteMaintenanceExecutor.java

@@ -37,9 +37,7 @@ import com.cloud.offering.ServiceOffering;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
 import com.cloud.storage.GuestOSCategoryVO;
-import com.cloud.utils.NumbersUtil;
 import com.cloud.vm.UserVmVO;
-//import com.cloud.vm.HostStats;
 import com.google.gson.Gson;
 
 public class CompleteMaintenanceExecutor extends BaseAsyncJobExecutor {

server/src/com/cloud/async/executor/ConsoleProxyOperationResultObject.java

@@ -18,8 +18,8 @@
 
 package com.cloud.async.executor;
 
-import java.util.Date;
-
+import java.util.Date;
+
 import com.cloud.serializer.Param;
 
 public class ConsoleProxyOperationResultObject {

server/src/com/cloud/async/executor/CopyTemplateExecutor.java

@@ -31,10 +31,9 @@ import com.cloud.domain.DomainVO;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
 import com.cloud.storage.VMTemplateHostVO;
-import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
+import com.cloud.storage.VMTemplateVO;
 import com.cloud.user.Account;
-import com.cloud.utils.Pair;
 import com.google.gson.Gson;
 
 public class CopyTemplateExecutor extends BaseAsyncJobExecutor {

server/src/com/cloud/async/executor/CopyTemplateResultObject.java

@@ -20,8 +20,6 @@ package com.cloud.async.executor;
 
 import java.util.Date;
 
-import javax.persistence.Column;
-
 import com.cloud.serializer.Param;
 import com.cloud.storage.Storage.ImageFormat;
 

server/src/com/cloud/async/executor/CreateOrUpdateRuleExecutor.java

@@ -18,8 +18,8 @@
 
 package com.cloud.async.executor;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobResult;
@@ -32,7 +32,7 @@ import com.cloud.exception.PermissionDeniedException;
 import com.cloud.network.NetworkRuleConfigVO;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class CreateOrUpdateRuleExecutor extends BaseAsyncJobExecutor {
     public static final Logger s_logger = Logger.getLogger(CreateOrUpdateRuleExecutor.class.getName());

server/src/com/cloud/async/executor/CreatePrivateTemplateExecutor.java

@@ -30,16 +30,14 @@ import com.cloud.dc.DataCenterVO;
 import com.cloud.event.EventTypes;
 import com.cloud.event.EventVO;
 import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.host.HostVO;
-import com.cloud.host.Status.Event;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
 import com.cloud.storage.GuestOS;
 import com.cloud.storage.Snapshot;
 import com.cloud.storage.VMTemplateHostVO;
+import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
 import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.VolumeVO;
-import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
 import com.cloud.user.AccountVO;

server/src/com/cloud/async/executor/CreatePrivateTemplateResultObject.java

@@ -18,10 +18,8 @@
 
 package com.cloud.async.executor;
 
-import java.util.Date;
+import java.util.Date;
 
-import javax.persistence.Column;
-
 import com.cloud.serializer.Param;
 
 public class CreatePrivateTemplateResultObject {

server/src/com/cloud/async/executor/CreateSnapshotExecutor.java

@@ -30,9 +30,9 @@ import com.cloud.async.BaseAsyncJobExecutor;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
 import com.cloud.storage.Snapshot;
+import com.cloud.storage.Snapshot.SnapshotType;
 import com.cloud.storage.SnapshotVO;
 import com.cloud.storage.VolumeVO;
-import com.cloud.storage.Snapshot.SnapshotType;
 import com.cloud.storage.snapshot.SnapshotManager;
 import com.cloud.user.Account;
 import com.google.gson.Gson;

server/src/com/cloud/async/executor/CreateSnapshotResultObject.java

@@ -19,9 +19,9 @@
 package com.cloud.async.executor;
 
 import java.util.Date;
-import com.cloud.storage.Volume.VolumeType;
-
+
 import com.cloud.serializer.Param;
+import com.cloud.storage.Volume.VolumeType;
 
 public class CreateSnapshotResultObject {
 	

server/src/com/cloud/async/executor/CreateVolumeFromSnapshotExecutor.java

@@ -35,7 +35,6 @@ import com.cloud.server.ManagementServer;
 import com.cloud.storage.Snapshot;
 import com.cloud.storage.StorageManager;
 import com.cloud.storage.VolumeVO;
-import com.cloud.storage.snapshot.SnapshotManager;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
 import com.cloud.user.AccountVO;

server/src/com/cloud/async/executor/DeleteDomainExecutor.java

@@ -17,16 +17,16 @@
  */
 package com.cloud.async.executor;
 
-import org.apache.log4j.Logger;
-
-import com.cloud.api.BaseCmd;
-import com.cloud.async.AsyncJobManager;
-import com.cloud.async.AsyncJobResult;
-import com.cloud.async.AsyncJobVO;
-import com.cloud.async.BaseAsyncJobExecutor;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
+import org.apache.log4j.Logger;
+
+import com.cloud.api.BaseCmd;
+import com.cloud.async.AsyncJobManager;
+import com.cloud.async.AsyncJobResult;
+import com.cloud.async.AsyncJobVO;
+import com.cloud.async.BaseAsyncJobExecutor;
+import com.cloud.serializer.GsonHelper;
+import com.cloud.server.ManagementServer;
+import com.google.gson.Gson;
 
 public class DeleteDomainExecutor extends BaseAsyncJobExecutor {
     public static final Logger s_logger = Logger.getLogger(DeleteDomainExecutor.class.getName());

server/src/com/cloud/async/executor/DeleteLoadBalancerExecutor.java

@@ -18,8 +18,8 @@
 
 package com.cloud.async.executor;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobResult;
@@ -27,7 +27,7 @@ import com.cloud.async.AsyncJobVO;
 import com.cloud.async.BaseAsyncJobExecutor;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class DeleteLoadBalancerExecutor extends BaseAsyncJobExecutor {
     public static final Logger s_logger = Logger.getLogger(DeleteLoadBalancerExecutor.class.getName());

server/src/com/cloud/async/executor/DeleteNetworkRuleConfigExecutor.java

@@ -24,7 +24,7 @@ import com.cloud.async.AsyncJobVO;
 import com.cloud.async.BaseAsyncJobExecutor;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class DeleteNetworkRuleConfigExecutor extends BaseAsyncJobExecutor {
 

server/src/com/cloud/async/executor/DeleteRuleExecutor.java

@@ -18,8 +18,8 @@
 
 package com.cloud.async.executor;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobResult;
@@ -30,7 +30,7 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class DeleteRuleExecutor extends BaseAsyncJobExecutor {
     public static final Logger s_logger = Logger.getLogger(DeleteRuleExecutor.class.getName());

server/src/com/cloud/async/executor/DeleteUserExecutor.java

@@ -18,8 +18,8 @@
 
 package com.cloud.async.executor;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobResult;
@@ -27,7 +27,7 @@ import com.cloud.async.AsyncJobVO;
 import com.cloud.async.BaseAsyncJobExecutor;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class DeleteUserExecutor extends BaseAsyncJobExecutor {
     public static final Logger s_logger = Logger.getLogger(DeleteUserExecutor.class.getName());

server/src/com/cloud/async/executor/DeployVMResultObject.java

@@ -18,9 +18,8 @@
 
 package com.cloud.async.executor;
 
-import java.util.Date;
-import java.util.List;
-
+import java.util.Date;
+
 import com.cloud.serializer.Param;
 
 public class DeployVMResultObject {

server/src/com/cloud/async/executor/DestroyConsoleProxyExecutor.java

@@ -18,8 +18,8 @@
 
 package com.cloud.async.executor;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.agent.api.Answer;
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
@@ -27,7 +27,7 @@ import com.cloud.async.AsyncJobResult;
 import com.cloud.async.AsyncJobVO;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class DestroyConsoleProxyExecutor extends VMOperationExecutor {
     public static final Logger s_logger = Logger.getLogger(DestroyConsoleProxyExecutor.class.getName());

server/src/com/cloud/async/executor/DestroyVMExecutor.java

@@ -18,29 +18,28 @@
 
 package com.cloud.async.executor;
 
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
 import com.cloud.agent.api.Answer;
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobResult;
 import com.cloud.async.AsyncJobVO;
 import com.cloud.configuration.ResourceCount.ResourceType;
-import com.cloud.event.EventState;
 import com.cloud.event.EventTypes;
 import com.cloud.event.EventVO;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
-import com.cloud.storage.VolumeVO;
 import com.cloud.storage.Volume.VolumeType;
+import com.cloud.storage.VolumeVO;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.Transaction;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.Event;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class DestroyVMExecutor extends VMOperationExecutor {
     public static final Logger s_logger = Logger.getLogger(DestroyVMExecutor.class.getName());

server/src/com/cloud/async/executor/DisableAccountExecutor.java

@@ -21,8 +21,8 @@ package com.cloud.async.executor;
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobResult;
@@ -35,7 +35,7 @@ import com.cloud.user.AccountVO;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.Transaction;
 import com.cloud.vm.DomainRouterVO;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class DisableAccountExecutor extends BaseAsyncJobExecutor {
     public static final Logger s_logger = Logger.getLogger(DisableAccountExecutor.class.getName());

server/src/com/cloud/async/executor/DisableUserExecutor.java

@@ -20,8 +20,8 @@ package com.cloud.async.executor;
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobResult;
@@ -35,7 +35,7 @@ import com.cloud.user.UserVO;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.Transaction;
 import com.cloud.vm.DomainRouterVO;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class DisableUserExecutor extends BaseAsyncJobExecutor {
     public static final Logger s_logger = Logger.getLogger(DisableUserExecutor.class.getName());

server/src/com/cloud/async/executor/DisassociateIpAddressExecutor.java

@@ -18,8 +18,8 @@
 
 package com.cloud.async.executor;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobResult;
@@ -32,7 +32,7 @@ import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
 import com.cloud.vm.DomainRouterVO;
 import com.cloud.vm.dao.DomainRouterDao;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class DisassociateIpAddressExecutor extends BaseAsyncJobExecutor {
     public static final Logger s_logger = Logger.getLogger(DisassociateIpAddressExecutor.class.getName());

server/src/com/cloud/async/executor/LoadBalancerParam.java

@@ -18,7 +18,7 @@
 
 package com.cloud.async.executor;
 
-import java.util.List;
+import java.util.List;
 
 public class LoadBalancerParam {
     private Long userId;

server/src/com/cloud/async/executor/PrepareMaintenanceExecutor.java

@@ -22,8 +22,8 @@ import java.text.DecimalFormat;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobResult;
@@ -38,11 +38,9 @@ import com.cloud.offering.ServiceOffering;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
 import com.cloud.storage.GuestOSCategoryVO;
-import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.fsm.StateMachine;
-//import com.cloud.vm.HostStats;
 import com.cloud.vm.UserVmVO;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class PrepareMaintenanceExecutor extends BaseAsyncJobExecutor {
     public static final Logger s_logger = Logger.getLogger(PrepareMaintenanceExecutor.class.getName());

server/src/com/cloud/async/executor/RebootConsoleProxyExecutor.java

@@ -18,8 +18,8 @@
 
 package com.cloud.async.executor;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.agent.api.Answer;
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
@@ -28,7 +28,7 @@ import com.cloud.async.AsyncJobVO;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
 import com.cloud.vm.ConsoleProxyVO;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class RebootConsoleProxyExecutor extends VMOperationExecutor {
     public static final Logger s_logger = Logger.getLogger(RebootConsoleProxyExecutor.class.getName());

server/src/com/cloud/async/executor/RebootRouterExecutor.java

@@ -18,8 +18,8 @@
 
 package com.cloud.async.executor;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.agent.api.Answer;
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
@@ -29,7 +29,7 @@ import com.cloud.exception.InternalErrorException;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
 import com.cloud.vm.DomainRouter;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class RebootRouterExecutor extends VMOperationExecutor {
     public static final Logger s_logger = Logger.getLogger(RebootRouterExecutor.class.getName());

server/src/com/cloud/async/executor/RebootVMExecutor.java

@@ -18,20 +18,19 @@
 
 package com.cloud.async.executor;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.agent.api.Answer;
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobResult;
 import com.cloud.async.AsyncJobVO;
-import com.cloud.event.EventState;
 import com.cloud.event.EventTypes;
 import com.cloud.event.EventVO;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
 import com.cloud.vm.UserVmVO;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class RebootVMExecutor extends VMOperationExecutor {
     public static final Logger s_logger = Logger.getLogger(RebootVMExecutor.class.getName());

server/src/com/cloud/async/executor/ReconnectExecutor.java

@@ -22,8 +22,8 @@ import java.text.DecimalFormat;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobResult;
@@ -38,12 +38,9 @@ import com.cloud.offering.ServiceOffering;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
 import com.cloud.storage.GuestOSCategoryVO;
-import com.cloud.utils.NumbersUtil;
-import com.cloud.utils.Pair;
 import com.cloud.utils.fsm.StateMachine;
-//import com.cloud.vm.HostStats;
 import com.cloud.vm.UserVmVO;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class ReconnectExecutor extends BaseAsyncJobExecutor {
     public static final Logger s_logger = Logger.getLogger(ReconnectExecutor.class.getName());

server/src/com/cloud/async/executor/RemoveFromLoadBalancerExecutor.java

@@ -18,8 +18,8 @@
 
 package com.cloud.async.executor;
 
-import org.apache.log4j.Logger;
-
+import org.apache.log4j.Logger;
+
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobResult;
@@ -28,7 +28,7 @@ import com.cloud.async.BaseAsyncJobExecutor;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementServer;
-import com.google.gson.Gson;
+import com.google.gson.Gson;
 
 public class RemoveFromLoadBalancerExecutor extends BaseAsyncJobExecutor {
     public static final Logger s_logger = Logger.getLogger(RemoveFromLoadBalancerExecutor.class.getName());