[Engine-patches] Change in ovirt-engine[master]: engine: Fix ValidationResult

[mkolesni]

Mike Kolesnik has uploaded a new change for review.

Change subject: engine: Fix ValidationResult
......................................................................

engine: Fix ValidationResult

1. Changed equals not to use instanceof since class is final.
2. Added variable replacements to the TSEHC (toString/equals/hashCode)
   methods since it's part of the object's identity.

Change-Id: I6faefd9926c241055fc4957ce3c639308ef5833f
Signed-off-by: Mike Kolesnik <mkole...@redhat.com>
---
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/VmNicValidator.java
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmNicValidatorTest.java
3 files changed, 24 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/11834/1

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 111e174..f1ae592 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
@@ -104,6 +104,7 @@
         final int prime = 31;
         int result = 1;
         result = prime * result + ((getMessage() == null) ? 0 : 
getMessage().hashCode());
+        result = prime * result + ((getVariableReplacements() == null) ? 0 : 
getVariableReplacements().hashCode());
         return result;
     }
 
@@ -113,10 +114,15 @@
             return true;
         if (obj == null)
             return false;
-        if (!(obj instanceof ValidationResult))
+        if (getClass() != obj.getClass())
             return false;
         ValidationResult other = (ValidationResult) obj;
         if (getMessage() != other.getMessage())
+            return false;
+        if (getVariableReplacements() == null) {
+            if (other.getVariableReplacements() != null)
+                return false;
+        } else if 
(!getVariableReplacements().equals(other.getVariableReplacements()))
             return false;
         return true;
     }
@@ -126,6 +132,8 @@
         StringBuilder builder = new StringBuilder();
         builder.append("ValidationResult [message=")
                 .append(getMessage())
+                .append(", variableReplacements=")
+                .append(getVariableReplacements())
                 .append("]");
         return builder.toString();
     }
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmNicValidator.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmNicValidator.java
index 2d5e694..9c435e4 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmNicValidator.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmNicValidator.java
@@ -11,6 +11,8 @@
  */
 public class VmNicValidator {
 
+    protected static final String CLUSTER_VERSION_REPLACEMENT_FORMAT = 
"$clusterVersion %s";
+
     protected VmNetworkInterface nic;
 
     protected Version version;
@@ -48,6 +50,6 @@
     }
 
     protected String clusterVersion() {
-        return String.format("$clusterVersion %s", version.getValue());
+        return String.format(CLUSTER_VERSION_REPLACEMENT_FORMAT, 
version.getValue());
     }
 }
diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmNicValidatorTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmNicValidatorTest.java
index 264430c..8563e81 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmNicValidatorTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmNicValidatorTest.java
@@ -19,6 +19,11 @@
 @RunWith(MockitoJUnitRunner.class)
 public class VmNicValidatorTest {
 
+    private static final String CLUSTER_VERSION = "7";
+
+    private static final String CLUSTER_VERSION_REPLACEMENT =
+            String.format(VmNicValidator.CLUSTER_VERSION_REPLACEMENT_FORMAT, 
CLUSTER_VERSION);
+
     @Rule
     public MockConfigRule mockConfigRule = new MockConfigRule();
 
@@ -32,14 +37,16 @@
 
     @Before
     public void setup() {
-        when(version.getValue()).thenReturn(null);
+        when(version.getValue()).thenReturn(CLUSTER_VERSION);
 
         validator = new VmNicValidator(nic, version);
     }
 
     @Test
     public void unlinkedWhenUnlinkingNotSupported() throws Exception {
-        unlinkingTest(new 
ValidationResult(VdcBllMessages.UNLINKING_IS_NOT_SUPPORTED), false, false);
+        unlinkingTest(new 
ValidationResult(VdcBllMessages.UNLINKING_IS_NOT_SUPPORTED, 
CLUSTER_VERSION_REPLACEMENT),
+                false,
+                false);
     }
 
     @Test
@@ -59,7 +66,9 @@
 
     @Test
     public void nullNetworkNameWhenUnlinkingNotSupported() throws Exception {
-        networkNameTest(new 
ValidationResult(VdcBllMessages.NULL_NETWORK_IS_NOT_SUPPORTED), false, null);
+        networkNameTest(new 
ValidationResult(VdcBllMessages.NULL_NETWORK_IS_NOT_SUPPORTED, 
CLUSTER_VERSION_REPLACEMENT),
+                false,
+                null);
     }
 
     @Test


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

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