fixup! Refactor specialized exception constructors

NSeydoux · NSeydoux · commit 92358fadab87 · 2024-04-16T09:51:15.000+02:00
diff --git a/solid/src/main/java/com/inrupt/client/solid/BadRequestException.java b/solid/src/main/java/com/inrupt/client/solid/BadRequestException.java
@@ -36,23 +36,6 @@ public class BadRequestException extends SolidClientException {
 
     public static final int STATUS_CODE = HttpStatus.BAD_REQUEST;
 
-    /**
-     * Create a BadRequestException exception.
-     *
-     * @param message the message
-     * @param uri the uri
-     * @param headers the response headers
-     * @param body the body
-     * @deprecated
-     */
-    public BadRequestException(
-            final String message,
-            final URI uri,
-            final Headers headers,
-            final String body) {
-        super(message, uri, STATUS_CODE, headers, body);
-    }
-
     /**
      * Create a BadRequestException exception.
      *
@@ -64,10 +47,9 @@ public BadRequestException(
      */
     public BadRequestException(
             final String message,
-            final ProblemDetails pd,
             final URI uri,
             final Headers headers,
             final String body) {
-        super(message, pd, uri, headers, body);
+        super(message, uri, HttpStatus.BAD_REQUEST, headers, body);
     }
 }
diff --git a/solid/src/main/java/com/inrupt/client/solid/ConflictException.java b/solid/src/main/java/com/inrupt/client/solid/ConflictException.java
@@ -43,7 +43,6 @@ public class ConflictException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
-     * @deprecated
      */
     public ConflictException(
             final String message,
@@ -52,22 +51,4 @@ 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);
-    }
 }
diff --git a/solid/src/main/java/com/inrupt/client/solid/ForbiddenException.java b/solid/src/main/java/com/inrupt/client/solid/ForbiddenException.java
@@ -43,7 +43,6 @@ public class ForbiddenException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
-     * @deprecated
      */
     public ForbiddenException(
             final String message,
@@ -52,22 +51,4 @@ 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);
-    }
 }
diff --git a/solid/src/main/java/com/inrupt/client/solid/GoneException.java b/solid/src/main/java/com/inrupt/client/solid/GoneException.java
@@ -43,7 +43,6 @@ public class GoneException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
-     * @deprecated
      */
     public GoneException(
             final String message,
@@ -52,22 +51,4 @@ 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);
-    }
 }
diff --git a/solid/src/main/java/com/inrupt/client/solid/InternalServerErrorException.java b/solid/src/main/java/com/inrupt/client/solid/InternalServerErrorException.java
@@ -43,7 +43,6 @@ public class InternalServerErrorException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
-     * @deprecated
      */
     public InternalServerErrorException(
             final String message,
@@ -52,22 +51,4 @@ 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);
-    }
 }
diff --git a/solid/src/main/java/com/inrupt/client/solid/MethodNotAllowedException.java b/solid/src/main/java/com/inrupt/client/solid/MethodNotAllowedException.java
@@ -43,7 +43,6 @@ public class MethodNotAllowedException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
-     * @deprecated
      */
     public MethodNotAllowedException(
             final String message,
@@ -52,22 +51,4 @@ 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);
-    }
 }
diff --git a/solid/src/main/java/com/inrupt/client/solid/NotAcceptableException.java b/solid/src/main/java/com/inrupt/client/solid/NotAcceptableException.java
@@ -43,7 +43,6 @@ public class NotAcceptableException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
-     * @deprecated
      */
     public NotAcceptableException(
             final String message,
@@ -52,22 +51,4 @@ 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);
-    }
 }
diff --git a/solid/src/main/java/com/inrupt/client/solid/NotFoundException.java b/solid/src/main/java/com/inrupt/client/solid/NotFoundException.java
@@ -43,7 +43,6 @@ public class NotFoundException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
-     * @deprecated
      */
     public NotFoundException(
             final String message,
@@ -52,22 +51,4 @@ 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);
-    }
 }
