Got rid of the cyclic dependencies that I was encountering when compi…

…ling after the implementation of the RetrieveDiagnostics API Garbage Collector - DiagnosticsGarbageCollector

api/src/main/java/org/apache/cloudstack/diagnostics/DeleteZipCommand.java

@@ -0,0 +1,28 @@
+package org.apache.cloudstack.diagnostics;
+
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.to.DataStoreTO;
+
+public class DeleteZipCommand extends Command {
+    private String zipFile;
+    private DataStoreTO destStore;
+
+    public DeleteZipCommand(String zipFile, DataStoreTO destStore) {
+        this.zipFile = zipFile;
+        this.destStore = destStore;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
+
+    public DataStoreTO getDestStore() {
+        return destStore;
+    }
+
+    public String getZipFile() {
+        return zipFile;
+    }
+
+}

api/src/main/java/org/apache/cloudstack/diagnostics/RetrieveDiagnosticsService.java

@@ -17,6 +17,7 @@
 
 package org.apache.cloudstack.diagnostics;
 
+import com.cloud.agent.api.Answer;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.OperationTimedoutException;
@@ -33,6 +34,8 @@
 import java.util.Map;
 
 
+
+
 public interface RetrieveDiagnosticsService extends Manager, PluggableService {
 
     Map<String, String> getDiagnosticsFiles(final RetrieveDiagnosticsCmd cmd) throws ResourceUnavailableException, OperationTimedoutException, ConcurrentOperationException, InvalidParameterValueException, ConfigurationException;
@@ -43,5 +46,5 @@ public interface RetrieveDiagnosticsService extends Manager, PluggableService {
 
     List<DiagnosticsKey> get(String key);
 
-    void cleanupDiagnostics();
+    Answer cleanupDiagnostics(DeleteZipCommand cmd);
 }