Pull-up common Builder attributes to BaseNCodec

Author: garydgregory

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

@@ -63,22 +63,16 @@ public class Base64 extends BaseNCodec {
      */
     public static class Builder extends AbstractBuilder<Base64, Builder> {
 
-        private byte[] encodeTable = STANDARD_ENCODE_TABLE;
+        /**
+         * Constructs a new instance.
+         */
+        public Builder() {
+            super(STANDARD_ENCODE_TABLE);
+        }
 
         @Override
         public Base64 get() {
-            return new Base64(getLineLength(), getLineSeparator(), encodeTable, getDecodingPolicy());
-        }
-
-        /**
-         * Sets the encode table.
-         *
-         * @param encodeTable the encode table, null resets to the default.
-         * @return this.
-         */
-        public Builder setEncodeTable(final byte... encodeTable) {
-            this.encodeTable = encodeTable != null ? encodeTable : STANDARD_ENCODE_TABLE;
-            return this;
+            return new Base64(getLineLength(), getLineSeparator(), getEncodeTable(), getDecodingPolicy());
         }
 
         /**
@@ -88,8 +82,7 @@ public Builder setEncodeTable(final byte... encodeTable) {
          * @return this.
          */
         public Builder setUrlSafe(final boolean urlSafe) {
-            this.encodeTable = toUrlSafeEncodeTable(urlSafe);
-            return this;
+            return setEncodeTable(toUrlSafeEncodeTable(urlSafe));
         }
 
     }

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

@@ -64,6 +64,14 @@ public abstract static class AbstractBuilder<T, B extends AbstractBuilder<T, B>>
         private CodecPolicy decodingPolicy = DECODING_POLICY_DEFAULT;
         private int lineLength;
         private byte[] lineSeparator = CHUNK_SEPARATOR;
+        private final byte[] defaultEncodeTable;
+        private byte[] encodeTable;
+
+
+        AbstractBuilder(final byte[] defaultEncodeTable) {
+            this.defaultEncodeTable = defaultEncodeTable;
+            this.encodeTable = defaultEncodeTable;
+        }
 
         @SuppressWarnings("unchecked")
         B asThis() {
@@ -74,6 +82,10 @@ CodecPolicy getDecodingPolicy() {
             return decodingPolicy;
         }
 
+        byte[] getEncodeTable() {
+            return encodeTable;
+        }
+
         int getLineLength() {
             return lineLength;
         }
@@ -93,6 +105,17 @@ public B setDecodingPolicy(final CodecPolicy decodingPolicy) {
             return asThis();
         }
 
+        /**
+         * Sets the encode table.
+         *
+         * @param encodeTable the encode table, null resets to the default.
+         * @return this.
+         */
+        public B setEncodeTable(final byte... encodeTable) {
+            this.encodeTable = encodeTable != null ? encodeTable : defaultEncodeTable;
+            return asThis();
+        }
+
         /**
          * Sets the line length.
          *