Skip to content

Commit 0108ffd

Browse files
jbamptonjbampton
authored
java: fix one typo in many files (#11284)
1 parent 6eb27da commit 0108ffd

15 files changed

Lines changed: 45 additions & 45 deletions

File tree

‎core/src/main/java/com/cloud/storage/resource/StorageProcessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
2323
import org.apache.cloudstack.storage.command.AttachCommand;
24-
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
24+
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
2525
import org.apache.cloudstack.storage.command.CopyCommand;
2626
import org.apache.cloudstack.storage.command.CreateObjectCommand;
2727
import org.apache.cloudstack.storage.command.DeleteCommand;
@@ -82,7 +82,7 @@ public interface StorageProcessor {
8282

8383
Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd);
8484

85-
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand cmd);
85+
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand cmd);
8686

8787
public Answer syncVolumePath(SyncVolumePathCommand cmd);
8888
}

‎core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
2323
import org.apache.cloudstack.storage.command.AttachCommand;
24-
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
24+
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
2525
import org.apache.cloudstack.storage.command.CopyCommand;
2626
import org.apache.cloudstack.storage.command.CreateObjectAnswer;
2727
import org.apache.cloudstack.storage.command.CreateObjectCommand;
@@ -79,8 +79,8 @@ public Answer handleStorageCommands(StorageSubSystemCommand command) {
7979
return processor.resignature((ResignatureCommand) command);
8080
} else if (command instanceof DirectDownloadCommand) {
8181
return processor.handleDownloadTemplateToPrimaryStorage((DirectDownloadCommand) command);
82-
} else if (command instanceof CheckDataStoreStoragePolicyComplainceCommand) {
83-
return processor.checkDataStoreStoragePolicyCompliance((CheckDataStoreStoragePolicyComplainceCommand) command);
82+
} else if (command instanceof CheckDataStoreStoragePolicyComplianceCommand) {
83+
return processor.checkDataStoreStoragePolicyCompliance((CheckDataStoreStoragePolicyComplianceCommand) command);
8484
} else if (command instanceof SyncVolumePathCommand) {
8585
return processor.syncVolumePath((SyncVolumePathCommand) command);
8686
} else if (command instanceof QuerySnapshotZoneCopyCommand) {

core/src/main/java/org/apache/cloudstack/storage/command/CheckDataStoreStoragePolicyComplainceCommand.java renamed to core/src/main/java/org/apache/cloudstack/storage/command/CheckDataStoreStoragePolicyComplianceCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
import com.cloud.agent.api.to.StorageFilerTO;
2323

24-
public class CheckDataStoreStoragePolicyComplainceCommand extends StorageSubSystemCommand {
24+
public class CheckDataStoreStoragePolicyComplianceCommand extends StorageSubSystemCommand {
2525

2626
String storagePolicyId;
2727
private StorageFilerTO storagePool;
2828

29-
public CheckDataStoreStoragePolicyComplainceCommand(String storagePolicyId, StorageFilerTO storagePool) {
29+
public CheckDataStoreStoragePolicyComplianceCommand(String storagePolicyId, StorageFilerTO storagePool) {
3030
super();
3131

3232
this.storagePolicyId = storagePolicyId;

‎engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ protected boolean filter(ExcludeList avoid, StoragePool pool, DiskProfile dskCh,
378378
return false;
379379
}
380380
} catch (StorageUnavailableException e) {
381-
logger.warn(String.format("Could not verify storage policy complaince against storage pool %s due to exception %s", pool.getUuid(), e.getMessage()));
381+
logger.warn(String.format("Could not verify storage policy compliance against storage pool %s due to exception %s", pool.getUuid(), e.getMessage()));
382382
return false;
383383
}
384384
}

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
6363
import org.apache.cloudstack.storage.command.AttachAnswer;
6464
import org.apache.cloudstack.storage.command.AttachCommand;
65-
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
65+
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
6666
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
6767
import org.apache.cloudstack.storage.command.CopyCommand;
6868
import org.apache.cloudstack.storage.command.CreateObjectAnswer;
@@ -3116,8 +3116,8 @@ protected boolean isEnoughSpaceForDownloadTemplateOnTemporaryLocation(Long templ
31163116
}
31173117

31183118
@Override
3119-
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand cmd) {
3120-
logger.info("'CheckDataStoreStoragePolicyComplainceCommand' not currently applicable for KVMStorageProcessor");
3119+
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand cmd) {
3120+
logger.info("'CheckDataStoreStoragePolicyComplianceCommand' not currently applicable for KVMStorageProcessor");
31213121
return new Answer(cmd,false,"Not currently applicable for KVMStorageProcessor");
31223122
}
31233123

‎plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
2525
import org.apache.cloudstack.storage.command.AttachAnswer;
2626
import org.apache.cloudstack.storage.command.AttachCommand;
27-
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
27+
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
2828
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
2929
import org.apache.cloudstack.storage.command.CopyCommand;
3030
import org.apache.cloudstack.storage.command.CreateObjectAnswer;
@@ -830,8 +830,8 @@ public Answer handleDownloadTemplateToPrimaryStorage(DirectDownloadCommand cmd)
830830
}
831831

832832
@Override
833-
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand cmd) {
834-
logger.info("'CheckDataStoreStoragePolicyComplainceCommand' not applicable used for Ovm3StorageProcessor");
833+
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand cmd) {
834+
logger.info("'CheckDataStoreStoragePolicyComplianceCommand' not applicable used for Ovm3StorageProcessor");
835835
return new Answer(cmd,false,"Not applicable used for Ovm3StorageProcessor");
836836
}
837837