diff --git a/solid/src/main/java/com/inrupt/client/solid/PreconditionFailedException.java b/solid/src/main/java/com/inrupt/client/solid/PreconditionFailedException.java
@@ -43,7 +43,6 @@ public class PreconditionFailedException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
-     * @deprecated
      */
     public PreconditionFailedException(
             final String message,
@@ -52,22 +51,4 @@ public PreconditionFailedException(
             final String body) {
         super(message, uri, STATUS_CODE, headers, body);
     }
-
-    /**
-     * Create a PreconditionFailedException exception.
-     *
-     * @param message the message
-     * @param pd the ProblemDetails instance
-     * @param uri the uri
-     * @param headers the response headers
-     * @param body the body
-     */
-    public PreconditionFailedException(
-            final String message,
-            final ProblemDetails pd,
-            final URI uri,
-            final Headers headers,
-            final String body) {
-        super(message, pd, uri, headers, body);
-    }
 }
diff --git a/solid/src/main/java/com/inrupt/client/solid/TooManyRequestsException.java b/solid/src/main/java/com/inrupt/client/solid/TooManyRequestsException.java
@@ -43,7 +43,6 @@ public class TooManyRequestsException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
-     * @deprecated
      */
     public TooManyRequestsException(
             final String message,
@@ -52,22 +51,4 @@ public TooManyRequestsException(
             final String body) {
         super(message, uri, STATUS_CODE, headers, body);
     }
-
-    /**
-     * Create a TooManyRequestsException exception.
-     *
-     * @param message the message
-     * @param pd the ProblemDetails instance
-     * @param uri the uri
-     * @param headers the response headers
-     * @param body the body
-     */
-    public TooManyRequestsException(
-            final String message,
-            final ProblemDetails pd,
-            final URI uri,
-            final Headers headers,
-            final String body) {
-        super(message, pd, uri, headers, body);
-    }
 }
diff --git a/solid/src/main/java/com/inrupt/client/solid/UnauthorizedException.java b/solid/src/main/java/com/inrupt/client/solid/UnauthorizedException.java
@@ -43,7 +43,6 @@ public class UnauthorizedException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
-     * @deprecated
      */
     public UnauthorizedException(
             final String message,
@@ -52,22 +51,4 @@ public UnauthorizedException(
             final String body) {
         super(message, uri, STATUS_CODE, headers, body);
     }
-
-    /**
-     * Create a UnauthorizedException exception.
-     *
-     * @param message the message
-     * @param pd the ProblemDetails instance
-     * @param uri the uri
-     * @param headers the response headers
-     * @param body the body
-     */
-    public UnauthorizedException(
-            final String message,
-            final ProblemDetails pd,
-            final URI uri,
-            final Headers headers,
-            final String body) {
-        super(message, pd, uri, headers, body);
-    }
 }
diff --git a/solid/src/main/java/com/inrupt/client/solid/UnsupportedMediaTypeException.java b/solid/src/main/java/com/inrupt/client/solid/UnsupportedMediaTypeException.java
@@ -43,7 +43,6 @@ public class UnsupportedMediaTypeException extends SolidClientException {
      * @param uri the uri
      * @param headers the response headers
      * @param body the body
-     * @deprecated
      */
     public UnsupportedMediaTypeException(
             final String message,
@@ -52,22 +51,4 @@ public UnsupportedMediaTypeException(
             final String body) {
         super(message, uri, STATUS_CODE, headers, body);
     }
-
-    /**
-     * Create a UnsupportedMediaTypeException exception.
-     *
-     * @param message the message
-     * @param pd the ProblemDetails instance
-     * @param uri the uri
-     * @param headers the response headers
-     * @param body the body
-     */
-    public UnsupportedMediaTypeException(
-            final String message,
-            final ProblemDetails pd,
-            final URI uri,
-            final Headers headers,
-            final String body) {
-        super(message, pd, uri, headers, body);
-    }
 }
diff --git a/solid/src/test/java/com/inrupt/client/solid/SolidExceptionTest.java b/solid/src/test/java/com/inrupt/client/solid/SolidExceptionTest.java
@@ -49,17 +49,10 @@ void checkSolidWrappedException() {
     @Test
     void checkSolidClientException() {
         final String msg = "Error";
-        final ProblemDetails pd = new ProblemDetails(
-                URI.create("https://example.org/problem"),
-                "Some title",
-                "Some details",
-                123,
-                URI.create("https://example.org/instance")
-        );
         final SolidClientException err = new SolidClientException(
-                msg, pd, URI.create("https://example.org/request"), null, "some body"
+                msg, URI.create("https://example.org/request"), 123, null, "some body"
         );
         assertEquals(msg, err.getMessage());
-        assertEquals(pd, err.getProblemDetails());
+        assertEquals(123, err.getProblemDetails().getStatus());
     }
 }
