Maor Lipchuk has uploaded a new change for review.
Change subject: core:StorageHelper Cleanup, method name standard(9).
......................................................................
core:StorageHelper Cleanup, method name standard(9).
Change method name storageDomainRemoved to be
compatible with the java standards.
Change-Id: I42f28cfaa8b37c2b38e2f9e73ee0385eaac5ca31
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
9 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/10134/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
index ca5123b..ac12759 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java
@@ -77,7 +77,7 @@
}
@Override
- public boolean StorageDomainRemoved(storage_domain_static storageDomain) {
+ public boolean storageDomainRemoved(storage_domain_static storageDomain) {
storage_server_connections connection =
DbFacade.getInstance().getStorageServerConnectionDao().get(storageDomain.getstorage());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java
index 64cbf96..5b04f0f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java
@@ -31,7 +31,7 @@
}
@Override
- public boolean StorageDomainRemoved(storage_domain_static storageDomain) {
+ public boolean storageDomainRemoved(storage_domain_static storageDomain) {
removeStorageDomainLuns(storageDomain);
return true;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.java
index cedf064..477e303 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ForceRemoveStorageDomainCommand.java
@@ -51,7 +51,7 @@
}
StorageHelperDirector.getInstance().getItem(getStorageDomain().getstorage_type())
-
.StorageDomainRemoved(getStorageDomain().getStorageStaticData());
+
.storageDomainRemoved(getStorageDomain().getStorageStaticData());
DbFacade.getInstance().getStorageDomainDao().remove(getStorageDomain().getId());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
index a2d1873..02d548d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
@@ -187,7 +187,7 @@
}
@Override
- public boolean StorageDomainRemoved(storage_domain_static storageDomain) {
+ public boolean storageDomainRemoved(storage_domain_static storageDomain) {
int numOfRemovedLuns = removeStorageDomainLuns(storageDomain);
if (numOfRemovedLuns > 0) {
List<storage_server_connections> list = DbFacade.getInstance()
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java
index 5a1d0f2..712fbaa 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java
@@ -23,7 +23,7 @@
boolean disconnectStorageFromLunByVdsId(storage_domains storageDomain,
Guid vdsId, LUNs lun);
- boolean StorageDomainRemoved(storage_domain_static storageDomain);
+ boolean storageDomainRemoved(storage_domain_static storageDomain);
void removeLun(LUNs lun);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
index 044410f..73e5135 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainCommand.java
@@ -58,7 +58,7 @@
executeInNewTransaction(new TransactionMethod<Object>() {
@Override
public Object runInTransaction() {
-
getStorageHelper(dom).StorageDomainRemoved(dom.getStorageStaticData());
+
getStorageHelper(dom).storageDomainRemoved(dom.getStorageStaticData());
getDbFacade().getStorageDomainDynamicDao().remove(dom.getId());
getDbFacade().getStorageDomainStaticDao().remove(dom.getId());
return null;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java
index 5f72bc3..584e6eb 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java
@@ -252,7 +252,7 @@
// problems if a domain got deleted in VDSM and not in backend
// as it will be impossible to remove it.
StorageHelperDirector.getInstance().getItem(domain.getstorage_type())
- .StorageDomainRemoved(domain.getStorageStaticData());
+ .storageDomainRemoved(domain.getStorageStaticData());
DbFacade.getInstance().getStorageDomainDao().remove(domain.getId());
return null;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
index f3dd4c1..f17c15e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
@@ -73,7 +73,7 @@
}
@Override
- public boolean StorageDomainRemoved(storage_domain_static storageDomain) {
+ public boolean storageDomainRemoved(storage_domain_static storageDomain) {
return true;
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
index 609f828..fe2ba28 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/RemoveStorageDomainTest.java
@@ -164,7 +164,7 @@
when(helper.disconnectStorageFromDomainByVdsId(dom,
VDS_ID)).thenReturn(true);
}
if (!failure) {
-
when(helper.StorageDomainRemoved(dom.getStorageStaticData())).thenReturn(true);
+
when(helper.storageDomainRemoved(dom.getStorageStaticData())).thenReturn(true);
}
doReturn(helper).when(cmd).getStorageHelper(dom);
}
--
To view, visit http://gerrit.ovirt.org/10134
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42f28cfaa8b37c2b38e2f9e73ee0385eaac5ca31
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
