Skip to content

Commit 96ebac1

Browse files
kelvenykelveny
committed
server/test/com/cloud/async/AsyncJobTestConfiguration.java
1 parent c51fae0 commit 96ebac1

10 files changed

Lines changed: 58 additions & 784 deletions

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
import com.cloud.api.query.vo.VolumeJoinVO;
8787
import com.cloud.async.AsyncJob;
8888
import com.cloud.async.AsyncJobManager;
89-
import com.cloud.async.AsyncJobVO;
9089
import com.cloud.async.dao.AsyncJobDao;
9190
import com.cloud.capacity.CapacityVO;
9291
import com.cloud.capacity.dao.CapacityDao;
@@ -661,10 +660,6 @@ public static long findCorrectResourceLimit(Long limit, short accountType, Resou
661660
return _resourceLimitMgr.findCorrectResourceLimitForAccount(accountType, limit, type);
662661
}
663662

664-
public static AsyncJobVO findInstancePendingAsyncJob(String instanceType, long instanceId) {
665-
return _asyncMgr.findInstancePendingAsyncJob(instanceType, instanceId);
666-
}
667-
668663
public static long getResourceCount(ResourceType type, long accountId) {
669664
AccountVO account = _accountDao.findById(accountId);
670665

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
public interface AsyncJobManager extends Manager {
2525

2626
public AsyncJobVO getAsyncJob(long jobId);
27-
public AsyncJobVO findInstancePendingAsyncJob(String instanceType, long instanceId);
2827

2928
public List<? extends AsyncJob> findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId);
3029

‎server/src/com/cloud/async/AsyncJobManagerImpl.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import com.cloud.user.AccountManager;
5353
import com.cloud.user.User;
5454
import com.cloud.user.UserContext;
55-
import com.cloud.user.dao.AccountDao;
5655
import com.cloud.utils.DateUtil;
5756
import com.cloud.utils.NumbersUtil;
5857
import com.cloud.utils.PropertiesUtil;
@@ -79,7 +78,6 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
7978
@Inject private SyncQueueManager _queueMgr;
8079
@Inject private ClusterManager _clusterMgr;
8180
@Inject private AccountManager _accountMgr;
82-
@Inject private AccountDao _accountDao;
8381
@Inject private AsyncJobDao _jobDao;
8482
@Inject private ConfigurationDao _configDao;
8583
@Inject private List<AsyncJobDispatcher> _jobDispatchers;
@@ -105,11 +103,6 @@ public AsyncJobVO getAsyncJob(long jobId) {
105103
return _jobDao.findById(jobId);
106104
}
107105

108-
@Override
109-
public AsyncJobVO findInstancePendingAsyncJob(String instanceType, long instanceId) {
110-
return _jobDao.findInstancePendingAsyncJob(instanceType, instanceId);
111-
}
112-
113106
@Override
114107
public List<AsyncJobVO> findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId) {
115108
return _jobDao.findInstancePendingAsyncJobs(instanceType, accountId);

‎server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class SyncQueueItemDaoImpl extends GenericDaoBase<SyncQueueItemVO, Long>
4343
private static final Logger s_logger = Logger.getLogger(SyncQueueItemDaoImpl.class);
4444
final GenericSearchBuilder<SyncQueueItemVO, Long> queueIdSearch;
4545

46-
protected SyncQueueItemDaoImpl() {
46+
public SyncQueueItemDaoImpl() {
4747
super();
4848
queueIdSearch = createSearchBuilder(Long.class);
4949
queueIdSearch.and("contentId", queueIdSearch.entity().getContentId(), Op.EQ);

‎server/test/async-job-component.xml‎

Lines changed: 0 additions & 203 deletions
This file was deleted.

‎server/test/com/cloud/async/CleanupDelegate.java‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)