From fb056bb366da7916a4d2d354c26c49c33d9f826a Mon Sep 17 00:00:00 2001 From: fillg1 Date: Sat, 11 Apr 2026 21:33:04 +0200 Subject: [PATCH] refactor: cleanup project configuration and fix naming inconsistencies --- build.gradle | 10 ++-- gradle.properties | 1 - .../illgner/ch/createzip/SplitZipWriter.java | 2 +- .../ch/createzip/SplitZipWriterTest.java | 58 +++++++++---------- 4 files changed, 35 insertions(+), 36 deletions(-) delete mode 100755 gradle.properties diff --git a/build.gradle b/build.gradle index df545ab..6e48de2 100755 --- a/build.gradle +++ b/build.gradle @@ -10,14 +10,14 @@ repositories { } dependencies { - implementation group: 'commons-io', name: 'commons-io', version: '2.21.0' - implementation "org.apache.commons:commons-lang3:3.20.0" - implementation "org.slf4j:jul-to-slf4j:$sl4j_version" - implementation "org.slf4j:log4j-over-slf4j:$sl4j_version" + implementation 'commons-io:commons-io:2.21.0' + implementation 'org.apache.commons:commons-lang3:3.20.0' + implementation 'org.slf4j:jul-to-slf4j:1.7.35' + implementation 'org.slf4j:log4j-over-slf4j:1.7.35' testImplementation platform('org.junit:junit-bom:6.0.0') testImplementation 'org.junit.jupiter:junit-jupiter' - testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '3.0' + testImplementation 'org.hamcrest:hamcrest-library:3.0' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/gradle.properties b/gradle.properties deleted file mode 100755 index 28f4b38..0000000 --- a/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -sl4j_version=1.7.35 diff --git a/src/main/java/illgner/ch/createzip/SplitZipWriter.java b/src/main/java/illgner/ch/createzip/SplitZipWriter.java index d78456c..fe6349d 100755 --- a/src/main/java/illgner/ch/createzip/SplitZipWriter.java +++ b/src/main/java/illgner/ch/createzip/SplitZipWriter.java @@ -41,7 +41,7 @@ public class SplitZipWriter implements Closeable { private final int chunkSize; private final int bufferSize; private final ZipResult zipResult; - OutputStreamEnhancer outputStreamEnhancer; + private OutputStreamEnhancer outputStreamEnhancer; private ZipOutputStream zipOutputStream; diff --git a/src/test/java/illgner/ch/createzip/SplitZipWriterTest.java b/src/test/java/illgner/ch/createzip/SplitZipWriterTest.java index d391749..4935eec 100755 --- a/src/test/java/illgner/ch/createzip/SplitZipWriterTest.java +++ b/src/test/java/illgner/ch/createzip/SplitZipWriterTest.java @@ -63,13 +63,13 @@ class SplitZipWriterTest { ZipResult zipResult; String outputFileName = RandomStringUtils.randomAlphanumeric(10); String inputFileName = "singleFileSmallerThanChunkSizeToOneZip.txt"; - SplitZipWriter postBoxZipFileWriter = new SplitZipWriter( + SplitZipWriter splitZipWriter = new SplitZipWriter( DESTINATION_DIR, outputFileName, ZIP_CHUNK_SIZE_IN_BYTE, ZIP_BUFFER_SIZE_IN_BYTE, (OutputStream outputStream) -> outputStream); - try (postBoxZipFileWriter) { - postBoxZipFileWriter.write(new ByteArrayInputStream(fileSimpleContent), inputFileName); + try (splitZipWriter) { + splitZipWriter.write(new ByteArrayInputStream(fileSimpleContent), inputFileName); } String expectedZippedFileName = outputFileName + "_01.zip"; - zipResult = postBoxZipFileWriter.getZipResult(); + zipResult = splitZipWriter.getZipResult(); File createdZipFile = DESTINATION_DIR.resolve(expectedZippedFileName).toFile(); assertThat(zipResult.getFilenames(), hasSize(1)); @@ -92,13 +92,13 @@ class SplitZipWriterTest { ZipResult zipResult; String outputFileName = RandomStringUtils.randomAlphanumeric(10); String inputFileName = "singleFileGreaterThanChunkSizeToOneZip.txt"; - SplitZipWriter postBoxZipFileWriter = new SplitZipWriter( + SplitZipWriter splitZipWriter = new SplitZipWriter( DESTINATION_DIR, outputFileName, ZIP_CHUNK_SIZE_IN_BYTE, ZIP_BUFFER_SIZE_IN_BYTE, (OutputStream outputStream) -> outputStream); - try (postBoxZipFileWriter) { - postBoxZipFileWriter.write(new ByteArrayInputStream(fileSimpleContent), inputFileName); + try (splitZipWriter) { + splitZipWriter.write(new ByteArrayInputStream(fileSimpleContent), inputFileName); } String expectedZippedFileNamePartOne = outputFileName + "_01.zip"; - zipResult = postBoxZipFileWriter.getZipResult(); + zipResult = splitZipWriter.getZipResult(); assertThat(zipResult.getFilenames(), hasSize(1)); assertThat(zipResult.getFileLengths(), hasSize(1)); assertTrue(zipResult.getFilenames().contains(expectedZippedFileNamePartOne)); @@ -125,14 +125,14 @@ class SplitZipWriterTest { String inputFileNameTwo = "multipleFileSmallerThanChunkSizeToSingleZip2.txt"; ZipResult zipResult; - SplitZipWriter postBoxZipFileWriter = new SplitZipWriter( + SplitZipWriter splitZipWriter = new SplitZipWriter( DESTINATION_DIR, outputFileName, ZIP_CHUNK_SIZE_IN_BYTE, ZIP_BUFFER_SIZE_IN_BYTE, (OutputStream outputStream) -> outputStream); - try (postBoxZipFileWriter) { - postBoxZipFileWriter.write(new ByteArrayInputStream(firstFile), inputFileNameOne); - postBoxZipFileWriter.write(new ByteArrayInputStream(secondFile), inputFileNameTwo); + try (splitZipWriter) { + splitZipWriter.write(new ByteArrayInputStream(firstFile), inputFileNameOne); + splitZipWriter.write(new ByteArrayInputStream(secondFile), inputFileNameTwo); } - zipResult = postBoxZipFileWriter.getZipResult(); + zipResult = splitZipWriter.getZipResult(); String expectedZippedFileNamePartOne = outputFileName + "_01.zip"; File createdZip = DESTINATION_DIR.resolve(expectedZippedFileNamePartOne).toFile(); @@ -164,13 +164,13 @@ class SplitZipWriterTest { String inputFileNameTwo = "multipleFilesTogetherGreaterThanChunkSizeToSingleZip2.txt"; ZipResult zipResult; - SplitZipWriter postBoxZipFileWriter = new SplitZipWriter( + SplitZipWriter splitZipWriter = new SplitZipWriter( DESTINATION_DIR, outputFileName, ZIP_CHUNK_SIZE_IN_BYTE, ZIP_BUFFER_SIZE_IN_BYTE, (OutputStream outputStream) -> outputStream); - try (postBoxZipFileWriter) { - postBoxZipFileWriter.write(new ByteArrayInputStream(firstFile), inputFileNameOne); - postBoxZipFileWriter.write(new ByteArrayInputStream(secondFile), inputFileNameTwo); + try (splitZipWriter) { + splitZipWriter.write(new ByteArrayInputStream(firstFile), inputFileNameOne); + splitZipWriter.write(new ByteArrayInputStream(secondFile), inputFileNameTwo); } finally { - zipResult = postBoxZipFileWriter.getZipResult(); + zipResult = splitZipWriter.getZipResult(); } String expectedZippedFileNamePartOne = outputFileName + "_01.zip"; @@ -207,14 +207,14 @@ class SplitZipWriterTest { String[] originalFileNames = {"multipleBigFilesToMultipleZip1.txt", "multipleBigFilesToMultipleZip2.txt", "multipleBigFilesToMultipleZip3.txt"}; String outputFileName = RandomStringUtils.randomAlphanumeric(10); - SplitZipWriter postBoxZipFileWriter = new SplitZipWriter( + SplitZipWriter splitZipWriter = new SplitZipWriter( DESTINATION_DIR, outputFileName, bigChuckSize, bigBufferSize, (OutputStream outputStream) -> outputStream); - try (postBoxZipFileWriter) { - postBoxZipFileWriter.write(new ByteArrayInputStream(firstFile), originalFileNames[0]); - postBoxZipFileWriter.write(new ByteArrayInputStream(secondFile), originalFileNames[1]); - postBoxZipFileWriter.write(new ByteArrayInputStream(thirdFile), originalFileNames[2]); + try (splitZipWriter) { + splitZipWriter.write(new ByteArrayInputStream(firstFile), originalFileNames[0]); + splitZipWriter.write(new ByteArrayInputStream(secondFile), originalFileNames[1]); + splitZipWriter.write(new ByteArrayInputStream(thirdFile), originalFileNames[2]); } finally { - zipResult = postBoxZipFileWriter.getZipResult(); + zipResult = splitZipWriter.getZipResult(); } String expectedZippedFileNamePartOne = outputFileName + "_01.zip"; @@ -274,11 +274,11 @@ class SplitZipWriterTest { String outputFileName = RandomStringUtils.randomAlphanumeric(10); ZipResult zipResult; - try (SplitZipWriter postBoxZipFileWriter = new SplitZipWriter(DESTINATION_DIR, outputFileName, 1000, 2048, (OutputStream outputStream) -> outputStream)) { - postBoxZipFileWriter.write(new ByteArrayInputStream(content1), "file1"); - postBoxZipFileWriter.write(new ByteArrayInputStream(content2), "file2"); - postBoxZipFileWriter.write(new ByteArrayInputStream(content3), "file3"); - zipResult = postBoxZipFileWriter.getZipResult(); + try (SplitZipWriter splitZipWriter = new SplitZipWriter(DESTINATION_DIR, outputFileName, 1000, 2048, (OutputStream outputStream) -> outputStream)) { + splitZipWriter.write(new ByteArrayInputStream(content1), "file1"); + splitZipWriter.write(new ByteArrayInputStream(content2), "file2"); + splitZipWriter.write(new ByteArrayInputStream(content3), "file3"); + zipResult = splitZipWriter.getZipResult(); } assertThat("compressible files only containing zeroes should be compressed into one file", zipResult.getFileLengths().size(), is(1)); }