Skip to content

Commit de38cd8

Browse files
author
Prasanna Santhanam
committed
Fix typo in class name
AsyncRpcConext -> AsyncRpcContext Signed-off-by: Prasanna Santhanam <tsp@apache.org>
1 parent 56a001d commit de38cd8

12 files changed

Lines changed: 77 additions & 83 deletions

File tree

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,14 @@
4040
import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event;
4141
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
4242
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory;
43-
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateEvent;
4443
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
4544
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService;
46-
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState;
4745
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
4846
import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
4947
import org.apache.cloudstack.framework.async.AsyncCallFuture;
5048
import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher;
5149
import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
52-
import org.apache.cloudstack.framework.async.AsyncRpcConext;
50+
import org.apache.cloudstack.framework.async.AsyncRpcContext;
5351
import org.apache.cloudstack.storage.command.CommandResult;
5452
import org.apache.cloudstack.storage.command.DeleteCommand;
5553
import org.apache.cloudstack.storage.datastore.DataObjectManager;
@@ -84,7 +82,6 @@
8482
import com.cloud.user.AccountManager;
8583
import com.cloud.user.ResourceLimitService;
8684
import com.cloud.utils.UriUtils;
87-
import com.cloud.utils.fsm.NoTransitionException;
8885

8986
@Component
9087
public class TemplateServiceImpl implements TemplateService {
@@ -122,7 +119,7 @@ public class TemplateServiceImpl implements TemplateService {
122119
@Inject
123120
TemplateManager _tmpltMgr;
124121

125-
class TemplateOpContext<T> extends AsyncRpcConext<T> {
122+
class TemplateOpContext<T> extends AsyncRpcContext<T> {
126123
final TemplateObject template;
127124
final AsyncCallFuture<TemplateApiResult> future;
128125

‎engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.apache.cloudstack.framework.async.AsyncCallFuture;
3434
import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher;
3535
import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
36-
import org.apache.cloudstack.framework.async.AsyncRpcConext;
36+
import org.apache.cloudstack.framework.async.AsyncRpcContext;
3737
import org.apache.cloudstack.storage.command.CommandResult;
3838
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
3939
import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager;
@@ -79,7 +79,7 @@ public class SnapshotServiceImpl implements SnapshotService {
7979
@Inject
8080
VMSnapshotDao _vmSnapshotDao;
8181

82-
static private class CreateSnapshotContext<T> extends AsyncRpcConext<T> {
82+
static private class CreateSnapshotContext<T> extends AsyncRpcContext<T> {
8383
final SnapshotInfo snapshot;
8484
final AsyncCallFuture<SnapshotResult> future;
8585

@@ -91,7 +91,7 @@ public CreateSnapshotContext(AsyncCompletionCallback<T> callback, VolumeInfo vol
9191
}
9292
}
9393

94-
static private class DeleteSnapshotContext<T> extends AsyncRpcConext<T> {
94+
static private class DeleteSnapshotContext<T> extends AsyncRpcContext<T> {
9595
final SnapshotInfo snapshot;
9696
final AsyncCallFuture<SnapshotResult> future;
9797

@@ -104,7 +104,7 @@ public DeleteSnapshotContext(AsyncCompletionCallback<T> callback, SnapshotInfo s
104104

105105
}
106106

107-
static private class CopySnapshotContext<T> extends AsyncRpcConext<T> {
107+
static private class CopySnapshotContext<T> extends AsyncRpcContext<T> {
108108
final SnapshotInfo srcSnapshot;
109109
final SnapshotInfo destSnapshot;
110110
final AsyncCallFuture<SnapshotResult> future;

‎engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event;
3131
import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher;
3232
import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
33-
import org.apache.cloudstack.framework.async.AsyncRpcConext;
33+
import org.apache.cloudstack.framework.async.AsyncRpcContext;
3434
import org.apache.cloudstack.storage.command.CommandResult;
3535
import org.apache.log4j.Logger;
3636
import org.springframework.stereotype.Component;
@@ -78,7 +78,7 @@ protected DataObject waitingForCreated(DataObject dataObj, DataStore dataStore)
7878
return objectInDataStoreMgr.get(dataObj, dataStore);
7979
}
8080

81-
class CreateContext<T> extends AsyncRpcConext<T> {
81+
class CreateContext<T> extends AsyncRpcContext<T> {
8282
final DataObject objInStrore;
8383

8484
public CreateContext(AsyncCompletionCallback<T> callback, DataObject objInStore) {
@@ -205,7 +205,7 @@ protected Void createAsynCallback(AsyncCallbackDispatcher<DataObjectManagerImpl,
205205
return null;
206206
}
207207

208-
class CopyContext<T> extends AsyncRpcConext<T> {
208+
class CopyContext<T> extends AsyncRpcContext<T> {
209209
DataObject destObj;
210210
DataObject srcObj;
211211

@@ -293,7 +293,7 @@ protected Void copyCallback(AsyncCallbackDispatcher<DataObjectManagerImpl, CopyC
293293
return null;
294294
}
295295

296-
class DeleteContext<T> extends AsyncRpcConext<T> {
296+
class DeleteContext<T> extends AsyncRpcContext<T> {
297297
private final DataObject obj;
298298

299299
public DeleteContext(AsyncCompletionCallback<T> callback, DataObject obj) {

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

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,16 @@
1818
*/
1919
package org.apache.cloudstack.storage.image;
2020

21-
import java.util.Date;
22-
import java.util.Set;
23-
import javax.inject.Inject;
24-
21+
import com.cloud.agent.api.Answer;
22+
import com.cloud.agent.api.storage.DownloadAnswer;
23+
import com.cloud.agent.api.to.DataObjectType;
24+
import com.cloud.agent.api.to.DataTO;
25+
import com.cloud.storage.VMTemplateStorageResourceAssoc;
26+
import com.cloud.storage.VMTemplateVO;
27+
import com.cloud.storage.VolumeVO;
28+
import com.cloud.storage.dao.VMTemplateDao;
29+
import com.cloud.storage.dao.VolumeDao;
30+
import com.cloud.storage.download.DownloadMonitor;
2531
import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult;
2632
import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult;
2733
import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
@@ -30,31 +36,22 @@
3036
import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
3137
import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher;
3238
import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
33-
import org.apache.cloudstack.framework.async.AsyncRpcConext;
39+
import org.apache.cloudstack.framework.async.AsyncRpcContext;
3440
import org.apache.cloudstack.storage.command.CommandResult;
3541
import org.apache.cloudstack.storage.command.DeleteCommand;
3642
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
3743
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
3844
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao;
3945
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO;
40-
import org.apache.cloudstack.storage.image.ImageStoreDriver;
4146
import org.apache.log4j.Logger;
4247

43-
import com.cloud.agent.api.Answer;
44-
import com.cloud.agent.api.storage.DownloadAnswer;
45-
import com.cloud.agent.api.to.DataObjectType;
46-
import com.cloud.agent.api.to.DataTO;
47-
import com.cloud.storage.VMTemplateStorageResourceAssoc;
48-
import com.cloud.storage.VMTemplateVO;
49-
import com.cloud.storage.VolumeVO;
50-
import com.cloud.storage.dao.VMTemplateDao;
51-
import com.cloud.storage.dao.VolumeDao;
52-
import com.cloud.storage.download.DownloadMonitor;
48+
import javax.inject.Inject;
49+
import java.util.Date;
5350

5451
public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver {
5552
private static final Logger s_logger = Logger.getLogger(BaseImageStoreDriverImpl.class);
5653
@Inject
57-
VMTemplateDao templateDao;
54+
VMTemplateDao _templateDao;
5855
@Inject
5956
DownloadMonitor _downloadMonitor;
6057
@Inject
@@ -71,7 +68,7 @@ public DataTO getTO(DataObject data) {
7168
return null;
7269
}
7370

74-
class CreateContext<T> extends AsyncRpcConext<T> {
71+
class CreateContext<T> extends AsyncRpcContext<T> {
7572
final DataObject data;
7673

7774
public CreateContext(AsyncCompletionCallback<T> callback, DataObject data) {
@@ -115,9 +112,9 @@ protected Void createTemplateAsyncCallback(AsyncCallbackDispatcher<BaseImageStor
115112
updateBuilder.setPhysicalSize(answer.getTemplatePhySicalSize());
116113
_templateStoreDao.update(tmpltStoreVO.getId(), updateBuilder);
117114
// update size in vm_template table
118-
VMTemplateVO tmlptUpdater = templateDao.createForUpdate();
115+
VMTemplateVO tmlptUpdater = _templateDao.createForUpdate();
119116
tmlptUpdater.setSize(answer.getTemplateSize());
120-
templateDao.update(obj.getId(), tmlptUpdater);
117+
_templateDao.update(obj.getId(), tmlptUpdater);
121118
}
122119

123120
AsyncCompletionCallback<CreateCmdResult> caller = context.getParentCallback();
@@ -131,9 +128,9 @@ protected Void createTemplateAsyncCallback(AsyncCallbackDispatcher<BaseImageStor
131128
caller.complete(result);
132129
} else if (answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.DOWNLOADED) {
133130
if (answer.getCheckSum() != null) {
134-
VMTemplateVO templateDaoBuilder = templateDao.createForUpdate();
131+
VMTemplateVO templateDaoBuilder = _templateDao.createForUpdate();
135132
templateDaoBuilder.setChecksum(answer.getCheckSum());
136-
templateDao.update(obj.getId(), templateDaoBuilder);
133+
_templateDao.update(obj.getId(), templateDaoBuilder);
137134
}
138135

139136
CreateCmdResult result = new CreateCmdResult(null, null);

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import org.apache.cloudstack.framework.async.AsyncCallFuture;
4747
import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher;
4848
import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
49-
import org.apache.cloudstack.framework.async.AsyncRpcConext;
49+
import org.apache.cloudstack.framework.async.AsyncRpcContext;
5050
import org.apache.cloudstack.storage.command.CommandResult;
5151
import org.apache.cloudstack.storage.command.DeleteCommand;
5252
import org.apache.cloudstack.storage.datastore.DataObjectManager;
@@ -124,7 +124,7 @@ public class VolumeServiceImpl implements VolumeService {
124124
public VolumeServiceImpl() {
125125
}
126126

127-
private class CreateVolumeContext<T> extends AsyncRpcConext<T> {
127+
private class CreateVolumeContext<T> extends AsyncRpcContext<T> {
128128

129129
private final DataObject volume;
130130
private final AsyncCallFuture<VolumeApiResult> future;
@@ -190,7 +190,7 @@ protected Void createVolumeCallback(AsyncCallbackDispatcher<VolumeServiceImpl, C
190190
return null;
191191
}
192192

193-
private class DeleteVolumeContext<T> extends AsyncRpcConext<T> {
193+
private class DeleteVolumeContext<T> extends AsyncRpcContext<T> {
194194
private final VolumeObject volume;
195195
private final AsyncCallFuture<VolumeApiResult> future;
196196

@@ -282,7 +282,7 @@ public VolumeEntity getVolumeEntity(long volumeId) {
282282
return null;
283283
}
284284

285-
class CreateBaseImageContext<T> extends AsyncRpcConext<T> {
285+
class CreateBaseImageContext<T> extends AsyncRpcContext<T> {
286286
private final VolumeInfo volume;
287287
private final PrimaryDataStore dataStore;
288288
private final TemplateInfo srcTemplate;
@@ -421,7 +421,7 @@ protected Void copyBaseImageCallback(AsyncCallbackDispatcher<VolumeServiceImpl,
421421
return null;
422422
}
423423

424-
private class CreateVolumeFromBaseImageContext<T> extends AsyncRpcConext<T> {
424+
private class CreateVolumeFromBaseImageContext<T> extends AsyncRpcContext<T> {
425425
private final DataObject vo;
426426
private final AsyncCallFuture<VolumeApiResult> future;
427427
private final DataObject templateOnStore;
@@ -576,7 +576,7 @@ protected VolumeVO duplicateVolumeOnAnotherStorage(Volume volume, StoragePool po
576576
return volDao.persist(newVol);
577577
}
578578

579-
private class CopyVolumeContext<T> extends AsyncRpcConext<T> {
579+
private class CopyVolumeContext<T> extends AsyncRpcContext<T> {
580580
final VolumeInfo srcVolume;
581581
final VolumeInfo destVolume;
582582
final AsyncCallFuture<VolumeApiResult> future;
@@ -780,7 +780,7 @@ protected Void copyVolumeCallBack(AsyncCallbackDispatcher<VolumeServiceImpl, Cop
780780
return null;
781781
}
782782

783-
private class MigrateVolumeContext<T> extends AsyncRpcConext<T> {
783+
private class MigrateVolumeContext<T> extends AsyncRpcContext<T> {
784784
final VolumeInfo srcVolume;
785785
final VolumeInfo destVolume;
786786
final AsyncCallFuture<VolumeApiResult> future;
@@ -848,7 +848,7 @@ protected Void migrateVolumeCallBack(AsyncCallbackDispatcher<VolumeServiceImpl,
848848
return null;
849849
}
850850

851-
private class MigrateVmWithVolumesContext<T> extends AsyncRpcConext<T> {
851+
private class MigrateVmWithVolumesContext<T> extends AsyncRpcContext<T> {
852852
final Map<VolumeInfo, DataStore> volumeToPool;
853853
final AsyncCallFuture<CommandResult> future;
854854

framework/ipc/src/org/apache/cloudstack/framework/async/AsyncRpcConext.java renamed to framework/ipc/src/org/apache/cloudstack/framework/async/AsyncRpcContext.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
*/
1919
package org.apache.cloudstack.framework.async;
2020

21-
public class AsyncRpcConext<T> {
21+
public class AsyncRpcContext<T> {
2222
protected final AsyncCompletionCallback<T> parentCallBack;
23-
public AsyncRpcConext(AsyncCompletionCallback<T> callback) {
23+
public AsyncRpcContext(AsyncCompletionCallback<T> callback) {
2424
this.parentCallBack = callback;
2525
}
26-
26+
2727
public AsyncCompletionCallback<T> getParentCallback() {
2828
return this.parentCallBack;
2929
}

‎framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher;
2525
import org.apache.cloudstack.framework.async.AsyncCallbackDriver;
2626
import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
27-
import org.apache.cloudstack.framework.async.AsyncRpcConext;
27+
import org.apache.cloudstack.framework.async.AsyncRpcContext;
2828
import org.junit.Assert;
2929
import org.junit.Before;
3030
import org.junit.Test;
@@ -59,7 +59,7 @@ public void MethodThatWillCallAsyncMethod() {
5959
}
6060
}
6161

62-
private class TestContext<T> extends AsyncRpcConext<T> {
62+
private class TestContext<T> extends AsyncRpcContext<T> {
6363
private boolean finished;
6464
private String result;
6565
/**

‎plugins/hypervisors/vmware/test/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.apache.cloudstack.framework.async.AsyncCallFuture;
3838
import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher;
3939
import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
40-
import org.apache.cloudstack.framework.async.AsyncRpcConext;
40+
import org.apache.cloudstack.framework.async.AsyncRpcContext;
4141
import org.apache.cloudstack.storage.command.CommandResult;
4242
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
4343
import org.apache.cloudstack.test.utils.SpringUtils;
@@ -209,7 +209,7 @@ public void testMigrateAcrossClusterFailure() throws Exception {
209209
assertFalse("Migration across cluster didn't fail.", this.result.isSuccess());
210210
}
211211

212-
private class MockContext<T> extends AsyncRpcConext<T> {
212+
private class MockContext<T> extends AsyncRpcContext<T> {
213213
final Map<VolumeInfo, DataStore> volumeToPool;
214214
final AsyncCallFuture<CommandResult> future;
215215
/**

‎plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackImageStoreLifeCycleImpl.java‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
// under the License.
1717
package org.apache.cloudstack.storage.datastore.lifecycle;
1818

19-
import java.net.URI;
20-
import java.net.URISyntaxException;
21-
import java.util.HashMap;
22-
import java.util.List;
23-
import java.util.Map;
24-
25-
import javax.inject.Inject;
26-
19+
import com.cloud.agent.api.StoragePoolInfo;
20+
import com.cloud.exception.InvalidParameterValueException;
21+
import com.cloud.hypervisor.Hypervisor.HypervisorType;
22+
import com.cloud.resource.Discoverer;
23+
import com.cloud.resource.ResourceManager;
24+
import com.cloud.storage.DataStoreRole;
25+
import com.cloud.storage.ScopeType;
26+
import com.cloud.utils.UriUtils;
2727
import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
2828
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
2929
import org.apache.cloudstack.engine.subsystem.api.storage.HostScope;
@@ -35,14 +35,12 @@
3535
import org.apache.cloudstack.storage.image.store.lifecycle.ImageStoreLifeCycle;
3636
import org.apache.log4j.Logger;
3737

38-
import com.cloud.agent.api.StoragePoolInfo;
39-
import com.cloud.exception.InvalidParameterValueException;
40-
import com.cloud.hypervisor.Hypervisor.HypervisorType;
41-
import com.cloud.resource.Discoverer;
42-
import com.cloud.resource.ResourceManager;
43-
import com.cloud.storage.DataStoreRole;
44-
import com.cloud.storage.ScopeType;
45-
import com.cloud.utils.UriUtils;
38+
import javax.inject.Inject;
39+
import java.net.URI;
40+
import java.net.URISyntaxException;
41+
import java.util.HashMap;
42+
import java.util.List;
43+
import java.util.Map;
4644

4745
public class CloudStackImageStoreLifeCycleImpl implements ImageStoreLifeCycle {
4846

@@ -83,7 +81,7 @@ public DataStore initialize(Map<String, Object> dsInfos) {
8381
DataStoreRole role = (DataStoreRole) dsInfos.get("role");
8482
Map<String, String> details = (Map<String, String>) dsInfos.get("details");
8583

86-
s_logger.info("Trying to add a new host at " + url + " in data center " + dcId);
84+
s_logger.info("Trying to add a new data store at " + url + " to data center " + dcId);
8785

8886
URI uri = null;
8987
try {
@@ -103,7 +101,7 @@ public DataStore initialize(Map<String, Object> dsInfos) {
103101

104102
if (dcId == null) {
105103
throw new InvalidParameterValueException(
106-
"DataCenter id is null, and cloudstack default image storehas to be associated with a data center");
104+
"DataCenter id is null, and cloudstack default image store has to be associated with a data center");
107105
}
108106

109107
Map<String, Object> imageStoreParameters = new HashMap<String, Object>();

‎plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,11 @@ public SampleImageStoreDriverImpl() {
3939

4040
@Override
4141
public DataStoreTO getStoreTO(DataStore store) {
42-
// TODO Auto-generated method stub
4342
return null;
4443
}
4544

4645
@Override
4746
public String createEntityExtractUrl(DataStore store, String installPath, ImageFormat format) {
48-
// TODO Auto-generated method stub
4947
return null;
5048
}
5149

0 commit comments

Comments
 (0)