Refactor specialized exception constructors

The exception are now built taking a ProblemDetails in.

Use HttpStatus from API module as reference

Author: NSeydoux

solid/src/main/java/com/inrupt/client/solid/BadRequestException.java

@@ -21,6 +21,8 @@
 package com.inrupt.client.solid;
 
 import com.inrupt.client.Headers;
+import com.inrupt.client.HttpStatus;
+import com.inrupt.client.ProblemDetails;
 
 import java.net.URI;
 
@@ -32,7 +34,7 @@
 public class BadRequestException extends SolidClientException {
     private static final long serialVersionUID = -3379457428921025570L;
 
-    public static final int STATUS_CODE = 400;
+    public static final int STATUS_CODE = HttpStatus.BAD_REQUEST;
 
     /**
      * Create a BadRequestException exception.
@@ -41,6 +43,7 @@ public class BadRequestException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
+     * @deprecated
      */
     public BadRequestException(
             final String message,
@@ -49,4 +52,22 @@ public BadRequestException(
             final String body) {
         super(message, uri, STATUS_CODE, headers, body);
     }
+
+    /**
+     * Create a BadRequestException exception.
+     *
+     * @param message the message
+     * @param pd the ProblemDetails instance
+     * @param uri the uri
+     * @param headers the response headers
+     * @param body the body
+     */
+    public BadRequestException(
+            final String message,
+            final ProblemDetails pd,
+            final URI uri,
+            final Headers headers,
+            final String body) {
+        super(message, pd, uri, headers, body);
+    }
 }

solid/src/main/java/com/inrupt/client/solid/ConflictException.java

@@ -21,6 +21,8 @@
 package com.inrupt.client.solid;
 
 import com.inrupt.client.Headers;
+import com.inrupt.client.HttpStatus;
+import com.inrupt.client.ProblemDetails;
 
 import java.net.URI;
 
@@ -32,7 +34,7 @@
 public class ConflictException extends SolidClientException {
     private static final long serialVersionUID = -203198307847520748L;
 
-    public static final int STATUS_CODE = 409;
+    public static final int STATUS_CODE = HttpStatus.CONFLICT;
 
     /**
      * Create a ConflictException exception.
@@ -41,6 +43,7 @@ public class ConflictException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
+     * @deprecated
      */
     public ConflictException(
             final String message,
@@ -49,4 +52,22 @@ public ConflictException(
             final String body) {
         super(message, uri, STATUS_CODE, headers, body);
     }
+
+    /**
+     * Create a ConflictException exception.
+     *
+     * @param message the message
+     * @param pd the ProblemDetails instance
+     * @param uri the uri
+     * @param headers the response headers
+     * @param body the body
+     */
+    public ConflictException(
+            final String message,
+            final ProblemDetails pd,
+            final URI uri,
+            final Headers headers,
+            final String body) {
+        super(message, pd, uri, headers, body);
+    }
 }

solid/src/main/java/com/inrupt/client/solid/ForbiddenException.java

@@ -21,6 +21,8 @@
 package com.inrupt.client.solid;
 
 import com.inrupt.client.Headers;
+import com.inrupt.client.HttpStatus;
+import com.inrupt.client.ProblemDetails;
 
 import java.net.URI;
 
@@ -32,7 +34,7 @@
 public class ForbiddenException extends SolidClientException {
     private static final long serialVersionUID = 3299286274724874244L;
 
-    public static final int STATUS_CODE = 403;
+    public static final int STATUS_CODE = HttpStatus.FORBIDDEN;
 
     /**
      * Create a ForbiddenException exception.
@@ -41,6 +43,7 @@ public class ForbiddenException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
+     * @deprecated
      */
     public ForbiddenException(
             final String message,
@@ -49,4 +52,22 @@ public ForbiddenException(
             final String body) {
         super(message, uri, STATUS_CODE, headers, body);
     }
+
+    /**
+     * Create a ForbiddenException exception.
+     *
+     * @param message the message
+     * @param pd the ProblemDetails instance
+     * @param uri the uri
+     * @param headers the response headers
+     * @param body the body
+     */
+    public ForbiddenException(
+            final String message,
+            final ProblemDetails pd,
+            final URI uri,
+            final Headers headers,
+            final String body) {
+        super(message, pd, uri, headers, body);
+    }
 }

solid/src/main/java/com/inrupt/client/solid/GoneException.java

@@ -21,6 +21,8 @@
 package com.inrupt.client.solid;
 
 import com.inrupt.client.Headers;
+import com.inrupt.client.HttpStatus;
+import com.inrupt.client.ProblemDetails;
 
 import java.net.URI;
 
@@ -32,7 +34,7 @@
 public class GoneException extends SolidClientException {
     private static final long serialVersionUID = -6892345582498100242L;
 
-    public static final int STATUS_CODE = 410;
+    public static final int STATUS_CODE = HttpStatus.GONE;
 
     /**
      * Create a GoneException exception.
@@ -41,6 +43,7 @@ public class GoneException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
+     * @deprecated
      */
     public GoneException(
             final String message,
@@ -49,4 +52,22 @@ public GoneException(
             final String body) {
         super(message, uri, STATUS_CODE, headers, body);
     }
+
+    /**
+     * Create a GoneException exception.
+     *
+     * @param message the message
+     * @param pd the ProblemDetails instance
+     * @param uri the uri
+     * @param headers the response headers
+     * @param body the body
+     */
+    public GoneException(
+            final String message,
+            final ProblemDetails pd,
+            final URI uri,
+            final Headers headers,
+            final String body) {
+        super(message, pd, uri, headers, body);
+    }
 }

solid/src/main/java/com/inrupt/client/solid/InternalServerErrorException.java

@@ -21,6 +21,8 @@
 package com.inrupt.client.solid;
 
 import com.inrupt.client.Headers;
+import com.inrupt.client.HttpStatus;
+import com.inrupt.client.ProblemDetails;
 
 import java.net.URI;
 
@@ -32,7 +34,7 @@
 public class InternalServerErrorException extends SolidClientException {
     private static final long serialVersionUID = -6672490715281719330L;
 
-    public static final int STATUS_CODE = 500;
+    public static final int STATUS_CODE = HttpStatus.INTERNAL_SERVER_ERROR;
 
     /**
      * Create an InternalServerErrorException exception.
@@ -41,6 +43,7 @@ public class InternalServerErrorException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
+     * @deprecated
      */
     public InternalServerErrorException(
             final String message,
@@ -49,4 +52,22 @@ public InternalServerErrorException(
             final String body) {
         super(message, uri, STATUS_CODE, headers, body);
     }
+
+    /**
+     * Create an InternalServerErrorException exception.
+     *
+     * @param message the message
+     * @param pd the ProblemDetails instance
+     * @param uri the uri
+     * @param headers the response headers
+     * @param body the body
+     */
+    public InternalServerErrorException(
+            final String message,
+            final ProblemDetails pd,
+            final URI uri,
+            final Headers headers,
+            final String body) {
+        super(message, pd, uri, headers, body);
+    }
 }

solid/src/main/java/com/inrupt/client/solid/MethodNotAllowedException.java

@@ -21,6 +21,8 @@
 package com.inrupt.client.solid;
 
 import com.inrupt.client.Headers;
+import com.inrupt.client.HttpStatus;
+import com.inrupt.client.ProblemDetails;
 
 import java.net.URI;
 
@@ -32,7 +34,7 @@
 public class MethodNotAllowedException extends SolidClientException {
     private static final long serialVersionUID = -9125437562813923030L;
 
-    public static final int STATUS_CODE = 405;
+    public static final int STATUS_CODE = HttpStatus.METHOD_NOT_ALLOWED;
 
     /**
      * Create a MethodNotAllowedException exception.
@@ -41,6 +43,7 @@ public class MethodNotAllowedException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
+     * @deprecated
      */
     public MethodNotAllowedException(
             final String message,
@@ -49,4 +52,22 @@ public MethodNotAllowedException(
             final String body) {
         super(message, uri, STATUS_CODE, headers, body);
     }
+
+    /**
+     * Create a MethodNotAllowedException exception.
+     *
+     * @param message the message
+     * @param pd the ProblemDetails instance
+     * @param uri the uri
+     * @param headers the response headers
+     * @param body the body
+     */
+    public MethodNotAllowedException(
+            final String message,
+            final ProblemDetails pd,
+            final URI uri,
+            final Headers headers,
+            final String body) {
+        super(message, pd, uri, headers, body);
+    }
 }

solid/src/main/java/com/inrupt/client/solid/NotAcceptableException.java

@@ -21,6 +21,8 @@
 package com.inrupt.client.solid;
 
 import com.inrupt.client.Headers;
+import com.inrupt.client.HttpStatus;
+import com.inrupt.client.ProblemDetails;
 
 import java.net.URI;
 
@@ -32,7 +34,7 @@
 public class NotAcceptableException extends SolidClientException {
     private static final long serialVersionUID = 6594993822477388733L;
 
-    public static final int STATUS_CODE = 406;
+    public static final int STATUS_CODE = HttpStatus.NOT_ACCEPTABLE;
 
     /**
      * Create a NotAcceptableException exception.
@@ -41,6 +43,7 @@ public class NotAcceptableException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
+     * @deprecated
      */
     public NotAcceptableException(
             final String message,
@@ -49,4 +52,22 @@ public NotAcceptableException(
             final String body) {
         super(message, uri, STATUS_CODE, headers, body);
     }
+
+    /**
+     * Create a NotAcceptableException exception.
+     *
+     * @param message the message
+     * @param pd the ProblemDetails instance
+     * @param uri the uri
+     * @param headers the response headers
+     * @param body the body
+     */
+    public NotAcceptableException(
+            final String message,
+            final ProblemDetails pd,
+            final URI uri,
+            final Headers headers,
+            final String body) {
+        super(message, pd, uri, headers, body);
+    }
 }

solid/src/main/java/com/inrupt/client/solid/NotFoundException.java

@@ -21,6 +21,8 @@
 package com.inrupt.client.solid;
 
 import com.inrupt.client.Headers;
+import com.inrupt.client.HttpStatus;
+import com.inrupt.client.ProblemDetails;
 
 import java.net.URI;
 
@@ -32,7 +34,7 @@
 public class NotFoundException extends SolidClientException {
     private static final long serialVersionUID = -2256628528500739683L;
 
-    public static final int STATUS_CODE = 404;
+    public static final int STATUS_CODE = HttpStatus.NOT_FOUND;
 
     /**
      * Create a NotFoundException exception.
@@ -41,6 +43,7 @@ public class NotFoundException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
+     * @deprecated
      */
     public NotFoundException(
             final String message,
@@ -49,4 +52,22 @@ public NotFoundException(
             final String body) {
         super(message, uri, STATUS_CODE, headers, body);
     }
+
+    /**
+     * Create a NotFoundException exception.
+     *
+     * @param message the message
+     * @param pd the ProblemDetails instance
+     * @param uri the uri
+     * @param headers the response headers
+     * @param body the body
+     */
+    public NotFoundException(
+            final String message,
+            final ProblemDetails pd,
+            final URI uri,
+            final Headers headers,
+            final String body) {
+        super(message, pd, uri, headers, body);
+    }
 }