Removing deprecated commons codec API calls

Author: coheigea

src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java

@@ -845,7 +845,10 @@ public void close() throws IOException {
                 //buffering seems not to help
                 //bufferedOutputStream = new BufferedOutputStream(new Base64OutputStream(ivSplittingOutputStream, false), 8192 * 5);
                 ReplaceableOuputStream replaceableOuputStream = new ReplaceableOuputStream(ivSplittingOutputStream);    //NOPMD
-                OutputStream base64OutputStream = new Base64OutputStream(replaceableOuputStream, false); //NOPMD
+                OutputStream base64OutputStream = Base64OutputStream.builder() //NOPMD
+                        .setOutputStream(replaceableOuputStream)
+                        .setEncode(false)
+                        .get();
                 ivSplittingOutputStream.setParentOutputStream(replaceableOuputStream);
                 OutputStreamWriter outputStreamWriter = //NOPMD
                         new OutputStreamWriter(base64OutputStream,

src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java

@@ -40,6 +40,7 @@
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.binary.Base64OutputStream;
 import org.apache.xml.security.algorithms.JCEMapper;
 import org.apache.xml.security.encryption.XMLCipherUtil;
@@ -175,12 +176,14 @@ public void init(OutputProcessorChain outputProcessorChain) throws XMLSecurityEx
                 symmetricCipher.init(Cipher.ENCRYPT_MODE, encryptionPartDef.getSymmetricKey(), parameterSpec);
 
                 characterEventGeneratorOutputStream = new CharacterEventGeneratorOutputStream();
-                Base64OutputStream base64EncoderStream = null;  //NOPMD
+                Base64OutputStream.Builder builder = Base64OutputStream.builder()
+                        .setOutputStream(characterEventGeneratorOutputStream)
+                        .setEncode(true);
                 if (XMLUtils.isIgnoreLineBreaks()) {
-                    base64EncoderStream = new Base64OutputStream(characterEventGeneratorOutputStream, true, 0, null);
-                } else {
-                    base64EncoderStream = new Base64OutputStream(characterEventGeneratorOutputStream, true);
+                    builder.setBaseNCodec(Base64.builder().setLineLength(0).setLineSeparator(null).get());
                 }
+
+                Base64OutputStream base64EncoderStream = builder.get();  //NOPMD
                 base64EncoderStream.write(iv);
 
                 OutputStream outputStream = new CipherOutputStream(base64EncoderStream, symmetricCipher);   //NOPMD

src/main/java/org/apache/xml/security/stax/impl/transformer/TransformBase64Decode.java

@@ -43,16 +43,17 @@ public class TransformBase64Decode extends TransformIdentity {
 
     @Override
     public void setOutputStream(OutputStream outputStream) throws XMLSecurityException {
-        super.setOutputStream(new Base64OutputStream(
-                new FilterOutputStream(outputStream) {
+        OutputStream base64OutputStream = Base64OutputStream.builder() //NOPMD
+                .setOutputStream(new FilterOutputStream(outputStream) {
                     @Override
                     public void close() throws IOException {
                         //do not close the parent output stream!
                         super.flush();
                     }
-                },
-                false)
-        );
+                })
+                .setEncode(false)
+                .get();
+        super.setOutputStream(base64OutputStream);
     }
 
     @Override
@@ -96,7 +97,11 @@ public void transform(XMLSecEvent xmlSecEvent) throws XMLStreamException {
                             public void transform(Object object) throws XMLStreamException {
                                 if (base64OutputStream == null) {
                                     byteArrayOutputStream = new UnsyncByteArrayOutputStream();
-                                    base64OutputStream = new Base64OutputStream(byteArrayOutputStream, false);
+                                    base64OutputStream =
+                                        Base64OutputStream.builder()
+                                            .setOutputStream(byteArrayOutputStream)
+                                            .setEncode(false)
+                                            .get();
                                 }
                                 try {
                                     base64OutputStream.write((byte[]) object);
@@ -139,7 +144,10 @@ public void doFinal() throws XMLStreamException {
                             public void transform(Object object) throws XMLStreamException {
                                 if (base64OutputStream == null) {
                                     byteArrayOutputStream = new UnsyncByteArrayOutputStream();
-                                    base64OutputStream = new Base64OutputStream(byteArrayOutputStream, false);
+                                    base64OutputStream = Base64OutputStream.builder()
+                                            .setOutputStream(byteArrayOutputStream)
+                                            .setEncode(false)
+                                            .get();
                                 }
                                 try {
                                     base64OutputStream.write((byte[]) object);
@@ -177,7 +185,11 @@ public void transform(InputStream inputStream) throws XMLStreamException {
         if (getOutputStream() != null) {
             super.transform(inputStream);
         } else {
-            super.transform(new Base64InputStream(inputStream, false));
+            InputStream base64InputStream = Base64InputStream.builder() //NOPMD
+                    .setInputStream(inputStream)
+                    .setEncode(false)
+                    .get();
+            super.transform(base64InputStream);
         }
     }