[Engine-patches] Change in ovirt-engine[master]: core: Renamed the Method getStorageDomainByTypeAndPool

[ishaby]

Idan Shaby has uploaded a new change for review.

Change subject: core: Renamed the Method getStorageDomainByTypeAndPool
......................................................................

core: Renamed the Method getStorageDomainByTypeAndPool

The method's parameters types are clear enough, so there's no need to
include them also in the method's name.

Change-Id: Iffc63c3a22488e459be3c9beac9dd5d0163f0d12
Signed-off-by: Idan Shaby <ish...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
M 
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java
4 files changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/34029/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
index 73b4680..764b77b 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
@@ -243,7 +243,7 @@
     private EventResult runConnectHostToPoolEvent(final Guid storagePoolId, 
final VDS vds) {
         EventResult result = new EventResult(true, EventType.VDSCONNECTTOPOOL);
         StoragePool storagePool = getStoragePoolDAO().get(storagePoolId);
-        StorageDomain masterDomain = 
getStorageDomainDAO().getStorageDomainByTypeAndPool(storagePoolId, 
StorageDomainType.Master);
+        StorageDomain masterDomain = 
getStorageDomainDAO().getStorageDomain(storagePoolId, StorageDomainType.Master);
         List<StoragePoolIsoMap> storagePoolIsoMap = 
getStoragePoolIsoMapDAO().getAllForStoragePool(storagePoolId);
         boolean masterDomainInactiveOrUnknown = masterDomain.getStatus() == 
StorageDomainStatus.Inactive
                 || masterDomain.getStatus() == StorageDomainStatus.Unknown;
diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java
index 8058674..b2657a9 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java
@@ -31,7 +31,7 @@
      *            the storage domain type
      * @return the master storage domain
      */
-    StorageDomain getStorageDomainByTypeAndPool(Guid pool, StorageDomainType 
type);
+    StorageDomain getStorageDomain(Guid pool, StorageDomainType type);
 
     /**
      * Retrieves the master storage domain for the specified pool.
diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
index 80fbe89..aa62186 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
@@ -27,7 +27,7 @@
     }
 
     @Override
-    public StorageDomain getStorageDomainByTypeAndPool(Guid pool, 
StorageDomainType type) {
+    public StorageDomain getStorageDomain(Guid pool, StorageDomainType type) {
         return 
getCallsHandler().executeRead("Getstorage_domain_by_type_and_storagePoolId",
                 StorageDomainRowMapper.instance,
                 getCustomMapSqlParameterSource()
@@ -221,7 +221,7 @@
      */
     private Guid getStorageDomainIdForPoolByType(Guid pool, StorageDomainType 
type) {
         Guid returnValue = Guid.Empty;
-        StorageDomain domain = getStorageDomainByTypeAndPool(pool, type);
+        StorageDomain domain = getStorageDomain(pool, type);
         if (domain != null) {
             returnValue = domain.getId();
         }
diff --git 
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java
 
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java
index 70f6696..be04987 100644
--- 
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java
+++ 
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java
@@ -56,7 +56,8 @@
 
     @Test
     public void testGetstorage_domain_by_type_for_storagePoolId() {
-        StorageDomain result = dao.getStorageDomainByTypeAndPool(new 
Guid("6d849ebf-755f-4552-ad09-9a090cda105d"), StorageDomainType.Master);
+        StorageDomain result = dao.getStorageDomain(new 
Guid("6d849ebf-755f-4552-ad09-9a090cda105d"),
+                StorageDomainType.Master);
 
         assertNotNull(result);
         assertGetResult(result);


-- 
To view, visit http://gerrit.ovirt.org/34029
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffc63c3a22488e459be3c9beac9dd5d0163f0d12
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Idan Shaby <ish...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches