From 21766a1f39f5bfc56553d930047fad607f7c29dd Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Tue, 3 Jun 2025 23:18:34 +0200
Subject: [PATCH] Delete ProxyOutputStream and test

---
 .../main/kotlin/sop/util/ProxyOutputStream.kt | 77 -------------------
 .../java/sop/util/ProxyOutputStreamTest.java  | 40 ----------
 2 files changed, 117 deletions(-)
 delete mode 100644 sop-java/src/main/kotlin/sop/util/ProxyOutputStream.kt
 delete mode 100644 sop-java/src/test/java/sop/util/ProxyOutputStreamTest.java

diff --git a/sop-java/src/main/kotlin/sop/util/ProxyOutputStream.kt b/sop-java/src/main/kotlin/sop/util/ProxyOutputStream.kt
deleted file mode 100644
index 4ba24b8..0000000
--- a/sop-java/src/main/kotlin/sop/util/ProxyOutputStream.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package sop.util
-
-import java.io.ByteArrayOutputStream
-import java.io.IOException
-import java.io.OutputStream
-
-/**
- * [OutputStream] that buffers data being written into it, until its underlying output stream is
- * being replaced. At that point, first all the buffered data is being written to the underlying
- * stream, followed by any successive data that may get written to the [ProxyOutputStream]. This
- * class is useful if we need to provide an [OutputStream] at one point in time when the final
- * target output stream is not yet known.
- */
-@Deprecated("Marked for removal.")
-// TODO: Remove in 11.X
-class ProxyOutputStream : OutputStream() {
-    private val buffer = ByteArrayOutputStream()
-    private var swapped: OutputStream? = null
-
-    @Synchronized
-    fun replaceOutputStream(underlying: OutputStream) {
-        this.swapped = underlying
-        swapped!!.write(buffer.toByteArray())
-    }
-
-    @Synchronized
-    @Throws(IOException::class)
-    override fun write(b: ByteArray) {
-        if (swapped == null) {
-            buffer.write(b)
-        } else {
-            swapped!!.write(b)
-        }
-    }
-
-    @Synchronized
-    @Throws(IOException::class)
-    override fun write(b: ByteArray, off: Int, len: Int) {
-        if (swapped == null) {
-            buffer.write(b, off, len)
-        } else {
-            swapped!!.write(b, off, len)
-        }
-    }
-
-    @Synchronized
-    @Throws(IOException::class)
-    override fun flush() {
-        buffer.flush()
-        if (swapped != null) {
-            swapped!!.flush()
-        }
-    }
-
-    @Synchronized
-    @Throws(IOException::class)
-    override fun close() {
-        buffer.close()
-        if (swapped != null) {
-            swapped!!.close()
-        }
-    }
-
-    @Synchronized
-    @Throws(IOException::class)
-    override fun write(i: Int) {
-        if (swapped == null) {
-            buffer.write(i)
-        } else {
-            swapped!!.write(i)
-        }
-    }
-}
diff --git a/sop-java/src/test/java/sop/util/ProxyOutputStreamTest.java b/sop-java/src/test/java/sop/util/ProxyOutputStreamTest.java
deleted file mode 100644
index 9d99fd4..0000000
--- a/sop-java/src/test/java/sop/util/ProxyOutputStreamTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package sop.util;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
-import org.junit.jupiter.api.Test;
-
-public class ProxyOutputStreamTest {
-
-    @Test
-    public void replaceOutputStreamThrowsNPEForNull() {
-        ProxyOutputStream proxy = new ProxyOutputStream();
-        assertThrows(NullPointerException.class, () -> proxy.replaceOutputStream(null));
-    }
-
-    @Test
-    public void testSwappingStreamPreservesWrittenBytes() throws IOException {
-        byte[] firstSection = "Foo\nBar\n".getBytes(StandardCharsets.UTF_8);
-        byte[] secondSection = "Baz\n".getBytes(StandardCharsets.UTF_8);
-
-        ProxyOutputStream proxy = new ProxyOutputStream();
-        proxy.write(firstSection);
-
-        ByteArrayOutputStream swappedStream = new ByteArrayOutputStream();
-        proxy.replaceOutputStream(swappedStream);
-
-        proxy.write(secondSection);
-        proxy.close();
-
-        assertEquals("Foo\nBar\nBaz\n", swappedStream.toString());
-    }
-}