[Engine-patches] Change in ovirt-engine[master]: engine: Refactoring nested-if statements

[ahadas]

Arik Hadas has uploaded a new change for review.

Change subject: engine: Refactoring nested-if statements
......................................................................

engine: Refactoring nested-if statements

Changed nested-if statements in MigrateVmCommand#getAuditLogTypeValue
and RunVmCommand#getAuditLogTypeValue methods to a more readable
structure.

Change-Id: I3d28bd2813a69ab4968ac76927f892fccad20164
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
2 files changed, 20 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/9186/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java
index 36ff593..14941cf 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java
@@ -143,10 +143,14 @@
         // all good, succeeded and the vm is up
         // succeeded false, rerun
         // succeeded false, rerun false = migration failed
-        return getSucceeded() ? getActionReturnValue() == VMStatus.Up ? 
AuditLogType.VM_MIGRATION_DONE
-                :startMessage
-                : _isRerun ? AuditLogType.VM_MIGRATION_TRYING_RERUN
-                        : getVds().getstatus() == 
VDSStatus.PreparingForMaintenance ? 
AuditLogType.VM_MIGRATION_FAILED_DURING_MOVE_TO_MAINTANANCE
+        return getSucceeded() ?
+                getActionReturnValue() == VMStatus.Up ?
+                        AuditLogType.VM_MIGRATION_DONE
+                        : startMessage
+                : _isRerun ?
+                        AuditLogType.VM_MIGRATION_TRYING_RERUN
+                        : getVds().getstatus() == 
VDSStatus.PreparingForMaintenance ?
+                                
AuditLogType.VM_MIGRATION_FAILED_DURING_MOVE_TO_MAINTANANCE
                                 : AuditLogType.VM_MIGRATION_FAILED;
     }
 
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
index 97b6d41..90f0b43 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
@@ -445,13 +445,18 @@
             } else if (getParameters() != null && 
getParameters().getIsInternal()) {
                 return getSucceeded() ? AuditLogType.VDS_INITIATED_RUN_VM : 
AuditLogType.VDS_INITIATED_RUN_VM_FAILED;
             } else {
-                return getSucceeded() ? (VMStatus) getActionReturnValue() == 
VMStatus.Up ? (getParameters() != null
-                        && getParameters().getDestinationVdsId() == null && 
getVm().getdedicated_vm_for_vds() != null && !getVm()
-                        
.getrun_on_vds().equals(getVm().getdedicated_vm_for_vds())) ? 
AuditLogType.USER_RUN_VM_ON_NON_DEFAULT_VDS
-                        : AuditLogType.USER_RUN_VM
-                        : _isRerun ? AuditLogType.VDS_INITIATED_RUN_VM
-                                : getTaskIdList().size() > 0 ? 
AuditLogType.USER_INITIATED_RUN_VM
-                                        : AuditLogType.USER_STARTED_VM
+                return getSucceeded() ?
+                        (VMStatus) getActionReturnValue() == VMStatus.Up ?
+                                getParameters() != null && 
getParameters().getDestinationVdsId() == null
+                                        && getVm().getdedicated_vm_for_vds() 
!= null
+                                        && 
!getVm().getrun_on_vds().equals(getVm().getdedicated_vm_for_vds()) ?
+                                        
AuditLogType.USER_RUN_VM_ON_NON_DEFAULT_VDS
+                                        : AuditLogType.USER_RUN_VM
+                                : _isRerun ?
+                                        AuditLogType.VDS_INITIATED_RUN_VM
+                                        : getTaskIdList().size() > 0 ?
+                                                
AuditLogType.USER_INITIATED_RUN_VM
+                                                : AuditLogType.USER_STARTED_VM
                         : _isRerun ? AuditLogType.USER_INITIATED_RUN_VM_FAILED 
: AuditLogType.USER_FAILED_RUN_VM;
             }
 


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

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