diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/utils/FileSystemBackedArchiver.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/utils/FileSystemBackedArchiver.java index 7c48567d5..9c3bfccf2 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/utils/FileSystemBackedArchiver.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/utils/FileSystemBackedArchiver.java @@ -24,7 +24,6 @@ import lombok.extern.slf4j.Slf4j; public class FileSystemBackedArchiver implements AutoCloseable { private final boolean rethrowExceptions; - private final boolean useFileAttributes; private final Set createdFolders = new HashSet<>(); private final File tempFile; private final ZipOutputStream zipOutputStream; @@ -35,7 +34,7 @@ public class FileSystemBackedArchiver implements AutoCloseable { @SneakyThrows public FileSystemBackedArchiver() { - this(false, true); + this(false); } @@ -46,10 +45,9 @@ public class FileSystemBackedArchiver implements AutoCloseable { * @param rethrowExceptions If true exceptions caught when handling streams and files will be re-thrown. */ @SneakyThrows - FileSystemBackedArchiver(boolean rethrowExceptions, boolean useFileAttributes) { + FileSystemBackedArchiver(boolean rethrowExceptions) { this.rethrowExceptions = rethrowExceptions; - this.useFileAttributes = useFileAttributes; tempFile = FileUtils.createTempFile("archive", ".zip"); zipOutputStream = new ZipOutputStream(new FileOutputStream(tempFile)); } @@ -131,12 +129,8 @@ public class FileSystemBackedArchiver implements AutoCloseable { if (tempFile.exists()) { try { - if (useFileAttributes) { - var basicFileAttributes = Files.readAttributes(tempFile.toPath(), BasicFileAttributes.class); - tempFileLength = basicFileAttributes.size(); - } else { - tempFileLength = tempFile.length(); - } + var basicFileAttributes = Files.readAttributes(tempFile.toPath(), BasicFileAttributes.class); + tempFileLength = basicFileAttributes.size(); } catch (IOException e) { if (rethrowExceptions) { throw new RuntimeException(e); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/utils/FileSystemBackedArchiverTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/utils/FileSystemBackedArchiverTest.java index 3f75c8a85..3200eab36 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/utils/FileSystemBackedArchiverTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/utils/FileSystemBackedArchiverTest.java @@ -25,7 +25,7 @@ public class FileSystemBackedArchiverTest { @SneakyThrows public void testFileSystemBackedArchiver() { - try (var fileSystemBackedArchiver = new FileSystemBackedArchiver(true, false)) { + try (var fileSystemBackedArchiver = new FileSystemBackedArchiver(true)) { SplittableRandom sr = new SplittableRandom(); @@ -62,7 +62,7 @@ public class FileSystemBackedArchiverTest { @Test public void testContentLengthForTwoEntries() { - try (var fileSystemBackedArchiver = new FileSystemBackedArchiver(true, false)) { + try (var fileSystemBackedArchiver = new FileSystemBackedArchiver(true)) { fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Original", "original", dummyFileContent)); fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Preview", "preview", dummyFileContent)); @@ -72,40 +72,11 @@ public class FileSystemBackedArchiverTest { } - @Test - public void testContentLengthForTwoEntriesComparingFileSize() { - - long defaultFileLength; - try (var fileSystemBackedArchiver = new FileSystemBackedArchiver(true, false)) { - - fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Original", "original", dummyFileContent)); - fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Preview", "preview", dummyFileContent)); - - long contentLength = fileSystemBackedArchiver.getContentLength(); - assertThat(contentLength).isGreaterThan(0); - defaultFileLength = contentLength; - } - - long fileAttributesContentLength; - try (var fileSystemBackedArchiver = new FileSystemBackedArchiver(true, true)) { - - fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Original", "original", dummyFileContent)); - fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Preview", "preview", dummyFileContent)); - - long contentLength = fileSystemBackedArchiver.getContentLength(); - assertThat(contentLength).isGreaterThan(0); - fileAttributesContentLength = contentLength; - } - - assertThat(defaultFileLength).isEqualTo(fileAttributesContentLength); - } - - @Test @SneakyThrows public void testContentLengthForTwoEntriesAndStream() { - try (var fileSystemBackedArchiver = new FileSystemBackedArchiver(true, false)) { + try (var fileSystemBackedArchiver = new FileSystemBackedArchiver(true)) { fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Original", "original", dummyFileContent)); fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Preview", "preview", dummyFileContent)); @@ -124,7 +95,7 @@ public class FileSystemBackedArchiverTest { @Test public void testContentLengthForTwoEntriesWithClosing() { // deliberately do not use try-with-resources to see if the content-length is available after temp file deletion - var fileSystemBackedArchiver = new FileSystemBackedArchiver(true, false); + var fileSystemBackedArchiver = new FileSystemBackedArchiver(true); fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Original", "original", dummyFileContent)); fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel("Preview", "preview", dummyFileContent));