[COMPRESS-722] Be more memory efficient when writing one byte, test builder construction without file and fix an inconsistency

Author: Uwe Voigt

src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java

@@ -86,11 +86,6 @@ public abstract static class AbstractBuilder<T extends ZipArchiveOutputStream, B
          */
         protected long zipSplitSize;
 
-        /**
-         * The options specifying how the file is opened.
-         */
-        protected OpenOption[] options;
-
         /**
          * Whether this stream automatically compresses entries using registered compressor factories.
          */
@@ -103,19 +98,6 @@ protected AbstractBuilder() {
             setCharset(StandardCharsets.UTF_8);
         }
 
-        /**
-         * Sets the options specifying how the file is opened.
-         *
-         * <p>Null by default.</p>
-         *
-         * @param options the opem options.
-         * @return {@code this} instance.
-         */
-        public B setOptions(OpenOption... options) {
-            this.options = options;
-            return asThis();
-        }
-
         /**
          * Sets the maximum size of a single part of the split archive created by this stream. Must be between 64kB and about 4GB.
          *
@@ -180,10 +162,12 @@ public ZipArchiveOutputStream get() throws IOException {
      * and writes it to the underlying StreamCompressor as raw (already-compressed) bytes.
      */
     private class CompressorBridgeOutputStream extends OutputStream {
+        private final byte[] oneByte = new byte[1];
+
         @Override
         public void write(final int b) throws IOException {
-            final byte[] buf = { (byte) b };
-            write(buf, 0, 1);
+            oneByte[0] = (byte) (b & ZipConstants.BYTE_MASK);
+            write(oneByte, 0, 1);
         }
 
         @Override
@@ -552,19 +536,21 @@ protected ZipArchiveOutputStream(final AbstractBuilder<?, ?> builder) throws IOE
             this.out = new SeekableChannelRandomAccessOutputStream(builder.getChannel(SeekableByteChannel.class));
             this.isSplitZip = false;
         } else {
-            final Path path = builder.getPath();
+            final Path path;
+            try {
+                path = builder.getPath();
+            } catch (IllegalStateException e) {
+                throw new IOException("No output stream available", e);
+            }
             if (builder.zipSplitSize > 0) {
                 this.out = new ZipSplitOutputStream(path, builder.zipSplitSize);
                 this.isSplitZip = true;
             } else {
-                OpenOption[] options = builder.getOpenOptions();
+                final OpenOption[] options = builder.getOpenOptions();
                 this.out = options.length == 0 ? new FileRandomAccessOutputStream(path) : new FileRandomAccessOutputStream(path, options);
                 this.isSplitZip = false;
             }
         }
-        if (this.out == null) {
-            throw new IOException("No output stream available");
-        }
         this.def = new Deflater(level, true);
         this.streamCompressor = StreamCompressor.create(this.out, def);
         this.autoCompress = builder.autoCompress;
@@ -655,11 +641,9 @@ public ZipArchiveOutputStream(final Path path, final long zipSplitSize) throws I
      * @since 1.21
      */
     public ZipArchiveOutputStream(final Path file, final OpenOption... options) throws IOException {
-        this.def = new Deflater(level, true);
-        this.out = options.length == 0 ? new FileRandomAccessOutputStream(file) : new FileRandomAccessOutputStream(file, options);
-        this.streamCompressor = StreamCompressor.create(out, def);
-        this.isSplitZip = false;
-        this.autoCompress = false;
+        this(builder()
+                .setPath(file)
+                .setOpenOptions(options));
     }
 
     /**

src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStreamTest.java

@@ -20,12 +20,15 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.channels.NonWritableChannelException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.StandardOpenOption;
 import java.util.zip.Deflater;
 import java.util.zip.ZipEntry;
 
@@ -77,4 +80,20 @@ void testSetEncoding() throws IOException {
             assertEquals(Charset.defaultCharset().name(), outputStream.getEncoding());
         }
     }
+
+    @Test
+    void testOpenFileWithOptions() throws IOException {
+        ZipArchiveOutputStream out = ZipArchiveOutputStream.builder()
+                .setFile(createTempFile())
+                .setOpenOptions(StandardOpenOption.READ, StandardOpenOption.DELETE_ON_CLOSE)
+                .get();
+        ZipArchiveEntry entry = new ZipArchiveEntry("test.txt");
+        assertThrows(NonWritableChannelException.class, () -> out.putArchiveEntry(entry));
+    }
+
+    @Test
+    void testReportMissingOutputStreamUsingBuilder() {
+        IOException exception = assertThrows(IOException.class, () -> ZipArchiveOutputStream.builder().get());
+        assertEquals("No output stream available", exception.getMessage());
+    }
 }