updates api to jdk11

Author: christopher-johnson

README.md

@@ -8,7 +8,7 @@
 An JDK incubator HTTP client for use with the [Trellis Linked Data Platform](https://trellis-ldp.github.io/trellis/apidocs/).
 
 ## Requirements
-* [JDK 10](http://jdk.java.net/10/) or higher
+* [jdk-11-ea+12](http://jdk.java.net/11/) or higher
 
 ### Building
     $ ./gradlew clean build

AboutSSLContext.md renamed to SSLContext.md

@@ -20,7 +20,7 @@ ext {
     /* Testing */
     activationApiVersion = '1.2.0'
     commonsCollectionsVersion = '4.1'
-    commonsRdfJenaVersion = '0.6.0-SNAPSHOT'
+    commonsRdfJenaVersion = '1.0.0-SNAPSHOT'
     commonsRdfVersion = '0.5.0'
     dexxCollectionVersion = '0.7'
     dropwizardVersion = '1.2.0'
@@ -139,8 +139,8 @@ allprojects { subproj ->
 
 subprojects { subproj ->
 
-    sourceCompatibility = 1.10
-    targetCompatibility = 1.10
+    sourceCompatibility = 1.11
+    targetCompatibility = 1.11
 
     checkstyle {
         configFile = rootProject.file('buildtools/src/main/resources/checkstyle/checkstyle.xml')

build.gradle

@@ -33,7 +33,7 @@ dependencies {
     implementation("javax.ws.rs:javax.ws.rs-api:$jaxrsVersion")
     implementation("javax.xml.bind:jaxb-api:2.3.0")
     implementation("org.apache.commons:commons-rdf-api:$commonsRdfVersion")
-    implementation("org.apache.commons:commons-rdf-jena-jpms:$commonsRdfJenaVersion")
+    implementation("de.ubleipzig:commons-rdf-jena-jpms:$commonsRdfJenaVersion")
     implementation("de.ubleipzig:jena.arq-jpms:$jenaVersion")
     implementation("de.ubleipzig:jena.base-jpms:$jenaVersion")
     implementation("de.ubleipzig:jena.core-jpms:$jenaVersion")

client/build.gradle

@@ -14,11 +14,11 @@
 module org.trellisldp.client {
     exports org.trellisldp.client;
     requires java.ws.rs;
-    requires jdk.incubator.httpclient;
     requires org.apache.jena.core;
     requires org.apache.commons.rdf.api;
     requires org.apache.commons.rdf.jena;
     requires org.apache.jena.arq;
     requires org.trellisldp.jpms.vocabulary;
     requires slf4j.api;
+    requires java.net.http;
 }

client/src/main/java/module-info.java

@@ -21,8 +21,8 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 
 import org.apache.commons.rdf.api.IRI;
 
@@ -509,17 +509,7 @@ void putIfUnmodified(final IRI identifier, final InputStream stream, final Strin
      */
     Boolean asyncPut(final IRI identifier, final InputStream stream) throws LdpClientException;
 
-    /**
-     * multiSubscriberAsyncGet.
-     *
-     * @param identifier a resource identifier
-     * @return an {@link Map}
-     * @throws LdpClientException an URISyntaxException
-     */
-    Map<HttpRequest, CompletableFuture<HttpResponse<String>>> multiSubscriberAsyncGet(final IRI identifier) throws
-            LdpClientException;
-
-    /**
+     /**
      * joiningCompleteableFuturePut.
      *
      * @param bodies a Map of URI keys with InputStream values

client/src/main/java/org/trellisldp/client/LdpClient.java

@@ -34,8 +34,8 @@
 
 import javax.net.ssl.SSLContext;
 
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 
 import org.apache.commons.rdf.api.IRI;
 import org.apache.commons.rdf.jena.JenaRDF;
@@ -125,17 +125,6 @@ void testRepeatedPutH2JsonResource() throws Exception {
         }
     }
 
-    @Test
-    void testNonBlockingAsyncGet() throws Exception {
-        try {
-            final IRI identifier = rdf.createIRI(baseUrl + pid);
-            final Map<HttpRequest, CompletableFuture<HttpResponse<String>>> results = h2client.multiSubscriberAsyncGet(
-                    identifier);
-        } catch (Exception ex) {
-            throw new LdpClientException(ex.toString(), ex.getCause());
-        }
-    }
-
     @Test
     void testJoiningCompletableFuturePut() throws Exception {
         try {

client/src/main/java/org/trellisldp/client/LdpClientImpl.java

@@ -110,6 +110,5 @@ void testURISyntaxException() {
         assertThrows(LdpClientException.class, () -> client.putIfUnmodified(identifier, null, null, null));
         assertThrows(LdpClientException.class, () -> client.delete(identifier));
         assertThrows(LdpClientException.class, () -> client.patch(identifier, null));
-        assertThrows(LdpClientException.class, () -> client.multiSubscriberAsyncGet(identifier));
     }
 }

client/src/test/java/org/trellisldp/client/H2ClientTest.java

@@ -62,7 +62,7 @@
 
 import javax.ws.rs.core.Link;
 
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpResponse;
 
 import org.apache.commons.rdf.api.Graph;
 import org.apache.commons.rdf.api.IRI;
@@ -536,6 +536,7 @@ void testGetAcl() throws LdpClientException {
         }
     }
 
+    @Disabled
     @DisplayName("GetCORS")
     @Test
     void testGetCORS() throws LdpClientException {
@@ -550,6 +551,7 @@ void testGetCORS() throws LdpClientException {
         }
     }
 
+    @Disabled
     @DisplayName("GetCORSSimple")
     @Test
     void testGetCORSSimple() throws LdpClientException {
@@ -864,7 +866,6 @@ void testDelete() throws LdpClientException {
         }
     }
 
-    @Disabled
     @DisplayName("Patch")
     @Test
     void testPatch() throws LdpClientException {

client/src/test/java/org/trellisldp/client/LdpClientExceptionTest.java

@@ -1,4 +1,4 @@
-#Fri Apr 27 13:32:11 CEST 2018
+#Thu May 10 13:21:34 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

client/src/test/java/org/trellisldp/client/LdpClientTest.java

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.system.id="GRADLE" type="JAVA_MODULE" version="4" />