Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove IllegalOperationException
......................................................................
core: Remove IllegalOperationException
Since IllegalOperationException is never caught directly, it can be
replaced with the standard Java IllegalArgumentException which carries
the exact same meaning and also extends RuntimeException.
Change-Id: Ib0505a889a60ea86e0473ed8651c1e47eee148c9
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperationFactory.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperationFactory.java
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/InvalidOperationException.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshPoolSingleAsyncOperationFactory.java
4 files changed, 8 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/22106/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperationFactory.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperationFactory.java
index 3abfab0..f1e2e1d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperationFactory.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateDeactivateSingleAsyncOperationFactory.java
@@ -28,19 +28,19 @@
@Override
public void initialize(ArrayList parameters) {
if (!(parameters.get(0) instanceof ArrayList)) {
- throw new InvalidOperationException();
+ throw new IllegalArgumentException();
}
ArrayList l = (ArrayList) parameters.get(0);
if (!l.isEmpty() && !(l.get(0) instanceof VDS)) {
- throw new InvalidOperationException();
+ throw new IllegalArgumentException();
}
_vdss = (ArrayList<VDS>) parameters.get(0);
if (parameters.get(1) != null && !(parameters.get(1) instanceof
StorageDomain)) {
- throw new InvalidOperationException();
+ throw new IllegalArgumentException();
}
_storageDomain = (StorageDomain) parameters.get(1);
if (!(parameters.get(2) instanceof StoragePool)) {
- throw new InvalidOperationException();
+ throw new IllegalArgumentException();
}
_storagePool = (StoragePool) parameters.get(2);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperationFactory.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperationFactory.java
index b1c4fcc..0763fd4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperationFactory.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperationFactory.java
@@ -17,11 +17,11 @@
public void initialize(java.util.ArrayList parameters) {
super.initialize(parameters);
if (!(parameters.get(3) instanceof Boolean)) {
- throw new InvalidOperationException();
+ throw new IllegalArgumentException();
}
_isLastMaster = (Boolean) (parameters.get(3));
if (!(parameters.get(4) instanceof Guid)) {
- throw new InvalidOperationException();
+ throw new IllegalArgumentException();
}
_newMasterStorageDomainId = (Guid) parameters.get(4);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/InvalidOperationException.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/InvalidOperationException.java
deleted file mode 100644
index 33d7d67..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/InvalidOperationException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.ovirt.engine.core.bll.storage;
-
-public class InvalidOperationException extends RuntimeException {
-
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshPoolSingleAsyncOperationFactory.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshPoolSingleAsyncOperationFactory.java
index aa37c4f..a84a33d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshPoolSingleAsyncOperationFactory.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshPoolSingleAsyncOperationFactory.java
@@ -12,11 +12,11 @@
public void initialize(ArrayList parameters) {
super.initialize(parameters);
if (!(parameters.get(3) instanceof java.util.ArrayList)) {
- throw new InvalidOperationException();
+ throw new IllegalArgumentException();
}
ArrayList l = (ArrayList) parameters.get(3);
if (!l.isEmpty() && !(l.get(0) instanceof Integer)) {
- throw new InvalidOperationException();
+ throw new IllegalArgumentException();
}
_vdsIdsToSetNonOperational = (ArrayList<Guid>) parameters.get(3);
}
--
To view, visit http://gerrit.ovirt.org/22106
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0505a889a60ea86e0473ed8651c1e47eee148c9
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
