BaseNCodecOutputStream subclasses are now type-safe to match its

matching BaseNCodec

Author: garydgregory

src/changes/changes.xml

@@ -48,6 +48,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action type="update" dev="ggregory" due-to="Gary Gregory">Deprecate all but one Base32 constructor in favor of the builder added in version 1.17.0.</action>
       <action type="update" dev="ggregory" due-to="Gary Gregory">Deprecate all but one Base64 constructor in favor of the builder added in version 1.17.0.</action>
       <action type="update" dev="ggregory" due-to="Gary Gregory">BaseNCodecInputStream subclasses are now type-safe to match its matching BaseNCodec.</action>
+      <action type="update" dev="ggregory" due-to="Gary Gregory">BaseNCodecOutputStream subclasses are now type-safe to match its matching BaseNCodec.</action>
       <!-- ADD -->
       <action type="add" dev="ggregory" due-to="Fredrik Kjellberg, Gary Gregory">Add org.apache.commons.codec.digest.CRC16.</action>
       <!-- UPDATE -->

src/main/java/org/apache/commons/codec/binary/Base16OutputStream.java

@@ -31,7 +31,7 @@
  * @see Base16
  * @since 1.15
  */
-public class Base16OutputStream extends BaseNCodecOutputStream {
+public class Base16OutputStream extends BaseNCodecOutputStream<Base16> {
 
     /**
      * Constructs a Base16OutputStream such that all data written is Base16-encoded to the original provided OutputStream.

src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java

@@ -58,7 +58,7 @@
  * @see <a href="http://www.ietf.org/rfc/rfc4648.txt">RFC 4648</a>
  * @since 1.5
  */
-public class Base32OutputStream extends BaseNCodecOutputStream {
+public class Base32OutputStream extends BaseNCodecOutputStream<Base32> {
 
     /**
      * Constructs a Base32OutputStream such that all data written is Base32-encoded to the original provided OutputStream.

src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java

@@ -62,7 +62,7 @@
  * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
  * @since 1.4
  */
-public class Base64OutputStream extends BaseNCodecOutputStream {
+public class Base64OutputStream extends BaseNCodecOutputStream<Base64> {
 
     /**
      * Constructs a Base64OutputStream such that all data written is Base64-encoded to the original provided OutputStream.

src/main/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java

@@ -35,13 +35,14 @@
  * >CloseShieldOutputStream</a>.
  * </p>
  *
+ * @param <T> A BaseNCodec subclass.
  * @since 1.5
  */
-public class BaseNCodecOutputStream extends FilterOutputStream {
+public class BaseNCodecOutputStream<T extends BaseNCodec> extends FilterOutputStream {
 
     private final boolean doEncode;
 
-    private final BaseNCodec baseNCodec;
+    private final T baseNCodec;
 
     private final byte[] singleByte = new byte[1];
 
@@ -56,7 +57,7 @@ public class BaseNCodecOutputStream extends FilterOutputStream {
      * @param basedCodec a BaseNCodec.
      * @param doEncode true to encode, false to decode, TODO should be an enum?
      */
-    public BaseNCodecOutputStream(final OutputStream outputStream, final BaseNCodec basedCodec, final boolean doEncode) {
+    public BaseNCodecOutputStream(final OutputStream outputStream, final T basedCodec, final boolean doEncode) {
         super(outputStream);
         this.baseNCodec = basedCodec;
         this.doEncode = doEncode;