Remove unused imports and revert import ordering

Author: Dingane Hlaluku

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyToSecondaryStorageWrapper.java

@@ -17,12 +17,13 @@
 package com.cloud.hypervisor.kvm.resource.wrapper;
 
 import java.io.File;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.attribute.PosixFileAttributes;
-import java.nio.file.attribute.PosixFilePermission;
-import java.util.Set;
+
+import org.apache.cloudstack.diagnostics.CopyToSecondaryStorageAnswer;
+import org.apache.cloudstack.diagnostics.CopyToSecondaryStorageCommand;
+import org.apache.cloudstack.diagnostics.DiagnosticsHelper;
+import org.apache.log4j.Logger;
 
 import com.cloud.agent.api.Answer;
 import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
@@ -31,10 +32,6 @@
 import com.cloud.resource.CommandWrapper;
 import com.cloud.resource.ResourceWrapper;
 import com.cloud.utils.ssh.SshHelper;
-import org.apache.cloudstack.diagnostics.CopyToSecondaryStorageAnswer;
-import org.apache.cloudstack.diagnostics.CopyToSecondaryStorageCommand;
-import org.apache.cloudstack.diagnostics.DiagnosticsHelper;
-import org.apache.log4j.Logger;
 
 import static org.apache.cloudstack.diagnostics.DiagnosticsHelper.setDirFilePermissions;
 
@@ -87,5 +84,4 @@ public Answer execute(CopyToSecondaryStorageCommand command, LibvirtComputingRes
             secondaryPool.delete();
         }
     }
-
 }

plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCoppyToSecondaryStorageCommandWrapper.java

@@ -27,6 +27,7 @@
 import com.cloud.resource.ResourceWrapper;
 import com.xensource.xenapi.Connection;
 
+
 @ResourceWrapper(handles = CopyToSecondaryStorageCommand.class)
 public class CitrixCoppyToSecondaryStorageCommandWrapper extends CommandWrapper<CopyToSecondaryStorageCommand, Answer, CitrixResourceBase> {
     public static final Logger LOGGER = Logger.getLogger(CitrixCoppyToSecondaryStorageCommandWrapper.class);

server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsHelper.java

@@ -29,10 +29,11 @@
 import java.nio.file.attribute.PosixFilePermission;
 import java.util.Set;
 
-import com.cloud.utils.script.Script2;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
+import com.cloud.utils.script.Script2;
+
 public class DiagnosticsHelper {
     private static final Logger LOGGER = Logger.getLogger(DiagnosticsHelper.class);
 

server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java

@@ -28,6 +28,28 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import org.apache.cloudstack.api.command.admin.diagnostics.GetDiagnosticsDataCmd;
+import org.apache.cloudstack.api.command.admin.diagnostics.RunDiagnosticsCmd;
+import org.apache.cloudstack.diagnostics.fileprocessor.DiagnosticsFilesList;
+import org.apache.cloudstack.diagnostics.fileprocessor.DiagnosticsFilesListFactory;
+import org.apache.cloudstack.diagnostics.to.DiagnosticsDataObject;
+import org.apache.cloudstack.diagnostics.to.DiagnosticsDataTO;
+import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
+import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.cloudstack.poll.BackgroundPollManager;
+import org.apache.cloudstack.poll.BackgroundPollTask;
+import org.apache.cloudstack.storage.NfsMountManager;
+import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.routing.NetworkElementCommand;
@@ -51,27 +73,6 @@
 import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.google.common.base.Strings;
-import org.apache.cloudstack.api.command.admin.diagnostics.GetDiagnosticsDataCmd;
-import org.apache.cloudstack.api.command.admin.diagnostics.RunDiagnosticsCmd;
-import org.apache.cloudstack.diagnostics.fileprocessor.DiagnosticsFilesList;
-import org.apache.cloudstack.diagnostics.fileprocessor.DiagnosticsFilesListFactory;
-import org.apache.cloudstack.diagnostics.to.DiagnosticsDataObject;
-import org.apache.cloudstack.diagnostics.to.DiagnosticsDataTO;
-import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
-import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
-import org.apache.cloudstack.framework.config.ConfigKey;
-import org.apache.cloudstack.framework.config.Configurable;
-import org.apache.cloudstack.managed.context.ManagedContextRunnable;
-import org.apache.cloudstack.poll.BackgroundPollManager;
-import org.apache.cloudstack.poll.BackgroundPollTask;
-import org.apache.cloudstack.storage.NfsMountManager;
-import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
 
 import static org.apache.cloudstack.diagnostics.DiagnosticsHelper.getTimeDifference;
 import static org.apache.cloudstack.diagnostics.DiagnosticsHelper.setDirFilePermissions;