Skip to content

Commit af06110

Browse files
#3 refactoring
1 parent e6a88fc commit af06110

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/EntryMetadataOutputStream.java

-9
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ public final class EntryMetadataOutputStream extends OutputStream {
4848

4949
private final ZipEntry zipEntry;
5050
private final DataOutput out;
51-
// private final Checksum checksum = new PureJavaCrc32();
52-
53-
// private long uncompressedSize;
5451

5552
public EntryMetadataOutputStream(ZipEntry zipEntry, DataOutput out) {
5653
this.zipEntry = zipEntry;
@@ -66,20 +63,14 @@ public void writeLocalFileHeader() throws IOException {
6663

6764
@Override
6865
public void write(int b) throws IOException {
69-
// checksum.update(b);
70-
// uncompressedSize++;
7166
}
7267

7368
@Override
7469
public void write(byte[] buf, int offs, int len) throws IOException {
75-
// checksum.update(buf, offs, len);
76-
// uncompressedSize += Math.max(0, len);
7770
}
7871

7972
@Override
8073
public void close() throws IOException {
81-
// zipEntry.setChecksum(checksum.getValue());
82-
// zipEntry.setUncompressedSize(uncompressedSize);
8374
zipEntry.setCompressedSize(out.getWrittenBytesAmount(COMPRESSED_DATA));
8475
updateZip64();
8576
writeDataDescriptor();

src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/FooOutputStream.java src/main/java/ru/olegcherednik/zip4jvm/io/out/entry/PayloadCalculationOutputStream.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@
1010
import java.util.zip.Checksum;
1111

1212
/**
13+
* This decorator over the {@link OutputStream} dynamically calculates
14+
* checksum and uncompressed size of the data.
15+
*
1316
* @author Oleg Cherednik
1417
* @since 28.10.2024
1518
*/
1619
@RequiredArgsConstructor
17-
public class FooOutputStream extends OutputStream {
20+
public class PayloadCalculationOutputStream extends OutputStream {
1821

1922
private final ZipEntry zipEntry;
2023
private final OutputStream out;

src/main/java/ru/olegcherednik/zip4jvm/io/writers/ZipEntryWriter.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import ru.olegcherednik.zip4jvm.io.out.data.DataOutput;
2222
import ru.olegcherednik.zip4jvm.io.out.data.EncoderDataOutput;
2323
import ru.olegcherednik.zip4jvm.io.out.entry.EntryMetadataOutputStream;
24-
import ru.olegcherednik.zip4jvm.io.out.entry.FooOutputStream;
24+
import ru.olegcherednik.zip4jvm.io.out.entry.PayloadCalculationOutputStream;
2525
import ru.olegcherednik.zip4jvm.io.out.entry.encrypted.EncryptedEntryOutputStream;
2626
import ru.olegcherednik.zip4jvm.model.entry.ZipEntry;
2727
import ru.olegcherednik.zip4jvm.utils.ZipUtils;
@@ -45,8 +45,7 @@ public void write(DataOutput out) throws IOException {
4545
EncoderDataOutput encoderDataOutput = new EncoderDataOutput(zipEntry.createEncoder(), out);
4646
EntryMetadataOutputStream emos = new EntryMetadataOutputStream(zipEntry, out);
4747
EncryptedEntryOutputStream eos = EncryptedEntryOutputStream.create(zipEntry, encoderDataOutput, emos);
48-
49-
FooOutputStream os = new FooOutputStream(zipEntry, eos);
48+
PayloadCalculationOutputStream os = new PayloadCalculationOutputStream(zipEntry, eos);
5049

5150
zipEntry.setDiskNo(out.getDiskNo());
5251

0 commit comments

Comments
 (0)