#3 refactoring

oleg-cherednik · oleg-cherednik · commit fad820fff431 · 2024-10-28T21:14:59.000+03:00
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/src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/encrypted/EncryptedEntryOutputStream.java b/src/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);
     }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ final class Bzip2EntryOutputStream extends EncryptedEntryOutputStream {`
`37`	`37`	`Bzip2EntryOutputStream(CompressionLevel compressionLevel,`
`38`	`38`	`EncoderDataOutput encoderDataOutput,`
`39`	`39`	`EntryMetadataOutputStream emos) throws IOException {`
`40`		`- super(null, emos);`
	`40`	`+ super(emos);`
`41`	`41`	`this.encoderDataOutput = encoderDataOutput;`
`42`	`42`	`bzip2 = new Bzip2OutputStream(encoderDataOutput, compressionLevel);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ final class DeflateEntryOutputStream extends EncryptedEntryOutputStream {`
`42`	`42`	`DeflateEntryOutputStream(CompressionLevel compressionLevel,`
`43`	`43`	`EncoderDataOutput encoderDataOutput,`
`44`	`44`	`EntryMetadataOutputStream emos) {`
`45`		`- super(null, emos);`
	`45`	`+ super(emos);`
`46`	`46`	`this.encoderDataOutput = encoderDataOutput;`
`47`	`47`	`deflater.setLevel(compressionLevel.getCode());`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ final class LzmaEntryOutputStream extends EncryptedEntryOutputStream {`
`41`	`41`	`long uncompressedSize,`
`42`	`42`	`EncoderDataOutput encoderDataOutput,`
`43`	`43`	`EntryMetadataOutputStream emos) throws IOException {`
`44`		`- super(null, emos);`
	`44`	`+ super(emos);`
`45`	`45`	`this.encoderDataOutput = encoderDataOutput;`
`46`	`46`	`lzma = createOutputStream(compressionLevel, eosMarker, uncompressedSize, encoderDataOutput);`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ final class StoreEntryOutputStream extends EncryptedEntryOutputStream {`
`32`	`32`	`private final EncoderDataOutput encoderDataOutput;`
`33`	`33`
`34`	`34`	`StoreEntryOutputStream(EncoderDataOutput encoderDataOutput, EntryMetadataOutputStream emos) {`
`35`		`- super(null, emos);`
	`35`	`+ super(emos);`
`36`	`36`	`this.encoderDataOutput = encoderDataOutput;`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ final class ZstdEntryOutputStream extends EncryptedEntryOutputStream {`
`37`	`37`	`ZstdEntryOutputStream(CompressionLevel compressionLevel,`
`38`	`38`	`EncoderDataOutput encoderDataOutput,`
`39`	`39`	`EntryMetadataOutputStream emos) throws IOException {`
`40`		`- super(null, emos);`
	`40`	`+ super(emos);`
`41`	`41`	`this.encoderDataOutput = encoderDataOutput;`
`42`	`42`	`zstd = new ZstdOutputStream(encoderDataOutput, compressionLevel);`
`43`	`43`	`}`