apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 13127: API error text refer to database ids instead of uuids

Browse Source 
Description:

1)	Moved RuntimeCloudException from api/ to utils/.

	Added simple constructor to RuntimeCloudException.

	Modified all classes that extended RuntimeException
	to extend RuntimeCloudException. These classes
	are listed below:

		ServerApiException
		CloudAuthenticationException
		CloudExecutionException
		AsyncCommandQueued
		HypervisorVersionChangedException
		RuntimeCloudException

2)	Added overloaded constructed to CloudException.
	Modified all classes that extend Exception to extend CloudException instead.
	These classes are listed below:

		ConcurrentOperationException
                ConflictingNetworkSettingsException
                ConnectionException
                DiscoveryException
                InsufficientCapacityException
                ManagementServerException
                ResourceUnavailableException
                VirtualMachineMigrationException
                AgentControlChannelException
                OperationTimedoutException.java
                UnsupportedVersionException.java
                UsageServerException.java
                UnableDeleteHostException.java
                AgentAuthnException.java
                HttpCallException.java
                ActiveFencingException.java
                ClusterInvalidSessionException.java
                GreTunnelException.java
                OvsVlanExhaustedException.java
This commit is contained in:
Vijayendra Bhamidipati 2012-02-02 20:45:55 -08:00
parent 698c1ebe12
commit 768d7a2a26
26 changed files with 58 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/com/cloud/api/ServerApiException.java
View File

