This is an automated email from the ASF dual-hosted git repository. percyashu pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 3e1444a6e48226f095e98e50e7c629cf014ceabb Author: Michael Vorburger <[email protected]> AuthorDate: Sat Oct 31 19:33:15 2020 +0100 Remove unused fileName and resourceId from ContentRepository deleteFile() & deleteImage() (FINERACT-1201) --- .../contentrepository/ContentRepository.java | 7 +++++-- .../FileSystemContentRepository.java | 23 ++++++++++------------ .../contentrepository/S3ContentRepository.java | 4 ++-- ...umentWritePlatformServiceJpaRepositoryImpl.java | 4 ++-- ...ImageWritePlatformServiceJpaRepositoryImpl.java | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/ContentRepository.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/ContentRepository.java index bacfaa8..2e02efc 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/ContentRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/ContentRepository.java @@ -26,6 +26,9 @@ import org.apache.fineract.infrastructure.documentmanagement.data.FileData; import org.apache.fineract.infrastructure.documentmanagement.data.ImageData; import org.apache.fineract.infrastructure.documentmanagement.domain.StorageType; +/** + * Repository which stores Files (AKA Documents) and Images. + */ public interface ContentRepository { // TODO:Vishwas Need to move these settings to the Database @@ -36,7 +39,7 @@ public interface ContentRepository { String saveFile(InputStream uploadedInputStream, DocumentCommand documentCommand); - void deleteFile(String fileName, String documentPath); + void deleteFile(String documentPath); FileData fetchFile(DocumentData documentData); @@ -44,7 +47,7 @@ public interface ContentRepository { String saveImage(Base64EncodedImage base64EncodedImage, Long resourceId, String imageName); - void deleteImage(Long resourceId, String location); + void deleteImage(String location); ImageData fetchImage(ImageData imageData); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/FileSystemContentRepository.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/FileSystemContentRepository.java index 5722e6c..75adf66 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/FileSystemContentRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/FileSystemContentRepository.java @@ -78,25 +78,22 @@ public class FileSystemContentRepository implements ContentRepository { } @Override - public void deleteImage(final Long resourceId, final String location) { - final boolean fileDeleted = deleteFile(location); - if (!fileDeleted) { - // no need to throw an Error, simply log a warning - LOG.warn("Unable to delete image associated with clients with Id {}", resourceId); - } + public void deleteImage(final String location) { + deleteFileInternal(location); } @Override - public void deleteFile(final String fileName, final String documentPath) { - final boolean fileDeleted = deleteFile(documentPath); - if (!fileDeleted) { - throw new ContentManagementException(fileName, null); - } + public void deleteFile(final String documentPath) { + deleteFileInternal(documentPath); } - private boolean deleteFile(final String documentPath) { + private void deleteFileInternal(final String documentPath) { final File fileToBeDeleted = new File(documentPath); - return fileToBeDeleted.delete(); + final boolean fileDeleted = fileToBeDeleted.delete(); + if (!fileDeleted) { + // no need to throw an Error, what's a caller going to do about it, so simply log a warning + LOG.warn("Unable to delete file {}", documentPath); + } } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java index db1aae8..9c4a02b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java @@ -73,7 +73,7 @@ public class S3ContentRepository implements ContentRepository { } @Override - public void deleteFile(final String documentName, final String documentPath) { + public void deleteFile(final String documentPath) { deleteObject(documentPath); } @@ -99,7 +99,7 @@ public class S3ContentRepository implements ContentRepository { } @Override - public void deleteImage(final Long resourceId, final String location) { + public void deleteImage(final String location) { deleteObject(location); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentWritePlatformServiceJpaRepositoryImpl.java index dce1ab8..e3065f0 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentWritePlatformServiceJpaRepositoryImpl.java @@ -128,7 +128,7 @@ public class DocumentWritePlatformServiceJpaRepositoryImpl implements DocumentWr if (inputStream != null && documentCommand.isFileNameChanged()) { final ContentRepository contentRepository = this.contentRepositoryFactory.getRepository(documentStoreType); - contentRepository.deleteFile(documentCommand.getName(), oldLocation); + contentRepository.deleteFile(oldLocation); } this.documentRepository.saveAndFlush(documentForUpdate); @@ -157,7 +157,7 @@ public class DocumentWritePlatformServiceJpaRepositoryImpl implements DocumentWr this.documentRepository.delete(document); final ContentRepository contentRepository = this.contentRepositoryFactory.getRepository(document.storageType()); - contentRepository.deleteFile(document.getName(), document.getLocation()); + contentRepository.deleteFile(document.getLocation()); return new CommandProcessingResult(document.getId()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/ImageWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/ImageWritePlatformServiceJpaRepositoryImpl.java index 534fde1..04c316e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/ImageWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/ImageWritePlatformServiceJpaRepositoryImpl.java @@ -99,7 +99,7 @@ public class ImageWritePlatformServiceJpaRepositoryImpl implements ImageWritePla if (image != null) { final ContentRepository contentRepository = this.contentRepositoryFactory .getRepository(StorageType.fromInt(image.getStorageType())); - contentRepository.deleteImage(clientId, image.getLocation()); + contentRepository.deleteImage(image.getLocation()); this.imageRepository.delete(image); } @@ -126,7 +126,7 @@ public class ImageWritePlatformServiceJpaRepositoryImpl implements ImageWritePla if (image != null) { final ContentRepository contentRepository = this.contentRepositoryFactory .getRepository(StorageType.fromInt(image.getStorageType())); - contentRepository.deleteImage(entityId, image.getLocation()); + contentRepository.deleteImage(image.getLocation()); } return owner; }
