Merge pull request #1414 from digital-preservation/develop

DROID release 6.9.4

Author: MancunianSam

.github/workflows/release.yml

@@ -46,7 +46,7 @@ jobs:
           curl -X POST "https://api.github.com/repos/digital-preservation/droid/pulls" \
                       -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
                       -H "Accept: application/vnd.github+json" \
-                      -d '{"title": "Version bump","head": "$BRANCH_NAME","base": "main"}'
+                      -d "{\"title\": \"Version bump\",\"head\": \"$BRANCH_NAME\",\"base\": \"main\"}"
   github-release:
     runs-on: ubuntu-latest
     steps:

droid-api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>droid-parent</artifactId>
 		<groupId>uk.gov.nationalarchives</groupId>
-		<version>6.9.3-SNAPSHOT</version>
+		<version>6.9.4-SNAPSHOT</version>
 		<relativePath>../droid-parent</relativePath>
 	</parent>
 
@@ -181,7 +181,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.17.0</version>
+			<version>3.18.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>

droid-binary/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.3-SNAPSHOT</version>
+        <version>6.9.4-SNAPSHOT</version>
   	    <relativePath>../droid-parent</relativePath>
     </parent>
 

droid-build-tools/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.3-SNAPSHOT</version>
+        <version>6.9.4-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
 

droid-command-line/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.3-SNAPSHOT</version>
+        <version>6.9.4-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
 

droid-container/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.3-SNAPSHOT</version>
+        <version>6.9.4-SNAPSHOT</version>
   	    <relativePath>../droid-parent</relativePath>
     </parent>
 
@@ -141,7 +141,7 @@
         <dependency>
             <groupId>org.wiremock</groupId>
             <artifactId>wiremock</artifactId>
-            <version>3.13.0</version>
+            <version>3.13.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

droid-core-interfaces/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.3-SNAPSHOT</version>
+        <version>6.9.4-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
 
@@ -142,7 +142,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.18.0</version>
+            <version>1.19.0</version>
         </dependency>
         <dependency>
             <groupId>net.java.truevfs</groupId>

droid-core-interfaces/src/main/java/uk/gov/nationalarchives/droid/core/interfaces/resource/HttpWindowReader.java

@@ -58,7 +58,7 @@ public HttpWindowReader(WindowCache cache, HttpUtils.HttpMetadata httpMetadata,
         this.length = httpMetadata.fileSize();
     }
 
-    private HttpResponse<byte[]> responseWithRange(long rangeStart, long rangeEnd) {
+    private HttpResponse<byte[]> responseWithRange(long rangeStart, long rangeEnd) throws IOException {
         HttpRequest request = HttpRequest.newBuilder()
                 .uri(this.uri)
                 .header("Range", "bytes=" + rangeStart + "-" + rangeEnd)
@@ -67,7 +67,7 @@ private HttpResponse<byte[]> responseWithRange(long rangeStart, long rangeEnd) {
 
         try {
             return httpClient.send(request, HttpResponse.BodyHandlers.ofByteArray());
-        } catch (InterruptedException | IOException e) {
+        } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
     }
@@ -92,6 +92,7 @@ public long length() throws IOException {
 
     @Override
     public byte[] reloadWindowBytes(Window window) throws IOException {
-        return new byte[0];
+        long windowStart = window.getWindowPosition();
+        return responseWithRange(windowStart, (windowStart + this.windowSize -1)).body();
     }
 }

droid-core-interfaces/src/main/java/uk/gov/nationalarchives/droid/core/interfaces/resource/S3WindowReader.java

@@ -65,26 +65,29 @@ public S3WindowReader(WindowCache cache, S3Utils.S3ObjectMetadata s3ObjectMetada
     @Override
     protected Window createWindow(long windowStart) throws IOException {
         if (windowStart >= 0 && windowStart < length) {
-            String key = this.s3ObjectMetadata.key().orElseThrow(() -> new RuntimeException(this.s3ObjectMetadata.key() + " not found"));
-            GetObjectRequest getS3ObjectRequest = GetObjectRequest.builder()
-                    .bucket(this.s3ObjectMetadata.bucket())
-                    .key(key)
-                    .range("bytes=" + windowStart + "-" + (windowStart + this.windowSize -1))
-                    .build();
-
-
-            ResponseInputStream<GetObjectResponse> response = s3Client.getObject(getS3ObjectRequest);
-            byte[] bytes  = toByteArray(response);
+            byte[] bytes = bytesForRange(windowStart);
             int totalRead = bytes.length;
-            response.close();
             if (totalRead > 0) {
                 return new SoftWindow(bytes, windowStart, totalRead, this);
             }
         }
         return null;
     }
 
-    private static byte[] toByteArray(ResponseInputStream<GetObjectResponse> inputStream) throws IOException {
+    private byte[] bytesForRange(long windowStart) throws IOException {
+        String key = this.s3ObjectMetadata.key().orElseThrow(() -> new RuntimeException(this.s3ObjectMetadata.key() + " not found"));
+        GetObjectRequest getS3ObjectRequest = GetObjectRequest.builder()
+                .bucket(this.s3ObjectMetadata.bucket())
+                .key(key)
+                .range("bytes=" + windowStart + "-" + (windowStart + this.windowSize -1))
+                .build();
+
+        try (ResponseInputStream<GetObjectResponse> response = s3Client.getObject(getS3ObjectRequest)) {
+            return toByteArray(response);
+        }
+    }
+
+    private byte[] toByteArray(ResponseInputStream<GetObjectResponse> inputStream) throws IOException {
         try (InputStream in = inputStream; ByteArrayOutputStream out = new ByteArrayOutputStream()) {
             byte[] buffer = new byte[BUFFER_LENGTH];
             int bytesRead;
@@ -102,6 +105,7 @@ public long length() throws IOException {
 
     @Override
     public byte[] reloadWindowBytes(Window window) throws IOException {
-        return new byte[0];
+        long windowStart = window.getWindowPosition();
+        return bytesForRange(windowStart);
     }
 }

droid-core-interfaces/src/test/java/uk/gov/nationalarchives/droid/core/interfaces/resource/HttpWindowReaderTest.java

@@ -83,6 +83,6 @@ public void testWindowReaderReturnsErrorOnHttpFailure() throws Exception {
         HttpClient httpClient = mock(HttpClient.class);
         HttpUtils.HttpMetadata httpMetadata = new HttpUtils.HttpMetadata(4L, 0L, URI.create("https://example.com"));
         when(httpClient.send(any(HttpRequest.class), any(HttpResponse.BodyHandler.class))).thenThrow(new IOException("Error contacting server"));
-        assertThrows(RuntimeException.class, () -> new HttpWindowReader(windowCache, httpMetadata, httpClient).getWindow(0));
+        assertThrows(IOException.class, () -> new HttpWindowReader(windowCache, httpMetadata, httpClient).getWindow(0));
     }
 }