Alissa Bonas has uploaded a new change for review.
Change subject: core: rename methods to start with small letter
......................................................................
core: rename methods to start with small letter
Rename methods in storage related commands to start
with small letters according to Java conventions
Change-Id: I2b69a96a8f229fe79958cb24d6334ebd224f4859
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingNFSStorageDomainCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddSANStorageDomainCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java
4 files changed, 28 insertions(+), 28 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/94/12694/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingNFSStorageDomainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingNFSStorageDomainCommand.java
index 9cbc743..621e756 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingNFSStorageDomainCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingNFSStorageDomainCommand.java
@@ -29,8 +29,8 @@
}
@Override
- protected boolean CanAddDomain() {
- return CheckExistingStorageDomain();
+ protected boolean canAddDomain() {
+ return checkExistingStorageDomain();
}
@Override
@@ -44,13 +44,13 @@
new
StorageServerConnectionParametersBase(getStorageDomain().getStorageStaticData()
.getConnection(),
getVds().getId())).getActionReturnValue());
}
- AddStorageDomainInDb();
- UpdateStorageDomainDynamicFromIrs();
+ addStorageDomainInDb();
+ updateStorageDomainDynamicFromIrs();
setSucceeded(true);
}
@Override
- protected boolean
ConcreteCheckExistingStorageDomain(Pair<StorageDomainStatic, SANState> domain) {
+ protected boolean
concreteCheckExistingStorageDomain(Pair<StorageDomainStatic, SANState> domain) {
boolean returnValue = false;
StorageDomainStatic domainFromIrs = domain.getFirst();
if
(StringUtils.isEmpty(getStorageDomain().getStorageStaticData().getStorage())
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddSANStorageDomainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddSANStorageDomainCommand.java
index 0f113ac..a82db90 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddSANStorageDomainCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddSANStorageDomainCommand.java
@@ -33,27 +33,27 @@
@Override
protected void executeCommand() {
- InitializeStorageDomain();
+ initializeStorageDomain();
// save storage if got from parameters in order to save first empty
// storage in db and use it later
String storage = ((getStorageDomain().getStorage()) != null) ?
getStorageDomain().getStorage() : "";
// set domain storage to empty because not nullable in db and for
shared
// status to be locked
getStorageDomain().setStorage("");
- AddStorageDomainInDb();
+ addStorageDomainInDb();
getStorageDomain().setStorage(storage);
if (StringUtils.isEmpty(getStorageDomain().getStorage())) {
- getStorageDomain().setStorage(CreateVG());
+ getStorageDomain().setStorage(createVG());
}
- if (StringUtils.isNotEmpty(getStorageDomain().getStorage()) &&
(AddStorageDomainInIrs())) {
+ if (StringUtils.isNotEmpty(getStorageDomain().getStorage()) &&
(addStorageDomainInIrs())) {
DbFacade.getInstance().getStorageDomainStaticDao().update(getStorageDomain().getStorageStaticData());
- UpdateStorageDomainDynamicFromIrs();
- ProceedVGLunsInDb();
+ updateStorageDomainDynamicFromIrs();
+ proceedVGLunsInDb();
setSucceeded(true);
}
}
- protected void ProceedVGLunsInDb() {
+ protected void proceedVGLunsInDb() {
final ArrayList<LUNs> luns = (ArrayList<LUNs>) Backend
.getInstance()
.getResourceManager()
@@ -73,7 +73,7 @@
}
- private String CreateVG() {
+ private String createVG() {
VDSReturnValue returnValue = Backend
.getInstance()
.getResourceManager()
@@ -87,7 +87,7 @@
}
@Override
- protected boolean CanAddDomain() {
+ protected boolean canAddDomain() {
// !AddSANStorageDomainParametersValue.IsExistingStorageDomain &&
if (((getParameters().getLunIds() == null ||
getParameters().getLunIds().isEmpty()) && StringUtils
.isEmpty(getStorageDomain().getStorage()))) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java
index 01fe9f3..5c90c83 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java
@@ -48,11 +48,11 @@
super(commandId);
}
- protected void InitializeStorageDomain() {
+ protected void initializeStorageDomain() {
getStorageDomain().setId(Guid.NewGuid());
}
- protected boolean AddStorageDomainInIrs() {
+ protected boolean addStorageDomainInIrs() {
// No need to run in separate transaction - counting on rollback of
external transaction wrapping the command
return Backend
.getInstance()
@@ -63,7 +63,7 @@
.getStorageStaticData(),
getStorageArgs())).getSucceeded();
}
- protected void AddStorageDomainInDb() {
+ protected void addStorageDomainInDb() {
TransactionSupport.executeInNewTransaction(new
TransactionMethod<Void>() {
@Override
public Void runInTransaction() {
@@ -80,7 +80,7 @@
});
}
- protected void UpdateStorageDomainDynamicFromIrs() {
+ protected void updateStorageDomainDynamicFromIrs() {
final StorageDomain sd =
(StorageDomain) Backend
.getInstance()
@@ -102,10 +102,10 @@
@Override
protected void executeCommand() {
- InitializeStorageDomain();
- AddStorageDomainInDb();
- if (AddStorageDomainInIrs()) {
- UpdateStorageDomainDynamicFromIrs();
+ initializeStorageDomain();
+ addStorageDomainInDb();
+ if (addStorageDomainInIrs()) {
+ updateStorageDomainDynamicFromIrs();
setSucceeded(true);
}
}
@@ -146,7 +146,7 @@
String.format("$storageFormat %1$s",
getStorageDomain().getStorageFormat().toString()));
returnValue = false;
}
- return returnValue && CanAddDomain();
+ return returnValue && canAddDomain();
}
private boolean isStorageFormatSupportedByStoragePool() {
@@ -190,7 +190,7 @@
return true;
}
- protected boolean CheckExistingStorageDomain() {
+ protected boolean checkExistingStorageDomain() {
boolean returnValue = true;
// prevent importing DATA domain
if (getParameters().getStorageDomain().getStorageDomainType() ==
StorageDomainType.Data) {
@@ -227,13 +227,13 @@
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_CANNOT_CHANGE_STORAGE_DOMAIN_TYPE);
returnValue = false;
}
- returnValue = returnValue &&
ConcreteCheckExistingStorageDomain(domainFromIrs);
+ returnValue = returnValue &&
concreteCheckExistingStorageDomain(domainFromIrs);
}
}
return returnValue;
}
- protected boolean
ConcreteCheckExistingStorageDomain(Pair<StorageDomainStatic, SANState>
domainFromIrs) {
+ protected boolean
concreteCheckExistingStorageDomain(Pair<StorageDomainStatic, SANState>
domainFromIrs) {
return true;
}
@@ -241,7 +241,7 @@
return getStorageDomain().getStorage();
}
- protected abstract boolean CanAddDomain();
+ protected abstract boolean canAddDomain();
@Override
public List<PermissionSubject> getPermissionCheckSubjects() {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java
index 4ca6507..88ca637 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java
@@ -20,7 +20,7 @@
}
@Override
- protected boolean CanAddDomain() {
+ protected boolean canAddDomain() {
return checkStorageConnection(getStorageDomain().getStorage());
}
--
To view, visit http://gerrit.ovirt.org/12694
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b69a96a8f229fe79958cb24d6334ebd224f4859
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
