#3 refactoring

oleg-cherednik · Oct 28, 2024 · fad820f · fad820f
1 parent 29bc1a7
commit fad820f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/Bzip2EntryOutputStream.java b/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/Bzip2EntryOutputStream.java
@@ -37,7 +37,7 @@ final class Bzip2EntryOutputStream extends EncryptedEntryOutputStream {
     Bzip2EntryOutputStream(CompressionLevel compressionLevel,
                            EncoderDataOutput encoderDataOutput,
                            EntryMetadataOutputStream emos) throws IOException {
-        super(null, emos);
+        super(emos);
         this.encoderDataOutput = encoderDataOutput;
         bzip2 = new Bzip2OutputStream(encoderDataOutput, compressionLevel);
     }

diff --git a/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/DeflateEntryOutputStream.java b/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/DeflateEntryOutputStream.java
@@ -42,7 +42,7 @@ final class DeflateEntryOutputStream extends EncryptedEntryOutputStream {
     DeflateEntryOutputStream(CompressionLevel compressionLevel,
                              EncoderDataOutput encoderDataOutput,
                              EntryMetadataOutputStream emos) {
-        super(null, emos);
+        super(emos);
         this.encoderDataOutput = encoderDataOutput;
         deflater.setLevel(compressionLevel.getCode());
     }

diff --git a/...main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/EncryptedEntryOutputStream.java b/...main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/EncryptedEntryOutputStream.java
@@ -18,7 +18,7 @@
  */
 package ru.olegcherednik.zip4jvm.io.out.entry.encrypted;
 
-import ru.olegcherednik.zip4jvm.exception.Zip4jvmException;
+import ru.olegcherednik.zip4jvm.exception.CompressionNotSupportedException;
 import ru.olegcherednik.zip4jvm.io.out.data.EncoderDataOutput;
 import ru.olegcherednik.zip4jvm.io.out.entry.EntryMetadataOutputStream;
 import ru.olegcherednik.zip4jvm.model.CompressionLevel;
@@ -38,7 +38,6 @@
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 public abstract class EncryptedEntryOutputStream extends OutputStream {
 
-    private final EncoderDataOutput encoderDataOutput;
     protected final EntryMetadataOutputStream emos;
 
     public static EncryptedEntryOutputStream create(ZipEntry entry,
@@ -63,7 +62,7 @@ public static EncryptedEntryOutputStream create(ZipEntry entry,
         if (compressionMethod == CompressionMethod.ZSTD)
             return new ZstdEntryOutputStream(compressionLevel, encoderDataOutput, emos);
 
-        throw new Zip4jvmException("Compression '%s' is not supported", compressionMethod);
+        throw new CompressionNotSupportedException(compressionMethod);
     }
 
     @Override

diff --git a/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/LzmaEntryOutputStream.java b/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/LzmaEntryOutputStream.java
@@ -41,7 +41,7 @@ final class LzmaEntryOutputStream extends EncryptedEntryOutputStream {
                           long uncompressedSize,
                           EncoderDataOutput encoderDataOutput,
                           EntryMetadataOutputStream emos) throws IOException {
-        super(null, emos);
+        super(emos);
         this.encoderDataOutput = encoderDataOutput;
         lzma = createOutputStream(compressionLevel, eosMarker, uncompressedSize, encoderDataOutput);
     }

diff --git a/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/StoreEntryOutputStream.java b/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/StoreEntryOutputStream.java
@@ -32,7 +32,7 @@ final class StoreEntryOutputStream extends EncryptedEntryOutputStream {
     private final EncoderDataOutput encoderDataOutput;
 
     StoreEntryOutputStream(EncoderDataOutput encoderDataOutput, EntryMetadataOutputStream emos) {
-        super(null, emos);
+        super(emos);
         this.encoderDataOutput = encoderDataOutput;
     }
 

diff --git a/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/ZstdEntryOutputStream.java b/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/ZstdEntryOutputStream.java
@@ -37,7 +37,7 @@ final class ZstdEntryOutputStream extends EncryptedEntryOutputStream {
     ZstdEntryOutputStream(CompressionLevel compressionLevel,
                           EncoderDataOutput encoderDataOutput,
                           EntryMetadataOutputStream emos) throws IOException {
-        super(null, emos);
+        super(emos);
         this.encoderDataOutput = encoderDataOutput;
         zstd = new ZstdOutputStream(encoderDataOutput, compressionLevel);
     }