Refactor

Author: NSeydoux

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

@@ -22,6 +22,8 @@
 
 import com.inrupt.client.*;
 import com.inrupt.client.auth.Session;
+import com.inrupt.client.spi.JsonService;
+import com.inrupt.client.spi.ServiceProvider;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -52,11 +54,22 @@ public class SolidClient {
     private final Client client;
     private final Headers defaultHeaders;
     private final boolean fetchAfterWrite;
+    private JsonService jsonService;
 
     SolidClient(final Client client, final Headers headers, final boolean fetchAfterWrite) {
         this.client = Objects.requireNonNull(client, "Client may not be null!");
         this.defaultHeaders = Objects.requireNonNull(headers, "Headers may not be null!");
         this.fetchAfterWrite = fetchAfterWrite;
+
+        // It is acceptable for a SolidClient instance to be in a classpath without any implementation for
+        // JsonService, in which case the ProblemDetails exceptions will fallback to default and not be parsed.
+        JsonService js;
+        try {
+            js = ServiceProvider.getJsonService();
+        } catch (IllegalStateException e) {
+            js = null;
+        }
+        this.jsonService = js;
     }
 
     /**
@@ -122,12 +135,18 @@ public <T extends Resource> CompletionStage<T> read(final URI identifier, final
         return client.send(request, Response.BodyHandlers.ofByteArray())
             .thenApply(response -> {
                 if (response.statusCode() >= ERROR_STATUS) {
-                    throw SolidClientException.fromErrorResponse(
+                    final ProblemDetails pd = ProblemDetails.fromErrorResponse(
+                        response.statusCode(),
+                        response.headers(),
+                        response.body(),
+                        this.jsonService
+                    );
+                    throw SolidClientException.handle(
                         "Unable to read resource at " + request.uri(),
+                        pd,
                         response.uri(),
-                        response.statusCode(),
                         response.headers(),
-                        response.body()
+                        new String(response.body())
                     );
                 } else {
                     final String contentType = response.headers().firstValue(CONTENT_TYPE)
@@ -277,12 +296,18 @@ public <T extends Resource> CompletionStage<Void> delete(final T resource, final
             if (isSuccess(res.statusCode())) {
                 return null;
             } else {
-                throw SolidClientException.fromErrorResponse(
-                        "Unable to delete resource",
-                        resource.getIdentifier(),
-                        res.statusCode(),
-                        res.headers(),
-                        res.body()
+                final ProblemDetails pd = ProblemDetails.fromErrorResponse(
+                    res.statusCode(),
+                    res.headers(),
+                    res.body(),
+                    this.jsonService
+                );
+                throw SolidClientException.handle(
+                    "Unable to delete resource",
+                    pd,
+                    resource.getIdentifier(),
+                    res.headers(),
+                    new String(res.body())
                 );
             }
         });
@@ -369,12 +394,18 @@ <T extends Resource> Function<Response<byte[]>, CompletionStage<T>> handleRespon
             final Headers headers, final String message) {
         return res -> {
             if (!isSuccess(res.statusCode())) {
-                throw SolidClientException.fromErrorResponse(
-                        message,
-                        resource.getIdentifier(),
-                        res.statusCode(),
-                        res.headers(),
-                        res.body()
+                final ProblemDetails pd = ProblemDetails.fromErrorResponse(
+                    res.statusCode(),
+                    res.headers(),
+                    res.body(),
+                    this.jsonService
+                );
+                throw SolidClientException.handle(
+                    message,
+                    pd,
+                    resource.getIdentifier(),
+                    res.headers(),
+                    new String(res.body())
                 );
             }
 
@@ -385,7 +416,6 @@ <T extends Resource> Function<Response<byte[]>, CompletionStage<T>> handleRespon
             @SuppressWarnings("unchecked")
             final Class<T> clazz = (Class<T>) resource.getClass();
             return read(resource.getIdentifier(), headers, clazz);
-
         };
     }
 

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

@@ -24,13 +24,8 @@
 import com.inrupt.client.Headers;
 import com.inrupt.client.ProblemDetails;
 import com.inrupt.client.spi.JsonService;
-import com.inrupt.client.spi.ServiceProvider;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * A runtime exception for use with SolidClient HTTP operations.
@@ -116,62 +111,6 @@ public String getBody() {
         return body;
     }
 
-    /**
-     * It is acceptable for a SolidClient instance to be in a classpath without any implementation for
-     * JsonService, in which case the ProblemDetails exceptions will fallback to default and not be parsed.
-     * @return a JsonService instance, null if none is available
-     */
-    private static JsonService getJsonService() {
-        if (SolidClientException.jsonServiceInitialized) {
-            return SolidClientException.jsonService;
-        }
-        JsonService js;
-        try {
-
-            js = ServiceProvider.getJsonService();
-        } catch (IllegalStateException e) {
-            js = null;
-        }
-        SolidClientException.jsonService = js;
-        SolidClientException.jsonServiceInitialized = true;
-        return SolidClientException.jsonService;
-    }
-
-    public static SolidClientException fromErrorResponse(
-            final String message,
-            final URI uri,
-            final int code,
-            final Headers headers,
-            final byte[] body
-    ) {
-        ProblemDetails pd;
-        final JsonService jsonService = getJsonService();
-        if (
-                jsonService == null
-                        || (headers != null && !headers.allValues("Content-Type").contains(ProblemDetails.MIME_TYPE))) {
-            pd = new ProblemDetails(null, HttpStatus.getStatusMessage(code), null, code, null);
-            return SolidClientException.handle(message, pd, uri, headers, new String(body));
-        }
-        try {
-            // ProblemDetails doesn't have a default constructor, and we can't use JSON mapping annotations because
-            // the JSON service is an abstraction over JSON-B and Jackson, so we deserialize the JSON object in a Map
-            // and build the ProblemDetails from the Map values.
-            final Map<String, Object> pdData = jsonService.fromJson(
-                    new ByteArrayInputStream(body),
-                    new HashMap<String, Object>(){}.getClass().getGenericSuperclass()
-            );
-            final String title = (String) pdData.get("title");
-            final String details = (String) pdData.get("details");
-            final URI type = URI.create((String) pdData.get("type"));
-            final URI instance = URI.create((String) pdData.get("instance"));
-            final int status = (int) pdData.get("status");
-            pd = new ProblemDetails(type, title, details, status, instance);
-        } catch (IOException e) {
-            pd = new ProblemDetails( null, HttpStatus.getStatusMessage(code), null, code, null);
-        }
-        return SolidClientException.handle(message, pd, uri, headers, new String(body));
-    }
-
     /**
      *
      * @param message the resulting exception message