Json format exceptions

Author: skyforce77

src/main/java/com/authlete/jaxrs/server/api/vci/BatchCredentialEndpoint.java

@@ -84,13 +84,13 @@ private CredentialRequestInfo[] credentialBatchParse(final AuthleteApi api,
         switch (response.getAction())
         {
             case BAD_REQUEST:
-                throw ExceptionUtil.badRequestException(content);
+                throw ExceptionUtil.badRequestExceptionJson(content);
 
             case UNAUTHORIZED:
                 throw ExceptionUtil.unauthorizedException(accessToken, content);
 
             case FORBIDDEN:
-                throw ExceptionUtil.forbiddenException(content);
+                throw ExceptionUtil.forbiddenExceptionJson(content);
 
             case OK:
                 return response.getInfo();

src/main/java/com/authlete/jaxrs/server/api/vci/CredentialEndpoint.java

@@ -82,20 +82,20 @@ private CredentialRequestInfo credentialSingleParse(final AuthleteApi api,
         switch (response.getAction())
         {
             case BAD_REQUEST:
-                throw ExceptionUtil.badRequestException(content);
+                throw ExceptionUtil.badRequestExceptionJson(content);
 
             case UNAUTHORIZED:
                 throw ExceptionUtil.unauthorizedException(accessToken, content);
 
             case FORBIDDEN:
-                throw ExceptionUtil.forbiddenException(content);
+                throw ExceptionUtil.forbiddenExceptionJson(content);
 
             case OK:
                 return response.getInfo();
 
             case INTERNAL_SERVER_ERROR:
             default:
-                throw ExceptionUtil.internalServerErrorException(content);
+                throw ExceptionUtil.internalServerErrorExceptionJson(content);
         }
     }
 

src/main/java/com/authlete/jaxrs/server/api/vci/DeferredCredentialEndpoint.java

@@ -89,20 +89,20 @@ private CredentialRequestInfo credentialDeferredParse(final AuthleteApi api,
         switch (response.getAction())
         {
             case BAD_REQUEST:
-                throw ExceptionUtil.badRequestException(content);
+                throw ExceptionUtil.badRequestExceptionJson(content);
 
             case UNAUTHORIZED:
                 throw ExceptionUtil.unauthorizedException(accessToken, content);
 
             case FORBIDDEN:
-                throw ExceptionUtil.forbiddenException(content);
+                throw ExceptionUtil.forbiddenExceptionJson(content);
 
             case OK:
                 return response.getInfo();
 
             case INTERNAL_SERVER_ERROR:
             default:
-                throw ExceptionUtil.internalServerErrorException(content);
+                throw ExceptionUtil.internalServerErrorExceptionJson(content);
         }
     }
 

src/main/java/com/authlete/jaxrs/server/util/ExceptionUtil.java

@@ -18,6 +18,8 @@
 
 
 import static com.authlete.jaxrs.server.util.ResponseUtil.badRequest;
+import static com.authlete.jaxrs.server.util.ResponseUtil.badRequestJson;
+import static com.authlete.jaxrs.server.util.ResponseUtil.forbidden;
 import static com.authlete.jaxrs.server.util.ResponseUtil.forbiddenJson;
 import static com.authlete.jaxrs.server.util.ResponseUtil.internalServerErrorJson;
 import static com.authlete.jaxrs.server.util.ResponseUtil.unauthorized;
@@ -49,6 +51,22 @@ public static WebApplicationException badRequestException(String entity)
     }
 
 
+    /**
+     * Create an exception indicating "400 Bad Request" in application/json format.
+     *
+     * @param entity
+     *         An entity to contain in the response of the exception.
+     *
+     * @return
+     *         An exception indicating "400 Bad Request".
+     */
+    public static WebApplicationException badRequestExceptionJson(String entity)
+    {
+        return new WebApplicationException(entity, badRequestJson(entity));
+    }
+
+
+
     /**
      * Create an exception indicating "400 Bad Request".
      *
@@ -111,6 +129,21 @@ public static WebApplicationException unauthorizedException(Viewable entity, Str
      *         An exception indicating "403 Forbidden".
      */
     public static WebApplicationException forbiddenException(final String entity)
+    {
+        return new WebApplicationException(entity, forbidden(entity));
+    }
+
+
+    /**
+     * Create an exception indicating "403 Forbidden" in application/json format.
+     *
+     * @param entity
+     *         An entity to contain in the response of the exception.
+     *
+     * @return
+     *         An exception indicating "403 Forbidden".
+     */
+    public static WebApplicationException forbiddenExceptionJson(final String entity)
     {
         return new WebApplicationException(entity, forbiddenJson(entity));
     }

src/main/java/com/authlete/jaxrs/server/util/ResponseUtil.java

@@ -139,6 +139,21 @@ public static Response badRequest(String entity)
     }
 
 
+    /**
+     * Build an "application/json" response of "400 Bad Request".
+     *
+     * @param entity
+     *         A string entity to contain in the response.
+     *
+     * @return
+     *         An "application/json" response of "400 Bad Request".
+     */
+    public static Response badRequestJson(String entity)
+    {
+        return builderForJson(Status.BAD_REQUEST, entity).build();
+    }
+
+
     /**
      * Build a "text/html" response of "400 Bad Request".
      *
@@ -194,6 +209,21 @@ public static Response unauthorized(Viewable entity, String challenge)
     }
 
 
+    /**
+     * Build a "text/plain" response of "403 Forbidden".
+     *
+     * @param entity
+     *         A string entity to contain in the response.
+     *
+     * @return
+     *         An "text/plain" response of "403 Forbidde".
+     */
+    public static Response forbidden(final String entity)
+    {
+        return builderForTextPlain(Status.FORBIDDEN, entity).build();
+    }
+
+
     /**
      * Build an "application/json" response of "403 Forbidden".
      *