The bitstream is removed from the S3 and local assetstore

dataquest-dev · Dec 18, 2023 · 9275741 · 9275741
1 parent 906ddb4
commit 9275741
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/dspace-api/src/main/java/org/dspace/storage/bitstore/ClarinS3BitStoreService.java b/dspace-api/src/main/java/org/dspace/storage/bitstore/ClarinS3BitStoreService.java
@@ -71,4 +71,18 @@ public void put(Bitstream bitstream, InputStream in) throws IOException {
             }
         }
     }
+
+    @Override
+    public void remove(Bitstream bitstream) throws IOException {
+        String key = getFullKey(bitstream.getInternalId());
+        try {
+            // Remove file from S3
+            s3Service.deleteObject(getBucketName(), key);
+            // Remove file from local assetstore
+            dsBitStoreService.remove(bitstream);
+        } catch (AmazonClientException e) {
+            log.error("remove(" + key + ")", e);
+            throw new IOException(e);
+        }
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java b/dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java
@@ -110,7 +110,7 @@ public class S3BitStoreService extends BaseBitStoreService {
     /**
      * S3 service
      */
-    private AmazonS3 s3Service = null;
+    protected AmazonS3 s3Service = null;
 
     /**
      * S3 transfer manager