adds tests

removes non-trellis related methods

Author: christopher-johnson

build.gradle

@@ -34,9 +34,8 @@ ext {
     logbackVersion = '1.2.3'
     jaxrsVersion = '2.1'
     kafkaVersion = '1.0.0_1'
-    mustacheVersion = '0.9.5_1'
+    mustacheVersion = '0.9.5'
     slf4jVersion = '1.7.25'
-    servicemixXercesVersion = '2.11.0_1'
     thriftVersion = '0.11.0'
     trellisVersion = '0.7.0-SNAPSHOT'
 
@@ -93,6 +92,22 @@ allprojects { subproj ->
     configurations {
         all {
             resolutionStrategy {
+                force("org.trellisldp:trellis-agent-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-api-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-app-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-app-triplestore-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-audit-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-constraint-rules-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-event-serialization-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-file-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-id-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-io-jena-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-http-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-namespaces-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-rdfa-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-triplestore-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-vocabulary-jpms:$trellisVersion")
+                force("org.trellisldp:trellis-webac-jpms:$trellisVersion")
                 force "de.ubleipzig:jena.arq-jpms:$jenaVersion"
                 force "de.ubleipzig:jena.base-jpms:$jenaVersion"
                 force "de.ubleipzig:jena.core-jpms:$jenaVersion"

client/build.gradle

@@ -54,7 +54,7 @@ dependencies {
     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.servicemix.bundles:org.apache.servicemix.bundles.mustache-compiler:$mustacheVersion")
+    testImplementation("com.github.spullara.mustache.java:compiler:$mustacheVersion")
     testImplementation("org.apache.thrift:libthrift:$thriftVersion")
     testImplementation("org.eclipse.jetty:jetty-alpn-java-server:$jettyAlpnVersion")
     testImplementation("org.trellisldp:trellis-agent-jpms:$trellisVersion")
@@ -69,6 +69,7 @@ dependencies {
     testImplementation("org.trellisldp:trellis-io-jena-jpms:$trellisVersion")
     testImplementation("org.trellisldp:trellis-http-jpms:$trellisVersion")
     testImplementation("org.trellisldp:trellis-namespaces-jpms:$trellisVersion")
+    testImplementation("org.trellisldp:trellis-rdfa-jpms:$trellisVersion")
     testImplementation("org.trellisldp:trellis-triplestore-jpms:$trellisVersion")
     testImplementation("org.trellisldp:trellis-vocabulary-jpms:$trellisVersion")
     testImplementation("org.trellisldp:trellis-webac-jpms:$trellisVersion")

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

@@ -285,13 +285,22 @@ String getJsonProfileLDF(IRI identifier, String profile, String subject, String
     /**
      * getResponse.
      *
+     * @param identifier identifier
+     * @return HttpResponse response
+     * @throws LdpClientException an URISyntaxException, IOException or InterruptedException
+     */
+    HttpResponse getResponse(final IRI identifier) throws LdpClientException;
+
+    /**
+     * getResponseWithHeaders.
+     *
      * @param identifier a resource identifier
      * @param metadata a {@link Map} of headers
      * @return body and headers as a {@link Map}
      * @throws LdpClientException an URISyntaxException, IOException or InterruptedException
      */
-    Map<String, Map<String, List<String>>> getResponse(final IRI identifier, final Map<String, String> metadata)
-            throws LdpClientException;
+    Map<String, Map<String, List<String>>> getResponseWithHeaders(final IRI identifier, final Map<String, String>
+            metadata) throws LdpClientException;
 
     /**
      * options.
@@ -360,27 +369,36 @@ void postSlug(final IRI identifier, final String slug, final InputStream stream,
     void postBinaryWithDigest(final IRI identifier, final InputStream stream, final String contentType, String
             digest) throws LdpClientException;
 
+
+    /**
+     * createBasicContainer.
+     *
+     * @param identifier a resource identifier
+     * @throws LdpClientException an URISyntaxException, IOException or InterruptedException
+     */
+    void createBasicContainer(final IRI identifier) throws LdpClientException;
+
     /**
-     * newLdpDc.
+     * createDirectContainer.
      *
      * @param identifier a resource identifier
      * @param slug a resource name as a {@link String}
      * @param membershipObj a membership Object identifier
      * @throws LdpClientException an URISyntaxException, IOException or InterruptedException
      */
-    void newLdpDc(final IRI identifier, final String slug, IRI membershipObj) throws LdpClientException;
+    void createDirectContainer(final IRI identifier, final String slug, IRI membershipObj) throws LdpClientException;
 
     /**
-     * newLdpDcWithAuth.
+     * createDirectContainerWithAuth.
      *
      * @param identifier a resource identifier
      * @param slug a resource name as a {@link String}
      * @param membershipObj a membership Object identifier
      * @param authorization an authorization token
      * @throws LdpClientException an URISyntaxException, IOException or InterruptedException
      */
-    void newLdpDcWithAuth(final IRI identifier, final String slug, IRI membershipObj, String authorization) throws
-            LdpClientException;
+    void createDirectContainerWithAuth(final IRI identifier, final String slug, IRI membershipObj, String
+            authorization) throws LdpClientException;
 
     /**
      * put.
@@ -486,9 +504,10 @@ void putIfUnmodified(final IRI identifier, final InputStream stream, final Strin
      *
      * @param identifier a resource identifier
      * @param stream an {@link InputStream}
+     * @return Boolean boolean
      * @throws LdpClientException an URISyntaxException
      */
-    void asyncPut(final IRI identifier, final InputStream stream) throws LdpClientException;
+    Boolean asyncPut(final IRI identifier, final InputStream stream) throws LdpClientException;
 
     /**
      * multiSubscriberAsyncGet.
@@ -497,16 +516,15 @@ void putIfUnmodified(final IRI identifier, final InputStream stream, final Strin
      * @return an {@link Map}
      * @throws LdpClientException an URISyntaxException
      */
-    Map<HttpRequest, CompletableFuture<HttpResponse<String>>> multiSubscriberAsyncGet(
-            final IRI identifier) throws LdpClientException;
+    Map<HttpRequest, CompletableFuture<HttpResponse<String>>> multiSubscriberAsyncGet(final IRI identifier) throws
+            LdpClientException;
 
     /**
      * joiningCompleteableFuturePut.
      *
      * @param bodies a Map of URI keys with InputStream values
      * @param contentType a content Type
      */
-    void joiningCompletableFuturePut(Map<URI, InputStream> bodies, final String
-            contentType);
+    void joiningCompletableFuturePut(Map<URI, InputStream> bodies, final String contentType);
 
 }