Allows importing binary versions from different storage types.

Author: 006627

roda-core/roda-core/src/main/java/org/roda/core/storage/DefaultTransactionalStorageService.java

@@ -604,7 +604,8 @@ public Date getCreationDate(StoragePath storagePath) throws GenericException {
 
   @Override
   public void importBinaryVersion(StorageService fromService, StoragePath storagePath, String version)
-    throws AlreadyExistsException, GenericException, RequestNotValidException, AuthorizationDeniedException {
+    throws AlreadyExistsException, GenericException, RequestNotValidException, AuthorizationDeniedException,
+    NotFoundException {
     stagingStorageService.importBinaryVersion(fromService, storagePath, version);
   }
 

roda-core/roda-core/src/main/java/org/roda/core/storage/StorageService.java

@@ -401,5 +401,6 @@ String getStoragePathAsString(StoragePath storagePath, boolean skipStoragePathCo
   Date getCreationDate(StoragePath storagePath) throws GenericException;
 
   void importBinaryVersion(StorageService fromService, StoragePath storagePath, String version)
-    throws AlreadyExistsException, GenericException, RequestNotValidException, AuthorizationDeniedException;
+    throws AlreadyExistsException, GenericException, RequestNotValidException, AuthorizationDeniedException,
+    NotFoundException;
 }

roda-core/roda-core/src/main/java/org/roda/core/storage/StorageServiceWrapper.java

@@ -248,7 +248,8 @@ public Date getCreationDate(StoragePath storagePath) throws GenericException {
 
   @Override
   public void importBinaryVersion(StorageService fromService, StoragePath storagePath, String version)
-    throws AlreadyExistsException, GenericException, RequestNotValidException, AuthorizationDeniedException {
+    throws AlreadyExistsException, GenericException, RequestNotValidException, AuthorizationDeniedException,
+    NotFoundException {
     RodaCoreFactory.checkIfWriteIsAllowedAndIfFalseThrowException(nodeType);
     storageService.importBinaryVersion(fromService, storagePath, version);
   }

roda-core/roda-core/src/main/java/org/roda/core/storage/fs/FileStorageService.java

@@ -54,7 +54,6 @@
 import org.roda.core.storage.Resource;
 import org.roda.core.storage.StorageService;
 import org.roda.core.storage.StorageServiceUtils;
-import org.roda.core.storage.StorageServiceWrapper;
 import org.roda.core.util.IdUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -997,24 +996,26 @@ public Path getHistoryMetadataPath() {
 
   @Override
   public void importBinaryVersion(StorageService fromService, StoragePath storagePath, String version)
-    throws AlreadyExistsException, GenericException, RequestNotValidException, AuthorizationDeniedException {
-    FileStorageService storageService;
-    if (fromService instanceof FileStorageService) {
-      storageService = (FileStorageService) fromService;
-    } else if (fromService instanceof StorageServiceWrapper) {
-      storageService = (FileStorageService) ((StorageServiceWrapper) fromService).getWrappedStorageService();
-    } else {
-      throw new GenericException("Cannot import binary version from " + fromService.getClass().getName());
-    }
+    throws AlreadyExistsException, GenericException, RequestNotValidException, AuthorizationDeniedException,
+    NotFoundException {
+    try {
+      Path targetDataPath = FSUtils.getEntityPath(historyDataPath, storagePath, version);
+      Path targetMetadataPath = FSUtils.getBinaryHistoryMetadataPath(historyDataPath, historyMetadataPath,
+        targetDataPath);
 
-    Path sourceDataPath = FSUtils.getEntityPath(storageService.getHistoryDataPath(), storagePath, version);
-    Path targetDataPath = FSUtils.getEntityPath(historyDataPath, storagePath, version);
-    FSUtils.copy(sourceDataPath, targetDataPath, true);
+      BinaryVersion binaryVersion = fromService.getBinaryVersion(storagePath, version);
 
-    Path sourceMetadataPath = FSUtils.getBinaryHistoryMetadataPath(storageService.getHistoryDataPath(),
-      storageService.getHistoryMetadataPath(), sourceDataPath);
-    Path targetMetadataPath = FSUtils.getBinaryHistoryMetadataPath(historyDataPath, historyMetadataPath,
-      targetDataPath);
-    FSUtils.copy(sourceMetadataPath, targetMetadataPath, true);
+      // write binary data to target path
+      Files.createDirectories(targetDataPath.getParent());
+      ContentPayload payload = binaryVersion.getBinary().getContent();
+      payload.writeToPath(targetDataPath);
+
+      // write metadata to target path
+      Files.createDirectories(targetMetadataPath.getParent());
+      JsonUtils.writeObjectToFile(binaryVersion, targetMetadataPath);
+
+    } catch (IOException e) {
+      throw new GenericException("Could not import binary version", e);
+    }
   }
 }