[Engine-patches] Change in ovirt-engine[master]: core: remove possiblity of replacements being null

[mmucha]

Martin Mucha has uploaded a new change for review.

Change subject: core: remove possiblity of replacements being null
......................................................................

core: remove possiblity of replacements being null

otherwise every caller would have check for nullity (which was
violated), and such testing is not needed at all, since this field can
be properly initialized every time.

Change-Id: Ice3c566c4e77204c3d6eb0e2b24ec68210cbc8d7
Signed-off-by: Martin Mucha <mmu...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ValidationResult.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
3 files changed, 12 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/35124/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
index d3a76ac..2892f50 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
@@ -1955,10 +1955,9 @@
     protected boolean validate(ValidationResult validationResult) {
         if (!validationResult.isValid()) {
             addCanDoActionMessage(validationResult.getMessage());
-            if (validationResult.getVariableReplacements() != null) {
-                for (String variableReplacement : 
validationResult.getVariableReplacements()) {
-                    addCanDoActionMessage(variableReplacement);
-                }
+
+            for (String variableReplacement : 
validationResult.getVariableReplacements()) {
+                addCanDoActionMessage(variableReplacement);
             }
         }
 
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ValidationResult.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ValidationResult.java
index e09f619..72b3c77 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ValidationResult.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ValidationResult.java
@@ -27,7 +27,7 @@
     /**
      * If there are any replacements for variables in the message, they can be 
set here.
      */
-    private List<String> variableReplacements;
+    private final List<String> variableReplacements;
 
     /**
      * Default validation result is success with no message.
@@ -35,6 +35,7 @@
      */
     private ValidationResult() {
         message = null;
+        variableReplacements = Collections.emptyList();
     }
 
     /**
@@ -52,9 +53,9 @@
         }
 
         this.message = message;
-        if (variableReplacements != null) {
-            this.variableReplacements = 
Collections.unmodifiableList(Arrays.asList(variableReplacements));
-        }
+        this.variableReplacements = variableReplacements == null ?
+                Collections.<String>emptyList() :
+                
Collections.unmodifiableList(Arrays.asList(variableReplacements));
     }
 
     /**
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
index bc7a918..2889f5a 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
@@ -436,11 +436,11 @@
     protected boolean validate(ValidationResult validationResult, List<String> 
message) {
         if (!validationResult.isValid()) {
             message.add(validationResult.getMessage().name());
-            if (validationResult.getVariableReplacements() != null) {
-                for (String variableReplacement : 
validationResult.getVariableReplacements()) {
-                    message.add(variableReplacement);
-                }
+
+            for (String variableReplacement : 
validationResult.getVariableReplacements()) {
+                message.add(variableReplacement);
             }
+
         }
         return validationResult.isValid();
     }


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

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