[Engine-patches] Change in ovirt-engine[master]: gluster: Reuse Command methods

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: gluster: Reuse Command methods
......................................................................

gluster: Reuse Command methods

The perform few cleanups: using a class level method (getDbFacade())
instead of static access to DbFacade. In addition, it adds missing
default case to switch statements.

Change-Id: I05042649259efa596c255360174127335a4d8a1b
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeCommandBase.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommand.java
3 files changed, 7 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/10989/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java
index 5b766c6..36ee99a 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java
@@ -24,7 +24,6 @@
 import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
 import 
org.ovirt.engine.core.common.vdscommands.gluster.CreateGlusterVolumeVDSParameters;
 import org.ovirt.engine.core.dal.VdcBllMessages;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 
 /**
  * BLL command to create a new Gluster Volume
@@ -243,6 +242,8 @@
                 return false;
             }
             break;
+        default:
+            break;
         }
 
         return updateBrickServerNames(bricks, true);
@@ -258,7 +259,7 @@
         // volume fetched from VDSM doesn't contain cluster id as
         // GlusterFS is not aware of multiple clusters
         createdVolume.setClusterId(getVdsGroupId());
-        DbFacade.getInstance().getGlusterVolumeDao().save(createdVolume);
+        getGlusterVolumeDao().save(createdVolume);
     }
 
     @Override
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeCommandBase.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeCommandBase.java
index ddbd66c..61e7cde 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeCommandBase.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeCommandBase.java
@@ -11,7 +11,6 @@
 import 
org.ovirt.engine.core.common.businessentities.gluster.GlusterBrickEntity;
 import org.ovirt.engine.core.common.businessentities.gluster.GlusterStatus;
 import org.ovirt.engine.core.dal.VdcBllMessages;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 import org.ovirt.engine.core.dao.gluster.GlusterBrickDao;
 import org.ovirt.engine.core.dao.gluster.GlusterOptionDao;
 
@@ -27,11 +26,11 @@
     }
 
     protected GlusterBrickDao getGlusterBrickDao() {
-        return DbFacade.getInstance().getGlusterBrickDao();
+        return getDbFacade().getGlusterBrickDao();
     }
 
     protected GlusterOptionDao getGlusterOptionDao() {
-        return DbFacade.getInstance().getGlusterOptionDao();
+        return getDbFacade().getGlusterOptionDao();
     }
 
     @Override
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommand.java
index 22f9cfa..508c387 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommand.java
@@ -27,6 +27,8 @@
         case START:
             addCanDoActionMessage(VdcBllMessages.VAR__ACTION__START);
             break;
+        default:
+            break;
         }
         addCanDoActionMessage(VdcBllMessages.VAR__TYPE__GLUSTER_BRICK);
     }


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

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