Merge pull request #616 from garyttierney/lazy-s3-info

Avoid communicating with S3 unless necessary

src/main/java/edu/illinois/library/cantaloupe/source/S3ObjectInfoSupplier.java

@@ -0,0 +1,11 @@
+package edu.illinois.library.cantaloupe.source;
+
+import java.io.IOException;
+
+/**
+ * Deferred accessor to {@link S3ObjectInfo}.
+ */
+@FunctionalInterface
+public interface S3ObjectInfoSupplier {
+    S3ObjectInfo get() throws IOException;
+}

src/main/java/edu/illinois/library/cantaloupe/source/S3Source.java

@@ -422,9 +422,11 @@ private S3ObjectInfo getObjectInfoUsingDelegateStrategy()
 
     @Override
     public StreamFactory newStreamFactory() throws IOException {
-        S3ObjectInfo info = getObjectInfo();
-        info.setLength(getObjectAttributes().length);
-        return new S3StreamFactory(info);
+        return new S3StreamFactory(() -> {
+            S3ObjectInfo info = getObjectInfo();
+            info.setLength(getObjectAttributes().length);
+            return info;
+        });
     }
 
     @Override

src/main/java/edu/illinois/library/cantaloupe/source/S3StreamFactory.java

@@ -24,14 +24,15 @@ class S3StreamFactory implements StreamFactory {
     private static final int DEFAULT_CHUNK_SIZE       = 1024 * 512;
     private static final int DEFAULT_CHUNK_CACHE_SIZE = 1024 * 1024 * 10;
 
-    private S3ObjectInfo objectInfo;
+    private S3ObjectInfoSupplier objectInfo;
 
-    S3StreamFactory(S3ObjectInfo objectInfo) {
+    S3StreamFactory(S3ObjectInfoSupplier objectInfo) {
         this.objectInfo = objectInfo;
     }
 
     @Override
     public InputStream newInputStream() throws IOException {
+        final S3ObjectInfo objectInfo = this.objectInfo.get();
         final InputStream responseStream =
                 S3Source.newObjectInputStream(objectInfo);
 
@@ -100,6 +101,7 @@ public ImageInputStream newSeekableStream() throws IOException {
             LOGGER.debug("newSeekableStream(): using {}-byte chunks",
                     chunkSize);
 
+            final S3ObjectInfo objectInfo = this.objectInfo.get();
             final S3HTTPImageInputStreamClient client =
                     new S3HTTPImageInputStreamClient(objectInfo);
 

src/test/java/edu/illinois/library/cantaloupe/source/S3StreamFactoryTest.java

@@ -109,7 +109,7 @@ public void setUp() throws Exception {
         info.setKey(FIXTURE_KEY);
         info.setLength(1584);
 
-        instance = new S3StreamFactory(info);
+        instance = new S3StreamFactory(() -> info);
     }
 
     @Test