Fix to update to latest Trellis API

Author: ajs6f

impl/src/main/java/edu/si/trellis/CassandraBinary.java

@@ -1,11 +1,15 @@
 package edu.si.trellis;
 
+import static java.util.concurrent.CompletableFuture.completedFuture;
+
 import edu.si.trellis.query.binary.Read;
 import edu.si.trellis.query.binary.ReadRange;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 
 import org.apache.commons.io.input.BoundedInputStream;
 import org.apache.commons.rdf.api.IRI;
@@ -40,22 +44,23 @@ public CassandraBinary(IRI id, Read read, ReadRange readRange, int chunkLength)
     }
 
     @Override
-    public InputStream getContent() {
-        return read.execute(id);
+    public CompletionStage<InputStream> getContent() {
+        return completedFuture(read.execute(id));
     }
 
     @Override
-    public BoundedInputStream getContent(int from, int to) {
+    public CompletionStage<InputStream> getContent(int from, int to) {
         int firstChunk = from / chunkLength;
         int lastChunk = to / chunkLength;
         int chunkStreamStart = from % chunkLength;
         int rangeSize = to - from + 1; // +1 because range is inclusive
-        try (InputStream retrieve = readRange.execute(id, firstChunk, lastChunk)) {
-            // skip to fulfill lower end of range
-            retrieve.skip(chunkStreamStart); // we needn't check the result; see BinaryReadQuery#retrieve
-            return new BoundedInputStream(retrieve, rangeSize); // apply limit for upper end of range
+        InputStream retrieve = readRange.execute(id, firstChunk, lastChunk);
+        // skip to fulfill lower end of range
+        try {
+            retrieve.skip(chunkStreamStart);
         } catch (IOException e) {
             throw new UncheckedIOException(e);
-        }
+        } // we needn't check the result; see BinaryReadQuery#retrieve
+        return completedFuture(new BoundedInputStream(retrieve, rangeSize)); // apply limit for upper end of range
     }
 }

impl/src/test/java/edu/si/trellis/CassandraBinaryServiceIT.java

@@ -42,12 +42,12 @@ void setAndGetSmallContent() throws IOException {
             connection.binaryService.setContent(builder(id).build(), testInput).join();
         }
 
-        try (InputStream got = connection.binaryService.get(id).join().getContent()) {
+        try (InputStream got = connection.binaryService.get(id).join().getContent().toCompletableFuture().join()) {
             String reply = IOUtils.toString(got, UTF_8);
             assertEquals(content, reply);
         }
 
-        try (InputStream got = connection.binaryService.get(id).join().getContent(5, 11)) {
+        try (InputStream got = connection.binaryService.get(id).join().getContent(5, 11).toCompletableFuture().join()) {
             String reply = IOUtils.toString(got, UTF_8);
             assertEquals(content.subSequence(5, 12), reply);
         }
@@ -77,11 +77,11 @@ void setAndGetMultiChunkContent() throws IOException {
         assertTrue(got.isDone());
 
         try (InputStream testData = new FileInputStream("src/test/resources/test.jpg");
-             InputStream content = binary.getContent()) {
+             InputStream content = binary.getContent().toCompletableFuture().join()) {
             assertTrue(contentEquals(testData, content), "Didn't retrieve correct content!");
         }
 
-        try (InputStream content = binary.getContent()) {
+        try (InputStream content = binary.getContent().toCompletableFuture().join()) {
             String digest = DigestUtils.md5Hex(content);
             assertEquals(md5sum, digest);
         }
@@ -102,11 +102,11 @@ void varyChunkSizeFromDefault() throws IOException, InterruptedException, Execut
         assertTrue(got.isDone());
 
         try (InputStream testData = new FileInputStream("src/test/resources/test.jpg");
-             InputStream content = binary.getContent()) {
+             InputStream content = binary.getContent().toCompletableFuture().join()) {
             assertTrue(contentEquals(testData, content), "Didn't retrieve correct content!");
         }
 
-        try (InputStream content = binary.getContent()) {
+        try (InputStream content = binary.getContent().toCompletableFuture().join()) {
             String digest = DigestUtils.md5Hex(content);
             assertEquals(md5sum, digest);
         }

impl/src/test/java/edu/si/trellis/CassandraBinaryTest.java

@@ -75,7 +75,7 @@ void someContent() {
         when(mockRead.execute(any())).thenReturn(mockInputStream1);
         CassandraBinary testCassandraBinary = new CassandraBinary(testId, mockRead, mockReadRange, testChunkSize);
 
-        final InputStream result = testCassandraBinary.getContent();
+        final InputStream result = testCassandraBinary.getContent().toCompletableFuture().join();
         assertSame(mockInputStream1, result, "Got wrong InputStream!");
     }
 
@@ -86,7 +86,7 @@ void aBitOfContent() throws IOException {
         when(mockReadRange.execute(any(), anyInt(), anyInt())).thenReturn(testInputStream);
         CassandraBinary testCassandraBinary = new CassandraBinary(testId, mockRead, mockReadRange, testChunkSize);
 
-        final InputStream content = testCassandraBinary.getContent(0, 10);
+        final InputStream content = testCassandraBinary.getContent(0, 10).toCompletableFuture().join();
         byte[] result = new byte[3];
 
         content.read(result);

webapp/src/main/resources/META-INF/beans.xml

@@ -3,6 +3,8 @@
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" version="1.1"
   bean-discovery-mode="all">
   <alternatives>
-<!--     <class>class org.trellisldp.api.NoopMementoService</class> -->
+    <class>org.trellisldp.api.NoopAuditService</class>
+    <class>org.trellisldp.api.NoopEventService</class>
+    <class>org.trellisldp.api.NoopNamespaceService</class>
   </alternatives>
 </beans>