[Engine-patches] Change in ovirt-engine[master]: engine: cleanup static access

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: engine: cleanup static access
......................................................................

engine: cleanup static access

The patch replaces a static access to the DbFacade.getInstance()
 with a class level method (CommandBase.getDbFacade()).

Change-Id: Ib22c075fe17d30da32ec28a5f24c9e196dd729a4
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java
1 file changed, 7 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/88/16788/1

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 9675b47..1aaf2b7 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
@@ -35,7 +35,6 @@
 import org.ovirt.engine.core.common.vdscommands.IrsBaseVDSCommandParameters;
 import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
 import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 import org.ovirt.engine.core.utils.ISingleAsyncOperation;
 import org.ovirt.engine.core.utils.SyncronizeNumberOfAsyncOperations;
 import org.ovirt.engine.core.utils.linq.LinqUtils;
@@ -63,8 +62,7 @@
         /**
          * Detach master storage domain last.
          */
-        List<StorageDomain> storageDomains = 
DbFacade.getInstance().getStorageDomainDao().getAllForStoragePool(
-                    getStoragePool().getId());
+        List<StorageDomain> storageDomains = 
getStorageDomainDAO().getAllForStoragePool(getStoragePool().getId());
         Collections.sort(storageDomains, new Comparator<StorageDomain>() {
             @Override
             public int compare(StorageDomain o1, StorageDomain o2) {
@@ -94,11 +92,10 @@
 
             @Override
             public Void runInTransaction() {
-                final List<Network> networks = 
DbFacade.getInstance().getNetworkDao()
-                        .getAllForDataCenter(getStoragePoolId());
+                final List<Network> networks = 
getNetworkDAO().getAllForDataCenter(getStoragePoolId());
                 for (final Network net : networks) {
                     getCompensationContext().snapshotEntity(net);
-                    DbFacade.getInstance().getNetworkDao().remove(net.getId());
+                    getNetworkDAO().remove(net.getId());
                 }
                 getCompensationContext().stateChanged();
                 return null;
@@ -138,9 +135,7 @@
             public Void runInTransaction() {
                 
getCompensationContext().snapshotEntity(masterDomain.getStoragePoolIsoMapData());
                 masterDomain.setStatus(StorageDomainStatus.Locked);
-                DbFacade.getInstance()
-                        .getStoragePoolIsoMapDao()
-                        .update(masterDomain.getStoragePoolIsoMapData());
+                
getDbFacade().getStoragePoolIsoMapDao().update(masterDomain.getStoragePoolIsoMapData());
                 getCompensationContext().stateChanged();
                 return null;
             }
@@ -170,7 +165,7 @@
             public Void runInTransaction() {
                 
getCompensationContext().snapshotEntity(masterDomain.getStorageStaticData());
                 masterDomain.setStorageDomainType(StorageDomainType.Data);
-                
DbFacade.getInstance().getStorageDomainStaticDao().update(masterDomain.getStorageStaticData());
+                
getDbFacade().getStorageDomainStaticDao().update(masterDomain.getStorageStaticData());
                 getCompensationContext().stateChanged();
                 return null;
             }
@@ -250,7 +245,7 @@
                 // as it will be impossible to remove it.
                 
StorageHelperDirector.getInstance().getItem(domain.getStorageType())
                         .storageDomainRemoved(domain.getStorageStaticData());
-                
DbFacade.getInstance().getStorageDomainDao().remove(domain.getId());
+                getStorageDomainDAO().remove(domain.getId());
                 return null;
             }
         });
@@ -315,10 +310,7 @@
             for (StorageDomain domain : poolDomains) {
                 // check that there are no images on data domains
                 if ((domain.getStorageDomainType() == StorageDomainType.Data 
|| domain.getStorageDomainType() == StorageDomainType.Master)
-                        && DbFacade.getInstance()
-                                .getDiskImageDao()
-                                
.getAllSnapshotsForStorageDomain(domain.getId())
-                                .size() != 0) {
+                        && 
getDbFacade().getDiskImageDao().getAllSnapshotsForStorageDomain(domain.getId()).size()
 != 0) {
                     return 
failCanDoAction(VdcBllMessages.ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_IMAGES);
                 }
             }


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

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