[Engine-patches] Change in ovirt-engine[master]: engine: Use direct dao getter instead blown method

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: engine: Use direct dao getter instead blown method
......................................................................

engine: Use direct dao getter instead blown method

Instead of the blown method to obtain dao, i.e.
DbFacade.getInstance().getXXXDao() use getXXXDao().

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/36175/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
index d60e24f..c6dd642 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
@@ -21,7 +21,6 @@
 import org.ovirt.engine.core.common.gluster.GlusterFeatureSupported;
 import org.ovirt.engine.core.common.validation.group.CreateEntity;
 import org.ovirt.engine.core.compat.Version;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 import org.ovirt.engine.core.utils.NetworkUtils;
 import org.ovirt.engine.core.utils.linq.LinqUtils;
 import org.ovirt.engine.core.utils.linq.Predicate;
@@ -42,18 +41,15 @@
 
         checkMaxMemoryOverCommitValue();
         getVdsGroup().setDetectEmulatedMachine(true);
-        DbFacade.getInstance().getVdsGroupDao().save(getVdsGroup());
+        getVdsGroupDAO().save(getVdsGroup());
 
         alertIfFencingDisabled();
 
         // add default network
         if (getParameters().getVdsGroup().getStoragePoolId() != null) {
             final String networkName = NetworkUtils.getEngineNetwork();
-            List<Network> networks = DbFacade
-                    .getInstance()
-                    .getNetworkDao()
-                    .getAllForDataCenter(
-                            getParameters().getVdsGroup().getStoragePoolId());
+            List<Network> networks =
+                    
getNetworkDAO().getAllForDataCenter(getParameters().getVdsGroup().getStoragePoolId());
 
             Network net = LinqUtils.firstOrNull(networks, new 
Predicate<Network>() {
                 @Override
@@ -62,9 +58,12 @@
                 }
             });
             if (net != null) {
-                DbFacade.getInstance().getNetworkClusterDao().save(
-                        new 
NetworkCluster(getParameters().getVdsGroup().getId(), net.getId(),
-                                NetworkStatus.OPERATIONAL, true, true, true));
+                getNetworkClusterDAO().save(new 
NetworkCluster(getParameters().getVdsGroup().getId(),
+                        net.getId(),
+                        NetworkStatus.OPERATIONAL,
+                        true,
+                        true,
+                        true));
             }
         }
 
@@ -116,8 +115,7 @@
         }
 
         if (result && getVdsGroup().getStoragePoolId() != null) {
-            StoragePool storagePool = 
DbFacade.getInstance().getStoragePoolDao().get(
-                    getVdsGroup().getStoragePoolId());
+            StoragePool storagePool = 
getStoragePoolDAO().get(getVdsGroup().getStoragePoolId());
             // Making sure the given SP ID is valid to prevent
             // breaking Fk_vds_groups_storage_pool_id
             if (storagePool == null) {
@@ -127,9 +125,7 @@
                 result = false;
             } else if (storagePool.isLocal()) {
                 // we allow only one cluster in localfs data center
-                if (!DbFacade.getInstance()
-                        
.getVdsGroupDao().getAllForStoragePool(getVdsGroup().getStoragePoolId())
-                        .isEmpty()) {
+                if 
(!getVdsGroupDAO().getAllForStoragePool(getVdsGroup().getStoragePoolId()).isEmpty())
 {
                     getReturnValue().getCanDoActionMessages().add(
                             
VdcBllMessages.VDS_GROUP_CANNOT_ADD_MORE_THEN_ONE_HOST_TO_LOCAL_STORAGE
                                     .toString());


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I325a9280a96adc5282b6088097c94257017465dd
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