Tal Nisan has uploaded a new change for review.
Change subject: core: Remove CompatException class and it's usages
......................................................................
core: Remove CompatException class and it's usages
Change-Id: I726e0f9e7fb0c9bff00b8d510dc3907d202e0fa2
Signed-off-by: Tal Nisan <tni...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java
D
backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/CompatException.java
M
backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java
M
backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TypeCompat.java
M
backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TimeSpanTest.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/FileUtil.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
M
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml
M
frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/EnumCompat.java
M
frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/TimeSpan.java
10 files changed, 21 insertions(+), 102 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/12430/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java
index 459fe8c..98b189e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java
@@ -1,5 +1,7 @@
package org.ovirt.engine.core.bll;
+import java.io.IOException;
+
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.utils.FileUtil;
@@ -14,7 +16,12 @@
getQueryReturnValue().setSucceeded(false);
String path = Config.resolveCACertificatePath();
if (FileUtil.fileExists(path)) {
- getQueryReturnValue().setReturnValue(FileUtil.readAllText(path));
+ try {
+
getQueryReturnValue().setReturnValue(FileUtil.readAllText(path));
+ } catch (IOException e) {
+ getQueryReturnValue().setSucceeded(false);
+ return;
+ }
getQueryReturnValue().setSucceeded(true);
}
}
diff --git
a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/CompatException.java
b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/CompatException.java
deleted file mode 100644
index ea130c5..0000000
---
a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/CompatException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.ovirt.engine.core.compat;
-
-/**
- * @deprecated Use {@link ApplicationException} or other more suitable
exception instead.
- */
-@Deprecated
-public class CompatException extends RuntimeException {
- public CompatException() {
- super();
- }
-
- public CompatException(String message) {
- super(message);
- }
-
- public CompatException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public CompatException(Throwable cause) {
- super(cause);
- }
-}
diff --git
a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java
b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java
index 4debd4a..f726084 100644
---
a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java
+++
b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java
@@ -163,7 +163,7 @@
return new TimeSpan(data);
}
// If we get to here, it is invalid
- throw new CompatException("Invalid TimeSpan");
+ throw new IllegalArgumentException("Invalid TimeSpan");
}
@Override
@@ -179,7 +179,7 @@
public static TimeSpan tryParse(String string) {
try {
return TimeSpan.Parse(string);
- } catch (CompatException e) {
+ } catch (IllegalArgumentException e) {
// eat it, return null
return null;
}
diff --git
a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TypeCompat.java
b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TypeCompat.java
index c28eb36..17822db 100644
---
a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TypeCompat.java
+++
b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TypeCompat.java
@@ -9,7 +9,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.ovirt.engine.core.compat.CompatException;
// This will wrap java beans introspection
public class TypeCompat {
@@ -28,7 +27,7 @@
}
}
} catch (Exception e) {
- throw new CompatException(e);
+ throw new RuntimeException(e);
}
return returnValue;
}
@@ -42,7 +41,7 @@
}
}
} catch (Exception e) {
- throw new CompatException(e);
+ throw new RuntimeException(e);
}
return null;
}
@@ -76,7 +75,7 @@
}
}
} catch (Exception e) {
- throw new CompatException(e);
+ throw new RuntimeException(e);
}
}
diff --git
a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TimeSpanTest.java
b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TimeSpanTest.java
index 0e1075b..865be5b 100644
---
a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TimeSpanTest.java
+++
b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TimeSpanTest.java
@@ -63,7 +63,7 @@
try {
TimeSpan.Parse("1.02.03");
fail("No exception was thrown");
- } catch (CompatException e) {
+ } catch (IllegalArgumentException e) {
// eat it, we are ok
}
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/FileUtil.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/FileUtil.java
index 0fd4396..5dfd7c4 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/FileUtil.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/FileUtil.java
@@ -10,8 +10,6 @@
import java.io.OutputStream;
import java.util.Date;
-import org.ovirt.engine.core.compat.CompatException;
-
public class FileUtil {
public static InputStream findFile(String name) {
try {
@@ -62,7 +60,7 @@
}
}
- public static String readAllText(final String filename) {
+ public static String readAllText(final String filename) throws IOException
{
FileInputStream fis = null;
try {
java.io.File file = new java.io.File(filename.toString());
@@ -72,7 +70,7 @@
fis.read(contents);
return new String(contents);
} catch (Exception e) {
- throw new CompatException(e);
+ throw new IOException(e);
} finally {
// in the absence of commons io, this workaround is needed to
close the file
if (fis != null) {
@@ -90,7 +88,7 @@
java.io.File file = new java.io.File(filename.toString());
return new Date(file.lastModified());
} catch (Exception e) {
- throw new CompatException(e);
+ throw new RuntimeException(e);
}
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
index 768e617..a3a78c2 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
@@ -228,7 +228,7 @@
if (FileUtil.fileExists(fileName)) {
try {
content = FileUtil.readAllText(fileName);
- } catch (RuntimeException e) {
+ } catch (Exception e) {
log.error("Failed to read sysprep template: " + fileName, e);
}
} else {
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml
index 44f855b..506c260 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml
@@ -20,7 +20,6 @@
<include name="compat/TypeCompat.java" />
<!-- Referenced directly by UICommon -->
- <include name="compat/CompatException.java" />
<include name="compat/IntegerCompat.java" />
<include name="compat/RefObject.java" />
<include name="compat/KeyValuePairCompat.java" />
diff --git
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/EnumCompat.java
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/EnumCompat.java
index 9d84ca9..f526b0b 100644
---
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/EnumCompat.java
+++
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/EnumCompat.java
@@ -4,20 +4,7 @@
import java.util.Arrays;
import java.util.List;
-import org.ovirt.engine.core.compat.CompatException;
-
public class EnumCompat {
-
- /**
- * Returns the Enum instances as an Arraylist
- */
- public static <T extends Enum> ArrayList<T> GetValues(Class<T> clazz) {
- ArrayList<String> returnValues = new ArrayList<String>();
- if (!clazz.isEnum()) {
- throw new CompatException("Class is not an Enum: " +
clazz.getName());
- }
- return new ArrayList(Arrays.asList(clazz.getEnumConstants()));
- }
/**
* Returns the Enum names as an Arraylist
@@ -25,59 +12,11 @@
public static <T extends Enum> String[] GetNames(Class<T> clazz) {
ArrayList<String> returnValues = new ArrayList<String>();
if (!clazz.isEnum()) {
- throw new CompatException("Class is not an Enum: " +
clazz.getName());
+ throw new RuntimeException("Class is not an Enum: " +
clazz.getName());
}
for (Enum e : clazz.getEnumConstants()) {
returnValues.add(e.name());
}
return returnValues.toArray(new String[0]);
- }
-
- /**
- * Returns the name of an enum based on its ordinal value
- */
- public static String GetName(Class enumerationType, int val) {
- String enumName = null;
- if (!enumerationType.isEnum()) {
- throw new CompatException("Class is not an Enum: " +
enumerationType.getName());
- }
- try {
- for (Object obj : enumerationType.getEnumConstants()) {
- Enum enumObject = (Enum) obj;
- if (enumObject.ordinal() == val) {
- enumName = enumObject.name();
- break;
- }
- }
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- return enumName;
- }
-
- /**
- * Returns the ordinal values of the enum
- */
- public static <T extends Enum> int[] GetIntValues(Class<T>
enumerationType) {
-
- List<T> enums = GetValues(enumerationType);
- int size = enums.size();
- int[] returnValue = new int[size];
-
- for (int x = 0; x < size; x++) {
- if (!(enums.get(x) instanceof Enum))
- throw new CompatException("Class is not an Enum: " +
enums.get(x));
-
- returnValue[x] = ((Enum) enums.get(x)).ordinal();
- }
-
- return returnValue;
- }
-
- /**
- * Checks whether the enum name is defined
- */
- public static <T extends Enum> boolean IsDefined(Class<T> clazz, String
name) {
- return Arrays.asList(EnumCompat.GetNames(clazz)).contains(name);
}
}
diff --git
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/TimeSpan.java
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/TimeSpan.java
index eb9c090..2a8fb97 100644
---
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/TimeSpan.java
+++
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/TimeSpan.java
@@ -120,7 +120,7 @@
return new TimeSpan(data) ;
}
// If we get to here, it is invalid
- throw new CompatException("Invalid TimeSpan") ;
+ throw new IllegalArgumentException("Invalid TimeSpan") ;
}
public String toString() {
@@ -135,7 +135,7 @@
public static TimeSpan tryParse(String string) {
try {
return TimeSpan.Parse(string);
- } catch (CompatException e) {
+ } catch (IllegalArgumentException e) {
//eat it, return null
return null;
}
--
To view, visit http://gerrit.ovirt.org/12430
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I726e0f9e7fb0c9bff00b8d510dc3907d202e0fa2
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
