Merge branch 'JCL-457/jena-body-handler' into JCL-402/rdf4j-body-handlers

Author: acoburn

api/src/main/java/com/inrupt/client/ProblemDetails.java

@@ -34,7 +34,13 @@
  * @see <a href="https://www.rfc-editor.org/rfc/rfc9457">RFC 9457 Problem Details for HTTP APIs</a>
  */
 public class ProblemDetails {
+    /**
+     * The <a href="https://www.rfc-editor.org/rfc/rfc9457">RFC9457</a> default MIME type.
+     */
     public static final String MIME_TYPE = "application/problem+json";
+    /**
+     * The <a href="https://www.rfc-editor.org/rfc/rfc9457">RFC9457</a> default problem type.
+     */
     public static final String DEFAULT_TYPE = "about:blank";
     private final URI type;
     private final String title;
@@ -44,6 +50,15 @@ public class ProblemDetails {
     private static JsonService jsonService;
     private static boolean isJsonServiceInitialized;
 
+    /**
+     * Build a ProblemDetails instance providing the expected fields as described in
+     * <a href="https://www.rfc-editor.org/rfc/rfc9457">RFC9457</a>.
+     * @param type the problem type
+     * @param title the problem title
+     * @param details the problem details
+     * @param status the error response status code
+     * @param instance the problem instance
+     */
     public ProblemDetails(
         final URI type,
         final String title,
@@ -58,22 +73,42 @@ public ProblemDetails(
         this.instance = instance;
     }
 
+    /**
+     * The problem type.
+     * @return the type
+     */
     public URI getType() {
         return this.type;
     };
 
+    /**
+     * The problem title.
+     * @return the title
+     */
     public String getTitle() {
         return this.title;
     };
 
+    /**
+     * The problem details.
+     * @return the details
+     */
     public String getDetails() {
         return this.details;
     };
 
+    /**
+     * The problem status code.
+     * @return the status code
+     */
     public int getStatus() {
         return this.status;
     };
 
+    /**
+     * The problem instance.
+     * @return the instance
+     */
     public URI getInstance() {
         return this.instance;
     };
@@ -82,10 +117,25 @@ public URI getInstance() {
      * This inner class is only ever used for JSON deserialization. Please do not use in any other context.
      */
     public static class Data {
+        /**
+         * The problem type.
+         */
         public URI type;
+        /**
+         * The problem title.
+         */
         public String title;
+        /**
+         * The problem details.
+         */
         public String details;
+        /**
+         * The problem status code.
+         */
         public int status;
+        /**
+         * The problem instance.
+         */
         public URI instance;
     }
 
@@ -104,6 +154,13 @@ private static JsonService getJsonService() {
         return ProblemDetails.jsonService;
     }
 
+    /**
+     * Builds a {@link ProblemDetails} instance from an HTTP error response.
+     * @param statusCode the HTTP error response status code
+     * @param headers the HTTP error response headers
+     * @param body the HTTP error response body
+     * @return a {@link ProblemDetails} instance
+     */
     public static ProblemDetails fromErrorResponse(
             final int statusCode,
             final Headers headers,

api/src/main/java/com/inrupt/client/Response.java

@@ -97,6 +97,11 @@ interface ResponseInfo {
         ByteBuffer body();
     }
 
+    /**
+     * Indicates whether a status code reflects a successful HTTP response.
+     * @param statusCode the HTTP response status code
+     * @return true if the status code is in the success range, namely [200, 299].
+     */
     static boolean isSuccess(final int statusCode) {
         return statusCode >= 200 && statusCode < 300;
     }

build-tools/owasp/suppressions.xml

@@ -10,37 +10,6 @@
   </suppress>
 
   <!-- Suppressed vulnerabilities. These need monthly review. -->
-  <suppress until="2024-03-01Z">
-    <notes><![CDATA[
-        This vulnerability appears when both Spring MVC AND Spring Security 6.2.1+ appear on the classpath. The JCL only uses Spring Security.
-    ]]></notes>
-    <packageUrl regex="true">^pkg:maven/org\.springframework/spring-.*@.*$</packageUrl>
-    <vulnerabilityName>CVE-2024-22233</vulnerabilityName>
-  </suppress>
-  <suppress until="2024-02-01Z">
-    <notes><![CDATA[
-        This vulnerability appears via wiremock and is used only during test execution. As such, the
-        parse vulnerability is not relevant.
-    ]]></notes>
-    <packageUrl regex="true">^pkg:maven/com\.jayway\.jsonpath/json\-path@.*$</packageUrl>
-    <vulnerabilityName>CVE-2023-51074</vulnerabilityName>
-  </suppress>
-  <suppress until="2023-12-12Z">
-    <notes><![CDATA[
-        This vulnerability appears via wiremock and is used only during test execution. As such, the
-        rapid reset DoS vector is not relevant.
-    ]]></notes>
-    <packageUrl regex="true">^pkg:maven/org\.eclipse\.jetty\.http2/http2\-.*@.*$</packageUrl>
-    <vulnerabilityName>CVE-2023-44487</vulnerabilityName>
-  </suppress>
-  <suppress until="2023-12-12Z">
-    <notes><![CDATA[
-        This vulnerability appears via wiremock and is used only during test execution. As such, the
-        rapid reset DoS vector is not relevant.
-    ]]></notes>
-    <packageUrl regex="true">^pkg:maven/org\.eclipse\.jetty/jetty\-.*@.*$</packageUrl>
-    <vulnerabilityName>CVE-2023-44487</vulnerabilityName>
-  </suppress>
   <suppress until="2024-06-12Z">
     <notes><![CDATA[
         This vulnerability impacts the `UriComponentsBuilder` class, which we are not using.

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

@@ -140,7 +140,7 @@ public <T extends Resource> CompletionStage<T> read(final URI identifier, final
                 Response.BodyHandlers.throwOnError(
                     Response.BodyHandlers.ofByteArray(),
                     (r) -> Response.isSuccess(r.statusCode()),
-                    httpExceptionMapper("Reading resource " + request.uri() + " failed.")
+                    httpExceptionMapper("Reading resource failed.")
                 )
             ).thenApply(response -> {
                 final String contentType = response.headers().firstValue(CONTENT_TYPE)