@ -17,9 +17,10 @@
*/
package com.cloud.api;
import com.cloud.utils.exception.RuntimeCloudException;
@SuppressWarnings("serial")
public class ServerApiException extends RuntimeException {
public class ServerApiException extends RuntimeCloudException {
private int _errorCode;
private String _description;

3
api/src/com/cloud/exception/CloudAuthenticationException.java
View File

@ -18,8 +18,9 @@
package com.cloud.exception;
import com.cloud.utils.SerialVersionUID;
import com.cloud.utils.exception.RuntimeCloudException;
public class CloudAuthenticationException extends RuntimeException {
public class CloudAuthenticationException extends RuntimeCloudException {
private static final long serialVersionUID = SerialVersionUID.CloudAuthenticationException;
public CloudAuthenticationException(String message) {

7
api/src/com/cloud/exception/CloudException.java
View File

@ -41,10 +41,15 @@ public class CloudException extends Exception {
public CloudException(String message) {
super(message);
}
public CloudException(String message, Throwable cause) {
super(message, cause);
}
public CloudException() {
//this.id = new IdentityProxy(); ??
//this.id = NULL; ??
super();
}
}

3
api/src/com/cloud/exception/CloudExecutionException.java
View File

@ -18,6 +18,7 @@
package com.cloud.exception;
import java.util.HashMap;
import com.cloud.utils.exception.RuntimeCloudException;
import com.cloud.utils.SerialVersionUID;
@ -30,7 +31,7 @@ import com.cloud.utils.SerialVersionUID;
* that one can find out what the error is simply by reading the error message.
*
*/
public class CloudExecutionException extends RuntimeException {
public class CloudExecutionException extends RuntimeCloudException {
private final static long serialVersionUID = SerialVersionUID.CloudExecutionException;
private final ErrorCode code;

2
api/src/com/cloud/exception/ConcurrentOperationException.java
View File

@ -19,7 +19,7 @@ package com.cloud.exception;
import com.cloud.utils.SerialVersionUID;
public class ConcurrentOperationException extends Exception {
public class ConcurrentOperationException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.ConcurrentOperationException;

2
api/src/com/cloud/exception/ConflictingNetworkSettingsException.java
View File

@ -23,7 +23,7 @@ package com.cloud.exception;
import com.cloud.utils.SerialVersionUID;
public class ConflictingNetworkSettingsException extends Exception {
public class ConflictingNetworkSettingsException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.ConflictingNetworkSettingException;

2
api/src/com/cloud/exception/ConnectionException.java
View File

@ -34,7 +34,7 @@ import com.cloud.utils.SerialVersionUID;
* It is important that the Listener does not fall into a loop in this
* situation where it keeps throwing ConnectionException.
*/
public class ConnectionException extends Exception {
public class ConnectionException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.ConnectionException;
boolean _error;

2
api/src/com/cloud/exception/DiscoveryException.java
View File

@ -19,7 +19,7 @@ package com.cloud.exception;
import com.cloud.utils.SerialVersionUID;
public class DiscoveryException extends Exception {
public class DiscoveryException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.DiscoveryException;

2
api/src/com/cloud/exception/InsufficientCapacityException.java
View File

@ -23,7 +23,7 @@ import com.cloud.utils.SerialVersionUID;
* Generic parent exception class for capacity being reached.
*
*/
public abstract class InsufficientCapacityException extends Exception {
public abstract class InsufficientCapacityException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.InsufficientCapacityException;
Long id;

2
api/src/com/cloud/exception/ManagementServerException.java
View File

@ -23,7 +23,7 @@ import com.cloud.utils.SerialVersionUID;
* @author chiradeep
*
*/
public class ManagementServerException extends Exception {
public class ManagementServerException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.ManagementServerException;

2
api/src/com/cloud/exception/ResourceUnavailableException.java
View File

@ -19,7 +19,7 @@ package com.cloud.exception;
import com.cloud.utils.SerialVersionUID;
public class ResourceUnavailableException extends Exception {
public class ResourceUnavailableException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.ResourceUnavailableException;
Class<?> _scope;

2
api/src/com/cloud/exception/VirtualMachineMigrationException.java
View File

@ -19,7 +19,7 @@ package com.cloud.exception;
import com.cloud.utils.SerialVersionUID;
public class VirtualMachineMigrationException extends Exception {
public class VirtualMachineMigrationException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.VirtualMachineMigrationException;
public VirtualMachineMigrationException(String message) {

4
core/src/com/cloud/exception/AgentControlChannelException.java
View File

@ -17,8 +17,10 @@
*/
package com.cloud.exception;
import com.cloud.exception.CloudException;
public class AgentControlChannelException extends Exception {
public class AgentControlChannelException extends CloudException {
private static final long serialVersionUID = -310647782960500466L;
public AgentControlChannelException(String msg) {

2
core/src/com/cloud/exception/OperationTimedoutException.java
View File

@ -24,7 +24,7 @@ import com.cloud.utils.SerialVersionUID;
* This exception is thrown when the operation couldn't complete due to a
* wait timeout.
*/
public class OperationTimedoutException extends Exception {
public class OperationTimedoutException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.OperationTimedoutException;
long _agentId;

2
core/src/com/cloud/exception/UnsupportedVersionException.java
View File

@ -22,7 +22,7 @@ import com.cloud.utils.SerialVersionUID;
/**
* Version of the protocol is no longer supported.
*/
public class UnsupportedVersionException extends Exception {
public class UnsupportedVersionException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.UnsupportedVersionException;

2
core/src/com/cloud/exception/UsageServerException.java
View File

@ -17,7 +17,7 @@
*/
package com.cloud.exception;
public class UsageServerException extends Exception {
public class UsageServerException extends CloudException {
public UsageServerException() {

3
core/src/com/cloud/resource/UnableDeleteHostException.java
View File

@ -1,8 +1,9 @@
package com.cloud.resource;
import com.cloud.utils.SerialVersionUID;
import com.cloud.exception.CloudException;
public class UnableDeleteHostException extends Exception {
public class UnableDeleteHostException extends CloudException {
private static final long serialVersionUID = SerialVersionUID.UnableDeleteHostException;
public UnableDeleteHostException(String msg) {

4
server/src/com/cloud/agent/manager/authn/AgentAuthnException.java
View File

@ -17,11 +17,13 @@
*/
package com.cloud.agent.manager.authn;
import com.cloud.exception.CloudException;
/**
* Exception indicates authentication and/OR authorization problem
*
*/
public class AgentAuthnException extends Exception{
public class AgentAuthnException extends CloudException{
private static final long serialVersionUID = 3303508953403051189L;

3
server/src/com/cloud/async/AsyncCommandQueued.java
View File

@ -18,8 +18,9 @@
package com.cloud.async;
import com.cloud.utils.SerialVersionUID;
import com.cloud.utils.exception.RuntimeCloudException;
public class AsyncCommandQueued extends RuntimeException {
public class AsyncCommandQueued extends RuntimeCloudException {
private static final long serialVersionUID = SerialVersionUID.AsyncCommandQueued;
private SyncQueueVO _queue = null;

4
server/src/com/cloud/baremetal/HttpCallException.java
View File

@ -21,7 +21,9 @@ package com.cloud.baremetal;
import com.cloud.utils.SerialVersionUID;
public class HttpCallException extends Exception {
import com.cloud.exception.CloudException;
public class HttpCallException extends CloudException {
private static final long serialVersionUID= SerialVersionUID.HttpCallException;
public HttpCallException(String msg) {
super(msg);

4
server/src/com/cloud/cluster/ActiveFencingException.java
View File

@ -18,7 +18,9 @@
package com.cloud.cluster;
public class ActiveFencingException extends Exception {
import com.cloud.exception.CloudException;
public class ActiveFencingException extends CloudException {
private static final long serialVersionUID = -3975376101728211726L;
public ActiveFencingException(String message) {

4
server/src/com/cloud/cluster/ClusterInvalidSessionException.java
View File

@ -18,7 +18,9 @@
package com.cloud.cluster;
public class ClusterInvalidSessionException extends Exception {
import com.cloud.exception.CloudException;
public class ClusterInvalidSessionException extends CloudException {
private static final long serialVersionUID = -6636524194520997512L;

4
server/src/com/cloud/network/ovs/GreTunnelException.java
View File

@ -18,7 +18,9 @@
package com.cloud.network.ovs;
public class GreTunnelException extends Exception {
import com.cloud.exception.CloudException;
public class GreTunnelException extends CloudException {
public GreTunnelException(String msg) {
super(msg);
}

4
server/src/com/cloud/network/ovs/OvsVlanExhaustedException.java
View File

@ -18,7 +18,9 @@
package com.cloud.network.ovs;
public class OvsVlanExhaustedException extends Exception {
import com.cloud.exception.CloudException;
public class OvsVlanExhaustedException extends CloudException {
public OvsVlanExhaustedException(String msg) {
super(msg);
}

2
utils/src/com/cloud/utils/exception/HypervisorVersionChangedException.java
View File

@ -19,7 +19,7 @@ package com.cloud.utils.exception;
import com.cloud.utils.SerialVersionUID;
public class HypervisorVersionChangedException extends RuntimeException {
public class HypervisorVersionChangedException extends RuntimeCloudException {
private static final long serialVersionUID = SerialVersionUID.CloudRuntimeException;

13
api/src/com/cloud/exception/RuntimeCloudException.java → utils/src/com/cloud/utils/exception/RuntimeCloudException.java
View File

@ -15,16 +15,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.cloud.exception;
package com.cloud.utils.exception;
import com.cloud.utils.IdentityProxy;
/**
* CloudException is a generic exception class that has an IdentityProxy
* RuntimeCloudException is a generic exception class that has an IdentityProxy
* object in it to enable on the fly conversion of database ids to uuids
* by the API response serializer. Any exceptions that are thrown by
* command invocations must extend this class, or the RuntimeCloudException
* class, which extends RuntimeException instead of Exception like this
* command invocations must extend this class, or the CloudException
* class, which extends Exception instead of RuntimeException like this
* class does.
*/
@ -42,9 +42,14 @@ public class RuntimeCloudException extends RuntimeException {
super(message);
}
public RuntimeCloudException(String message, Throwable cause) {
super(message, cause);
}
public RuntimeCloudException() {
//this.id = new IdentityProxy(); ??
//this.id = NULL; ??
super();
}
}