Expose request and response in ResourceException.

Author: thboileau

modules/org.restlet/src/main/java/org/restlet/resource/ClientResource.java

@@ -612,13 +612,42 @@ public Representation delete(MediaType mediaType) throws ResourceException {
 
     /**
      * By default, it throws a new resource exception.
-     * 
+     * Call {@link #doError(org.restlet.data.Status, org.restlet.Request, org.restlet.Response)}.
+     *
+     * @param request
+     *            The associated request.
+     * @param response
+     *            The associated response.
+     */
+    public void doError(Request request, Response response) {
+        doError(response.getStatus(), request, response);
+    }
+
+    /**
+     * By default, it throws a new resource exception.
+     * Call {@link #doError(org.restlet.data.Status, org.restlet.Request, org.restlet.Response)}.
+     *
      * @param errorStatus
      *            The error status received.
      */
     @Override
     public void doError(Status errorStatus) {
-        throw new ResourceException(errorStatus, this);
+        doError(errorStatus, getRequest(), getResponse());
+    }
+
+    /**
+     * By default, it throws a new resource exception.
+     * This can be overridden to provide a different behavior.
+     *
+     * @param errorStatus
+     *            The error status received.
+     * @param request
+     *            The associated request.
+     * @param response
+     *            The associated response.
+     */
+    public void doError(Status errorStatus, Request request, Response response) {
+        throw new ResourceException(errorStatus, request, response);
     }
 
     /**

modules/org.restlet/src/main/java/org/restlet/resource/ResourceException.java

@@ -37,12 +37,15 @@ public class ResourceException extends RuntimeException {
 
     private static final long serialVersionUID = 1L;
 
-    /** The resource associated to this exception. Could be null. */
-    private final Resource resource;
-
     /** The status associated to this exception. */
     private final Status status;
 
+    /** The request associated to this exception. Could be null. */
+    private final Request request;
+
+    /** The response associated to this exception. Could be null.  */
+    private final Response response;
+
     /**
      * Constructor.
      * 
@@ -186,22 +189,34 @@ public ResourceException(int code, Throwable throwable, String reasonPhrase, Str
      *            The status to associate.
      */
     public ResourceException(Status status) {
-        this(status, (Throwable) ((status == null) ? null : status.getThrowable()));
+        this(status, (status == null) ? null : status.getThrowable());
     }
 
     /**
      * Constructor.
      * 
      * @param status
      *            The status to associate.
+     * @deprecated use constructor with status, request and response instead.
      */
+    @Deprecated
     public ResourceException(Status status, Resource resource) {
-        this(status, (Throwable) ((status == null) ? null : status.getThrowable()), resource);
+        this(status, (status == null) ? null : status.getThrowable(), resource.getRequest(), resource.getResponse());
     }
 
     /**
      * Constructor.
-     * 
+     *
+     * @param status
+     *            The status to associate.
+     */
+    public ResourceException(Status status, Request request, Response response) {
+        this(status, (status == null) ? null : status.getThrowable(), request, response);
+    }
+
+    /**
+     * Constructor.
+     *
      * @param status
      *            The status to copy.
      * @param description
@@ -227,34 +242,36 @@ public ResourceException(Status status, String description, Throwable cause) {
 
     /**
      * Constructor.
-     * 
+     *
      * @param status
      *            The status to associate.
      * @param cause
      *            The wrapped cause error or exception.
      */
     public ResourceException(Status status, Throwable cause) {
-        this(status, cause, null);
+        this(status, cause, null, null);
     }
 
     /**
      * Constructor.
-     * 
+     *
      * @param status
      *            The status to associate.
      * @param cause
      *            The wrapped cause error or exception.
      */
-    public ResourceException(Status status, Throwable cause, Resource resource) {
+    public ResourceException(Status status, Throwable cause, Request request, Response response) {
         super((status == null) ? null : status.toString(), cause);
         this.status = status;
-        this.resource = resource;
+        this.request = request;
+        this.response = response;
     }
 
     /**
-     * Constructor that set the status to {@link org.restlet.data.Status#SERVER_ERROR_INTERNAL} including the
+     * Constructor that set the status to
+     * {@link org.restlet.data.Status#SERVER_ERROR_INTERNAL} including the
      * related error or exception.
-     * 
+     *
      * @param cause
      *            The wrapped cause error or exception.
      */
@@ -264,34 +281,25 @@ public ResourceException(Throwable cause) {
 
     /**
      * Returns the request associated to this exception.
-     * 
+     *
      * @return The request associated to this exception.
      */
     public Request getRequest() {
-        return (this.resource != null) ? this.resource.getRequest() : null;
-    }
-
-    /**
-     * Returns the resource associated to this exception.
-     * 
-     * @return The resource associated to this exception.
-     */
-    public Resource getResource() {
-        return this.resource;
+        return this.request;
     }
 
     /**
      * Returns the response associated to this exception.
-     * 
+     *
      * @return The response associated to this exception.
      */
     public Response getResponse() {
-        return (this.resource != null) ? this.resource.getResponse() : null;
+        return this.response;
     }
 
     /**
      * Returns the status associated to this exception.
-     * 
+     *
      * @return The status associated to this exception.
      */
     public Status getStatus() {