Tal Nisan has uploaded a new change for review.
Change subject: core: Change CommandBase validate method to accept multiple
results
......................................................................
core: Change CommandBase validate method to accept multiple results
Change-Id: I64a18ec0e6c677192dbd86bf0b38de46e539d138
Signed-off-by: Tal Nisan <tni...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
2 files changed, 20 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/11557/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
index 9789194..e4672e3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
@@ -144,11 +144,11 @@
storage_pool sp = getStoragePool(); // Note this is done according
to the VM's spId.
returnValue =
validate(new StoragePoolValidator(sp).isUp()) &&
- isStoragePoolMatching(vm) &&
- performImagesChecks(vm.getStoragePoolId()) &&
-
validate(getSnapshotValidator().vmNotDuringSnapshot(vm.getId())) &&
-
validate(getSnapshotValidator().vmNotInPreview(vm.getId())) &&
- validate(new VmValidator(vm).vmNotLocked());
+ isStoragePoolMatching(vm) &&
+ performImagesChecks(vm.getStoragePoolId()) &&
+
validate(getSnapshotValidator().vmNotDuringSnapshot(vm.getId()),
+
getSnapshotValidator().vmNotInPreview(vm.getId()),
+ new VmValidator(vm).vmNotLocked());
}
return returnValue;
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 3c83ab8..6093742 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
@@ -1488,29 +1488,31 @@
/**
* Use for call chaining of validation commands, so that their result will
be validated and kept in the messages if
- * the validation had failed.<br>
+ * the validations had failed.<br>
* <br>
* <b>Example:</b>
*
* <pre>
- * boolean isValid = validate(SomeValidator.validateSomething(param1,
param2, ...));
+ * boolean isValid = validate(Validator1.validateSomething(param1, param2,
...), Validator2.validateSomethingElse(param1...));
* </pre>
*
- * @param validationResult
- * The validation result from the inline call to validate.
- * @return <code>true</code> if the validation was successful, and
<code>false</code> if it wasn't.
+ * @param validationResults
+ * The validation results from the inline call to validate,
should not be <code>null</code>.
+ * @return <code>true</code> if the validations were successful, and
<code>false</code> if one or more wasn't.
*/
- protected boolean validate(ValidationResult validationResult) {
- if (!validationResult.isValid()) {
- addCanDoActionMessage(validationResult.getMessage());
- if (validationResult.getVariableReplacements() != null) {
- for (String variableReplacement :
validationResult.getVariableReplacements()) {
- addCanDoActionMessage(variableReplacement);
+ protected boolean validate(ValidationResult... validationResults) {
+ for (ValidationResult validationResult : validationResults) {
+ if (!validationResult.isValid()) {
+ addCanDoActionMessage(validationResult.getMessage());
+ if (validationResult.getVariableReplacements() != null) {
+ for (String variableReplacement :
validationResult.getVariableReplacements()) {
+ addCanDoActionMessage(variableReplacement);
+ }
}
+ return false;
}
}
-
- return validationResult.isValid();
+ return true;
}
/**
--
To view, visit http://gerrit.ovirt.org/11557
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I64a18ec0e6c677192dbd86bf0b38de46e539d138
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tni...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
