Internal refactoring

Deprecate some old constructors

Author: garydgregory

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

@@ -18,7 +18,6 @@
 package org.apache.commons.codec.binary;
 
 import java.util.Arrays;
-import java.util.Objects;
 
 import org.apache.commons.codec.CodecPolicy;
 
@@ -157,11 +156,6 @@ public static Builder builder() {
      */
     private final byte[] decodeTable;
 
-    /**
-     * Encode table to use.
-     */
-    private final byte[] encodeTable;
-
     /**
      * Constructs a Base16 codec used for decoding and encoding.
      */
@@ -194,7 +188,6 @@ public Base16(final boolean lowerCase, final CodecPolicy decodingPolicy) {
 
     private Base16(final Builder builder) {
         super(builder);
-        this.encodeTable = Objects.requireNonNull(builder.getEncodeTable(), "encodeTable");
         this.decodeTable = Arrays.equals(encodeTable, LOWER_CASE_ENCODE_TABLE) ? LOWER_CASE_DECODE_TABLE : UPPER_CASE_DECODE_TABLE;
     }
 

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

@@ -280,11 +280,6 @@ private static byte[] encodeTable(final boolean useHex) {
      */
     private final int encodeSize;
 
-    /**
-     * Encode table to use.
-     */
-    private final byte[] encodeTable;
-
     /**
      * Line separator for encoding. Not used when decoding. Only used if lineLength > 0.
      */
@@ -344,7 +339,6 @@ public Base32(final boolean useHex, final byte padding) {
     private Base32(final Builder builder) {
         super(builder);
         Objects.requireNonNull(builder.getEncodeTable(), "encodeTable");
-        this.encodeTable = builder.getEncodeTable();
         this.decodeTable = Arrays.equals(builder.getEncodeTable(), HEX_ENCODE_TABLE) ? HEX_DECODE_TABLE : DECODE_TABLE;
         if (builder.getLineLength() > 0) {
             final byte[] lineSeparator = builder.getLineSeparator();

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

@@ -505,14 +505,6 @@ static byte[] toUrlSafeEncodeTable(final boolean urlSafe) {
         return urlSafe ? URL_SAFE_ENCODE_TABLE : STANDARD_ENCODE_TABLE;
     }
 
-    /**
-     * Encode table to use: either STANDARD or URL_SAFE or custom.
-     * Note: the DECODE_TABLE above remains static because it is able
-     * to decode both STANDARD and URL_SAFE streams, but the encodeTable must be a member variable so we can switch
-     * between the two modes.
-     */
-    private final byte[] encodeTable;
-
     /**
      * Decode table to use.
      */
@@ -698,7 +690,6 @@ private Base64(final Builder builder) {
         }
         this.isStandardEncodeTable = Arrays.equals(builder.getEncodeTable(), STANDARD_ENCODE_TABLE);
         this.isUrlSafe = Arrays.equals(builder.getEncodeTable(), URL_SAFE_ENCODE_TABLE);
-        this.encodeTable = builder.getEncodeTable();
         this.decodeTable = this.isStandardEncodeTable || this.isUrlSafe ? DECODE_TABLE : calculateDecodeTable(this.encodeTable);
         // TODO could be simplified if there is no requirement to reject invalid line sep when length <=0
         // @see test case Base64Test.testConstructors()