Skip to content

Commit 3bf15bd

Browse files
minchen07minchen07
committed
Code cleanup.
1 parent cc0de88 commit 3bf15bd

3 files changed

Lines changed: 0 additions & 27 deletions

File tree

‎engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager;
5757
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
5858
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
59-
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao;
6059
import org.apache.cloudstack.storage.image.manager.ImageDataManager;
6160
import org.apache.cloudstack.storage.image.store.TemplateObject;
6261
import org.apache.cloudstack.storage.to.TemplateObjectTO;
@@ -67,7 +66,6 @@
6766
import com.cloud.agent.api.storage.ListTemplateAnswer;
6867
import com.cloud.agent.api.storage.ListTemplateCommand;
6968
import com.cloud.alert.AlertManager;
70-
import com.cloud.api.query.dao.UserVmJoinDao;
7169
import com.cloud.dc.DataCenterVO;
7270
import com.cloud.dc.dao.ClusterDao;
7371
import com.cloud.dc.dao.DataCenterDao;
@@ -81,16 +79,13 @@
8179
import com.cloud.storage.dao.VMTemplateDao;
8280
import com.cloud.storage.dao.VMTemplatePoolDao;
8381
import com.cloud.storage.dao.VMTemplateZoneDao;
84-
import com.cloud.storage.dao.VolumeDao;
85-
import com.cloud.storage.download.DownloadMonitor;
8682
import com.cloud.storage.template.TemplateConstants;
8783
import com.cloud.storage.template.TemplateProp;
8884
import com.cloud.template.TemplateManager;
8985
import com.cloud.user.AccountManager;
9086
import com.cloud.user.ResourceLimitService;
9187
import com.cloud.utils.UriUtils;
9288
import com.cloud.utils.fsm.NoTransitionException;
93-
import com.cloud.vm.dao.UserVmDao;
9489

9590
@Component
9691
public class TemplateServiceImpl implements TemplateService {
@@ -114,22 +109,12 @@ public class TemplateServiceImpl implements TemplateService {
114109
@Inject
115110
TemplateDataStoreDao _vmTemplateStoreDao;
116111
@Inject
117-
VolumeDataStoreDao _volumeStoreDao;
118-
@Inject
119-
DownloadMonitor _dlMonitor;
120-
@Inject
121112
DataCenterDao _dcDao = null;
122113
@Inject
123114
VMTemplateZoneDao _vmTemplateZoneDao;
124115
@Inject
125116
ClusterDao _clusterDao;
126117
@Inject
127-
UserVmDao _userVmDao;
128-
@Inject
129-
UserVmJoinDao _userVmJoinDao;
130-
@Inject
131-
VolumeDao _volumeDao;
132-
@Inject
133118
TemplateDataFactory _templateFactory;
134119
@Inject
135120
VMTemplatePoolDao _tmpltPoolDao;

‎engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,10 @@
5151
import org.apache.cloudstack.storage.datastore.PrimaryDataStoreProviderManager;
5252
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao;
5353
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO;
54-
import org.apache.cloudstack.storage.to.TemplateObjectTO;
5554
import org.apache.cloudstack.storage.to.VolumeObjectTO;
5655
import org.apache.log4j.Logger;
5756
import org.springframework.stereotype.Component;
5857

59-
import com.cloud.agent.AgentManager;
6058
import com.cloud.agent.api.Answer;
6159
import com.cloud.agent.api.storage.ListVolumeAnswer;
6260
import com.cloud.agent.api.storage.ListVolumeCommand;
@@ -75,14 +73,12 @@
7573
import com.cloud.storage.Volume;
7674
import com.cloud.storage.VolumeVO;
7775
import com.cloud.storage.dao.VolumeDao;
78-
import com.cloud.storage.download.DownloadMonitor;
7976
import com.cloud.storage.snapshot.SnapshotManager;
8077
import com.cloud.storage.template.TemplateProp;
8178
import com.cloud.user.AccountManager;
8279
import com.cloud.user.ResourceLimitService;
8380
import com.cloud.utils.NumbersUtil;
8481
import com.cloud.utils.db.DB;
85-
import com.cloud.vm.dao.VMInstanceDao;
8682

8783
@Component
8884
public class VolumeServiceImpl implements VolumeService {
@@ -104,18 +100,12 @@ public class VolumeServiceImpl implements VolumeService {
104100
@Inject
105101
ResourceLimitService _resourceLimitMgr;
106102
@Inject
107-
DownloadMonitor downloadMonitor;
108-
@Inject
109103
AccountManager _accountMgr;
110104
@Inject
111105
AlertManager _alertMgr;
112106
@Inject
113-
VMInstanceDao vmDao;
114-
@Inject
115107
ConfigurationDao configDao;
116108
@Inject
117-
AgentManager _agentMgr;
118-
@Inject
119109
VolumeDataStoreDao _volumeStoreDao;
120110
@Inject
121111
VolumeDao _volumeDao;

‎plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@
5252
import com.cloud.agent.api.storage.ListVolumeCommand;
5353
import com.cloud.agent.api.storage.PrimaryStorageDownloadAnswer;
5454
import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand;
55-
import com.cloud.agent.api.to.DataObjectType;
5655
import com.cloud.agent.api.to.DataStoreTO;
57-
import com.cloud.agent.api.to.DataTO;
5856
import com.cloud.agent.api.to.StorageFilerTO;
5957
import com.cloud.agent.api.to.VolumeTO;
6058
import com.cloud.simulator.MockHost;

0 commit comments

Comments
 (0)