dependency fix

Author: sureshanaparti

api/src/main/java/org/apache/cloudstack/api/response/AsyncJobResponse.java

@@ -211,6 +211,10 @@ public void setCancellable(Boolean cancellable) {
         this.cancellable = cancellable;
     }
 
+    public boolean getCancellable() {
+        return Boolean.TRUE.equals(cancellable);
+    }
+
     public void setJobInstanceName(String jobInstanceName) {
         this.jobInstanceName = jobInstanceName;
     }

server/src/main/java/com/cloud/api/ApiDBUtils.java

@@ -90,6 +90,7 @@
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.framework.jobs.AsyncJob;
 import org.apache.cloudstack.framework.jobs.AsyncJobManager;
+import org.apache.cloudstack.jobs.JobInfo;
 import org.apache.cloudstack.framework.jobs.dao.AsyncJobDao;
 import org.apache.cloudstack.resourcedetail.SnapshotPolicyDetailVO;
 import org.apache.cloudstack.resourcedetail.dao.DiskOfferingDetailsDao;
@@ -2187,7 +2188,11 @@ public static AccountJoinVO findAccountViewById(Long accountId) {
     }
 
     public static AsyncJobResponse newAsyncJobResponse(AsyncJobJoinVO ve) {
-        return s_jobJoinDao.newAsyncJobResponse(ve);
+        final AsyncJobResponse response = s_jobJoinDao.newAsyncJobResponse(ve);
+        if (!response.getCancellable() && ve.getStatus() == JobInfo.Status.IN_PROGRESS.value() && s_asyncMgr.hasOnlyQueuedWork(ve.getId())) {
+            response.setCancellable(true);
+        }
+        return response;
     }
 
     public static AsyncJobJoinVO newAsyncJobView(AsyncJob e) {

server/src/main/java/com/cloud/api/query/dao/AsyncJobJoinDaoImpl.java

@@ -30,7 +30,6 @@
 import org.apache.cloudstack.api.response.ExceptionResponse;
 import org.apache.cloudstack.jobs.JobInfo;
 import org.apache.cloudstack.framework.jobs.AsyncJob;
-import org.apache.cloudstack.framework.jobs.AsyncJobManager;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 
@@ -69,9 +68,6 @@ private String managementServerName(final Long msid) {
         return managementServer != null ? managementServer.getName() : null;
     }
 
-    @Inject
-    private AsyncJobManager asyncJobManager;
-
     private static final Map<String, Boolean> cancellableCommands = new ConcurrentHashMap<>();
 
     /** The same annotation cancelAsyncJob checks; a command class that cannot be loaded is reported as not cancellable. */
@@ -99,8 +95,7 @@ public AsyncJobResponse newAsyncJobResponse(final AsyncJobJoinVO job) {
         jobResponse.setDomainPath(ApiResponseHelper.getPrettyDomainPath(job.getDomainPath()));
         jobResponse.setUserId(job.getUserUuid());
         jobResponse.setCmd(job.getCmd());
-        jobResponse.setCancellable(isCancellableCommand(job.getCmd())
-                || (job.getStatus() == JobInfo.Status.IN_PROGRESS.value() && asyncJobManager.hasOnlyQueuedWork(job.getId())));
+        jobResponse.setCancellable(isCancellableCommand(job.getCmd()));
         jobResponse.setCreated(job.getCreated());
         jobResponse.setRemoved(job.getRemoved());
         jobResponse.setId(job.getUuid());