Michael Kublin has uploaded a new change for review. Change subject: engine: ApplicationException - removed ......................................................................
engine: ApplicationException - removed We are not C# project, removing C# inheritance Change-Id: I681f44a5772e0ed2c220546fd5578a6993e862c1 Signed-off-by: Michael Kublin <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperDirector.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/SearchEngineIllegalCharacterException.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/SqlInjectionException.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBLLException.java D backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/ApplicationException.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VDSExceptionBase.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java 8 files changed, 8 insertions(+), 68 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/14241/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperDirector.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperDirector.java index 14a125e..aa18143 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperDirector.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperDirector.java @@ -5,7 +5,6 @@ import java.util.Map; import org.ovirt.engine.core.common.businessentities.StorageType; -import org.ovirt.engine.core.compat.ApplicationException; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; @@ -54,7 +53,7 @@ } catch (Exception ex) { log.error("StorageHelperDirector Error:: exception was encountered during InitializeHelpers() execution", ex); - throw new ApplicationException("JTODO missing exception", ex); + throw new RuntimeException(ex); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/SearchEngineIllegalCharacterException.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/SearchEngineIllegalCharacterException.java index 75712d6..68c929c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/SearchEngineIllegalCharacterException.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/SearchEngineIllegalCharacterException.java @@ -1,8 +1,6 @@ package org.ovirt.engine.core.common.errors; -import org.ovirt.engine.core.compat.ApplicationException; - -public class SearchEngineIllegalCharacterException extends ApplicationException implements java.io.Serializable { +public class SearchEngineIllegalCharacterException extends RuntimeException { private static final long serialVersionUID = 7219745365883133511L; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/SqlInjectionException.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/SqlInjectionException.java index 5f962f4..3aa096e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/SqlInjectionException.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/SqlInjectionException.java @@ -1,7 +1,5 @@ package org.ovirt.engine.core.common.errors; -import org.ovirt.engine.core.compat.ApplicationException; - -public class SqlInjectionException extends ApplicationException implements java.io.Serializable { +public class SqlInjectionException extends RuntimeException { private static final long serialVersionUID = 5080224825647484230L; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBLLException.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBLLException.java index db17c98..89ab472 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBLLException.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBLLException.java @@ -1,17 +1,6 @@ package org.ovirt.engine.core.common.errors; -import org.ovirt.engine.core.compat.*; - -public class VdcBLLException extends ApplicationException implements java.io.Serializable { - // protected VdcBLLException(SerializationInfo info, StreamingContext - // context) - // { - // super(info, context); - // VDSError tempVar = new VDSError(); - // tempVar.setCode((VdcBllErrors)info.GetValue("errorCode", - // VdcBllErrors.class)); - // setVdsError(tempVar); - // } +public class VdcBLLException extends RuntimeException { private static final long serialVersionUID = 9070362191178977106L; @@ -35,21 +24,6 @@ tempVar.setCode(errCode); setVdsError(tempVar); } - - // @Override - // public void GetObjectData(SerializationInfo info, StreamingContext - // context) - // { - // info.AddValue("errorCode", getErrorCode()); - // super.GetObjectData(info, context); - // } - - // void ISerializable.GetObjectData(SerializationInfo info, StreamingContext - // context) - // { - // info.AddValue("errorCode", mErrorCode); - // base.GetObjectData(info, context); - // } private VDSError privateVdsError; diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/ApplicationException.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/ApplicationException.java deleted file mode 100644 index f6dded2..0000000 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/ApplicationException.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.ovirt.engine.core.compat; - -public class ApplicationException extends RuntimeException { - - private static final long serialVersionUID = 3398093471155070951L; - - public ApplicationException() { - } - - public ApplicationException(String string) { - super(string); - } - - public ApplicationException(Throwable ex) { - super(ex); - } - - public ApplicationException(String string, Throwable ex) { - super(string, ex); - } - -} diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java index cf9b251..e08d24c 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java @@ -14,7 +14,6 @@ import org.ovirt.engine.core.common.AuditLogSeverity; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.businessentities.AuditLog; -import org.ovirt.engine.core.compat.ApplicationException; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.backendcompat.TypeCompat; import org.ovirt.engine.core.dal.dbbroker.DbFacade; @@ -753,7 +752,7 @@ return ResourceBundle.getBundle(APP_ERRORS_MESSAGES_FILE_NAME); } catch (MissingResourceException e) { log.error("Could not load audit log messages from the file " + APP_ERRORS_MESSAGES_FILE_NAME); - throw new ApplicationException(e); + throw e; } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VDSExceptionBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VDSExceptionBase.java index 1c45aaf..d55985f 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VDSExceptionBase.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VDSExceptionBase.java @@ -1,9 +1,9 @@ package org.ovirt.engine.core.vdsbroker.vdsbroker; -import org.ovirt.engine.core.compat.*; -import org.ovirt.engine.core.common.errors.*; +import org.ovirt.engine.core.common.errors.VDSError; +import org.ovirt.engine.core.common.errors.VdcBllErrors; -public class VDSExceptionBase extends ApplicationException { +public class VDSExceptionBase extends RuntimeException { private static final long serialVersionUID = 5709501011970689110L; diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java index 0b17abf..263668a 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java @@ -7,7 +7,6 @@ import org.ovirt.engine.core.common.errors.VdcBLLException; import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase; -import org.ovirt.engine.core.compat.ApplicationException; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.vdsbroker.ResourceManager; @@ -91,11 +90,6 @@ } catch (VDSExceptionBase ex) { PrintReturnValue(); throw ex; - } catch (ApplicationException ex) { - log.errorFormat("Failed in {0} method", getCommandName()); - log.error("Exception", ex); - PrintReturnValue(); - throw new VDSProtocolException(ex); } catch (XmlRpcRunTimeException ex) { Throwable rootCause = ExceptionUtils.getRootCause(ex); VDSNetworkException networkException = new VDSNetworkException(rootCause); -- To view, visit http://gerrit.ovirt.org/14241 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I681f44a5772e0ed2c220546fd5578a6993e862c1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
