adds gradle 4.8-rc1

Author: christopher-johnson

build.gradle

@@ -60,7 +60,7 @@ allprojects { subproj ->
     apply plugin: 'checkstyle'
     apply plugin: 'com.bmuschko.nexus'
     apply plugin: 'org.junit.platform.gradle.plugin'
-    apply plugin: 'jacoco'
+    //apply plugin: 'jacoco'
     apply plugin: 'com.kncept.junit5.reporter'
 
     ext {
@@ -75,15 +75,12 @@ allprojects { subproj ->
         license = 'Apache 2'
     }
 
-    jacoco.toolVersion = jacocoVersion
+    //jacoco.toolVersion = jacocoVersion
 
     group = 'org.trellisldp'
 
     repositories {
         mavenCentral()
-        flatDir {
-            dirs "$rootProject.projectDir/lib"
-        }
         maven {
             url "https://oss.sonatype.org/content/repositories/snapshots"
         }
@@ -122,12 +119,9 @@ allprojects { subproj ->
         tasks.withType(JavaCompile) {
             options.compilerArgs.add("-Xlint:unchecked")
             options.compilerArgs.add("-Xlint:deprecation")
-            options.compilerArgs.addAll(["--add-modules", "jdk.incubator.httpclient"])
         }
     }
 
-    junitPlatformTest.jvmArgs("--add-modules", "jdk.incubator.httpclient")
-
     dependencies {
         testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
         testImplementation("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
@@ -139,8 +133,8 @@ allprojects { subproj ->
 
 subprojects { subproj ->
 
-    sourceCompatibility = 1.11
-    targetCompatibility = 1.11
+    sourceCompatibility = 1.10
+    targetCompatibility = 1.10
 
     checkstyle {
         configFile = rootProject.file('buildtools/src/main/resources/checkstyle/checkstyle.xml')
@@ -232,16 +226,18 @@ subprojects { subproj ->
             links 'https://commons.apache.org/proper/commons-rdf/apidocs/'
         }
     }
-
+/*
     afterEvaluate {
         if (subproj.name in jacocoTestProjects) {
             jacoco {
                 applyTo junitPlatformTest
             }
         }
     }
+*/
 }
 
+/*
 configure(rootProject) {
     task jacocoMerge(type: JacocoMerge) {
         subprojects.findAll { it.name in jacocoTestProjects }
@@ -265,4 +261,5 @@ configure(rootProject) {
             csv.enabled = false
         }
     }
-}
+}
+*/

buildtools/src/install/install-jdk-10.sh renamed to buildtools/src/install/install-jdk-11.sh

@@ -4,11 +4,11 @@
 
 set -e
 
-JDK_FEATURE=10
-JDK_ARCHIVE=openjdk-${JDK_FEATURE}_linux-x64_bin.tar.gz
+JDK_FEATURE=11
+JDK_ARCHIVE=openjdk-${JDK_FEATURE}-ea+13_linux-x64_bin.tar.gz
 
 cd ~
-wget https://download.java.net/java/GA/jdk${JDK_FEATURE}/${JDK_FEATURE}/binaries/${JDK_ARCHIVE}
+wget https://download.java.net/java/early_access/jdk11/13/GPL/openjdk-11-ea+13_linux-x64_bin.tar.gz
 tar -xzf ${JDK_ARCHIVE}
 export JAVA_HOME=~/jdk-${JDK_FEATURE}
 export PATH=${JAVA_HOME}/bin:$PATH

client/build.gradle

@@ -53,7 +53,7 @@ dependencies {
     testImplementation("javax.activation:javax.activation-api:$activationApiVersion")
     testImplementation("org.apache.commons:commons-collections4:$commonsCollectionsVersion")
     testImplementation("org.apache.httpcomponents:httpclient-cache:$httpclientVersion")
-    testImplementation("org.apache.servicemix.bundles:org.apache.servicemix.bundles.kafka-clients:$kafkaVersion")
+    testImplementation("org.apache.kafka:kafka-clients:$kafkaVersion")
     testImplementation("com.github.spullara.mustache.java:compiler:$mustacheVersion")
     testImplementation("org.apache.thrift:libthrift:$thriftVersion")
     testImplementation("org.eclipse.jetty:jetty-alpn-java-server:$jettyAlpnVersion")

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

@@ -14,15 +14,14 @@
 
 package org.trellisldp.client;
 
+import java.io.FileInputStream;
 import java.io.InputStream;
 import java.net.URI;
+import java.net.http.HttpResponse;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
+import java.util.function.Supplier;
 
 import org.apache.commons.rdf.api.IRI;
 
@@ -410,6 +409,16 @@ void createDirectContainerWithAuth(final IRI identifier, final String slug, IRI
      */
     void put(final IRI identifier, final InputStream stream, final String contentType) throws LdpClientException;
 
+    /**
+     * put.
+     *
+     * @param identifier a resource identifier
+     * @param fileInputStreamSupplier an {@link Supplier}
+     * @param contentType a content type
+     * @throws LdpClientException an URISyntaxException, IOException or InterruptedException
+     */
+    void putSupplier(final IRI identifier, Supplier<FileInputStream> fileInputStreamSupplier, final String contentType) throws LdpClientException;
+
     /**
      * putWithResponse.
      *

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

@@ -14,8 +14,13 @@
 
 package org.trellisldp.client;
 
+import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpRequest.BodyPublishers.noBody;
+import static java.net.http.HttpRequest.BodyPublishers.ofInputStream;
+import static java.net.http.HttpRequest.BodyPublishers.ofString;
+import static java.net.http.HttpResponse.BodyHandlers.ofByteArray;
 import static java.net.http.HttpResponse.BodyHandlers.ofFile;
+import static java.net.http.HttpResponse.BodyHandlers.ofString;
 import static java.time.Instant.ofEpochMilli;
 import static java.time.ZoneOffset.UTC;
 import static java.time.format.DateTimeFormatter.RFC_1123_DATE_TIME;
@@ -27,38 +32,32 @@
 import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE;
 import static javax.ws.rs.core.HttpHeaders.ETAG;
 import static javax.ws.rs.core.HttpHeaders.LINK;
-import static java.net.http.HttpClient.Version.HTTP_2;
-import static java.net.http.HttpRequest.BodyPublishers.ofInputStream;
-import static java.net.http.HttpRequest.BodyPublishers.ofString;
-import static java.net.http.HttpResponse.BodyHandlers.ofString;
-import static java.net.http.HttpResponse.BodyHandlers.discarding;
-import static java.net.http.HttpResponse.BodyHandlers.ofByteArray;
 import static org.apache.jena.arq.riot.WebContent.contentTypeJSONLD;
 import static org.apache.jena.arq.riot.WebContent.contentTypeNTriples;
 import static org.apache.jena.arq.riot.WebContent.contentTypeSPARQLUpdate;
 import static org.apache.jena.arq.riot.WebContent.contentTypeTurtle;
 import static org.slf4j.LoggerFactory.getLogger;
 
+import java.io.FileInputStream;
 import java.io.InputStream;
 import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import javax.net.ssl.SSLContext;
 
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-
 import org.apache.commons.rdf.api.IRI;
 import org.slf4j.Logger;
 import org.trellisldp.vocabulary.DC;
@@ -775,6 +774,23 @@ public void put(final IRI identifier, final InputStream stream, final String con
         }
     }
 
+    @Override
+    public void putSupplier(final IRI identifier, Supplier<FileInputStream> fileInputStreamSupplier, final String contentType) throws
+            LdpClientException {
+        try {
+            requireNonNull(identifier, NON_NULL_IDENTIFIER);
+            final URI uri = new URI(identifier.getIRIString());
+            final HttpRequest req = HttpRequest.newBuilder(uri).headers(CONTENT_TYPE, contentType).PUT(
+                    ofInputStream(fileInputStreamSupplier)).build();
+            final HttpResponse<String> response = client.send(req, ofString());
+            log.info(
+                    String.valueOf(response.version()) + " PUT request to {} returned {}", identifier,
+                    String.valueOf(response.statusCode()));
+        } catch (Exception ex) {
+            throw new LdpClientException(ex.toString(), ex.getCause());
+        }
+    }
+
     @Override
     public Boolean putWithResponse(final IRI identifier, final InputStream stream, final String contentType) throws
             LdpClientException {

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

@@ -17,6 +17,7 @@
 import static java.time.LocalDateTime.now;
 import static org.apache.jena.arq.riot.RDFFormat.NQUADS;
 
+import com.github.jsonldjava.core.JsonLdError;
 import com.github.jsonldjava.core.JsonLdOptions;
 import com.github.jsonldjava.utils.JsonUtils;
 
@@ -120,9 +121,10 @@ private static String writeGraphToN3(final DatasetGraph graph) {
     private static void writeFramedJsonLd(final OutputStream output, final DatasetGraph graph) {
         String n3 = writeGraphToN3(graph);
         final JsonLdOptions opts = new JsonLdOptions();
+        try {
         final Object outobj = com.github.jsonldjava.core.JsonLdProcessor.fromRDF(n3, opts);
         final InputStream fs = EarlReportExtension.class.getResourceAsStream("/earlreport/earlreport-frame.json");
-        try {
+
             final Object frame = JsonUtils.fromInputStream(fs);
             final Object frameobj = com.github.jsonldjava.core.JsonLdProcessor.frame(outobj, frame, opts);
             final String json = JsonUtils.toPrettyString(frameobj);
@@ -131,6 +133,8 @@ private static void writeFramedJsonLd(final OutputStream output, final DatasetGr
             output.close();
         } catch (IOException e) {
             e.getMessage();
+        } catch (JsonLdError jsonLdError) {
+            jsonLdError.printStackTrace();
         }
     }
 

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

@@ -23,20 +23,24 @@
 
 import io.dropwizard.testing.DropwizardTestSupport;
 
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.net.URI;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
 
 import javax.net.ssl.SSLContext;
 
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-
 import org.apache.commons.rdf.api.IRI;
 import org.apache.commons.rdf.jena.JenaRDF;
 import org.junit.jupiter.api.AfterAll;
@@ -57,10 +61,10 @@
 public class H2ClientTest {
     private static final DropwizardTestSupport<TrellisConfiguration> APP = new DropwizardTestSupport<>(
             TrellisApplication.class, resourceFilePath("trellis-config.yml"), config("server"
-                    + ".applicationConnectors[1].port", "8446"), config("binaries", resourceFilePath("data")
-                    + "/binaries"), config("mementos", resourceFilePath("data") + "/mementos"), config("namespaces",
-                    resourceFilePath("data/namespaces.json")), config("server.applicationConnectors[1].keyStorePath",
-                    resourceFilePath("keystore/trellis.jks")));
+            + ".applicationConnectors[1].port", "8446"), config("binaries", resourceFilePath("data")
+            + "/binaries"), config("mementos", resourceFilePath("data") + "/mementos"), config("namespaces",
+            resourceFilePath("data/namespaces.json")), config("server.applicationConnectors[1].keyStorePath",
+            resourceFilePath("keystore/trellis.jks")));
     private static final JenaRDF rdf = new JenaRDF();
     private static String baseUrl;
     private static String pid;
@@ -93,8 +97,8 @@ void init() {
     void tearDown() {
     }
 
-    private static InputStream getTestJsonResource() {
-        return H2ClientTest.class.getResourceAsStream("/webanno.complete-embedded.json");
+    private static Path getTestJsonResource() {
+        return Paths.get(H2ClientTest.class.getResource("/webanno.complete-embedded.json").getPath());
     }
 
     private static InputStream getTestN3Resource() {
@@ -117,7 +121,7 @@ void testRepeatedPutH2N3Resource() throws Exception {
     void testRepeatedPutH2JsonResource() throws Exception {
         try {
             final IRI identifier = rdf.createIRI(baseUrl + pid);
-            h2client.put(identifier, getTestJsonResource(), contentTypeJSONLD);
+            h2client.putSupplier(identifier, fileInputStreamSupplier(getTestJsonResource()), contentTypeJSONLD);
             final Map<String, List<String>> headers = h2client.head(identifier);
             assertTrue(headers.containsKey(LINK));
         } catch (Exception ex) {
@@ -143,4 +147,19 @@ void testJoiningCompletableFuturePut() throws Exception {
         }
     }
 
+    static Supplier<FileInputStream> fileInputStreamSupplier(Path f) {
+        return new Supplier<>() {
+            Path file = f;
+            @Override
+            public FileInputStream get() {
+                try {
+                    PrivilegedExceptionAction<FileInputStream> pa =
+                            () -> new FileInputStream(file.toFile());
+                    return AccessController.doPrivileged(pa);
+                } catch (PrivilegedActionException x) {
+                    throw new UncheckedIOException((IOException)x.getCause());
+                }
+            }
+        };
+    }
 }

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

@@ -43,6 +43,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.net.URLEncoder;
+import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -62,8 +63,6 @@
 
 import javax.ws.rs.core.Link;
 
-import java.net.http.HttpResponse;
-
 import org.apache.commons.rdf.api.Graph;
 import org.apache.commons.rdf.api.IRI;
 import org.apache.commons.rdf.jena.JenaRDF;

client/src/test/resources/keystore/trellis.jks

@@ -1,6 +1,6 @@
-#Thu May 10 13:21:34 CEST 2018
+#Wed May 16 20:56:30 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-rc-1-all.zip

gradle/wrapper/gradle-wrapper.jar

@@ -1,3 +1,4 @@
 rootProject.name = 'trellis-client'
 include 'trellis-client'
-project(':trellis-client').projectDir = "$rootDir/client" as File
+project(':trellis-client').projectDir = "$rootDir/client" as File
+enableFeaturePreview('STABLE_PUBLISHING')