‎plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorStorageProcessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.apache.cloudstack.storage.command.CopyCommand;
3333
import org.apache.cloudstack.storage.command.CreateObjectAnswer;
3434
import org.apache.cloudstack.storage.command.CreateObjectCommand;
35-
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
35+
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
3636
import org.apache.cloudstack.storage.command.DeleteCommand;
3737
import org.apache.cloudstack.storage.command.DettachAnswer;
3838
import org.apache.cloudstack.storage.command.DettachCommand;
@@ -274,7 +274,7 @@ public Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd) {
274274
}
275275

276276
@Override
277-
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand cmd) {
277+
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand cmd) {
278278
return new Answer(cmd, true, null);
279279
}
280280

‎plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
6161
import org.apache.cloudstack.framework.jobs.impl.AsyncJobManagerImpl;
6262
import org.apache.cloudstack.management.ManagementServerHost;
63-
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
63+
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
6464
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
6565
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
6666
import org.apache.cloudstack.utils.identity.ManagementServerNode;
@@ -1574,7 +1574,7 @@ public List<StoragePool> listVsphereStoragePolicyCompatibleStoragePools(ListVsph
15741574
continue;
15751575
}
15761576
Collections.shuffle(hostIds);
1577-
CheckDataStoreStoragePolicyComplainceCommand command = new CheckDataStoreStoragePolicyComplainceCommand(storagePolicy.getPolicyId(), storageFilerTO);
1577+
CheckDataStoreStoragePolicyComplianceCommand command = new CheckDataStoreStoragePolicyComplianceCommand(storagePolicy.getPolicyId(), storageFilerTO);
15781578
long targetHostId = hypervisorGuruManager.getGuruProcessedCommandTargetHost(hostIds.get(0), command);
15791579
try {
15801580
Answer answer = _agentMgr.send(targetHostId, command);

‎plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
3838
import org.apache.cloudstack.storage.command.AttachAnswer;
3939
import org.apache.cloudstack.storage.command.AttachCommand;
40-
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
40+
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
4141
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
4242
import org.apache.cloudstack.storage.command.CopyCommand;
4343
import org.apache.cloudstack.storage.command.CreateObjectAnswer;
@@ -3776,7 +3776,7 @@ public Answer handleDownloadTemplateToPrimaryStorage(DirectDownloadCommand cmd)
37763776
}
37773777

37783778
@Override
3779-
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand cmd) {
3779+
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand cmd) {
37803780
String primaryStorageNameLabel = cmd.getStoragePool().getUuid();
37813781
String storagePolicyId = cmd.getStoragePolicyId();
37823782
VmwareContext context = hostService.getServiceContext(cmd);
@@ -3792,14 +3792,14 @@ public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyC
37923792
DatastoreMO primaryDsMo = new DatastoreMO(hyperHost.getContext(), morPrimaryDs);
37933793
boolean isDatastoreStoragePolicyComplaint = primaryDsMo.isDatastoreStoragePolicyComplaint(storagePolicyId);
37943794

3795-
String failedMessage = String.format("DataStore %s is not complaince with storage policy id %s", primaryStorageNameLabel, storagePolicyId);
3795+
String failedMessage = String.format("DataStore %s is not compliance with storage policy id %s", primaryStorageNameLabel, storagePolicyId);
37963796
if (!isDatastoreStoragePolicyComplaint)
37973797
return new Answer(cmd, isDatastoreStoragePolicyComplaint, failedMessage);
37983798
else
37993799
return new Answer(cmd, isDatastoreStoragePolicyComplaint, null);
38003800
} catch (Throwable e) {
38013801
hostService.createLogMessageException(e, cmd);
3802-
String details = String.format("Exception while checking if datastore [%s] is storage policy [%s] complaince due to: [%s]", primaryStorageNameLabel, storagePolicyId, VmwareHelper.getExceptionMessage(e));
3802+
String details = String.format("Exception while checking if datastore [%s] is storage policy [%s] compliance due to: [%s]", primaryStorageNameLabel, storagePolicyId, VmwareHelper.getExceptionMessage(e));
38033803
return new Answer(cmd, false, details);
38043804
}
38053805
}

‎plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
3737
import org.apache.cloudstack.storage.command.AttachAnswer;
3838
import org.apache.cloudstack.storage.command.AttachCommand;
39-
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
39+
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
4040
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
4141
import org.apache.cloudstack.storage.command.CopyCommand;
4242
import org.apache.cloudstack.storage.command.CreateObjectAnswer;
@@ -221,8 +221,8 @@ public Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd) {
221221
}
222222

223223
@Override
224-
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand cmd) {
225-
logger.info("'CheckDataStoreStoragePolicyComplainceCommand' not applicable used for XenServerStorageProcessor");
224+
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand cmd) {
225+
logger.info("'CheckDataStoreStoragePolicyComplianceCommand' not applicable used for XenServerStorageProcessor");
226226
return new Answer(cmd,false,"Not applicable used for XenServerStorageProcessor");
227227
}
228228

0 commit comments

Comments
 (0)