Remove use of commons-lang from document

3 files changed, 9 insertions, 9 deletions

diff --git a/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java b/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java
index f7bb5aecf0b..4a9434d43bc 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java
@@ -9,8 +9,8 @@ import com.yahoo.document.ReferenceDataType;
 import com.yahoo.document.datatypes.FieldValue;
 import com.yahoo.document.json.TokenBuffer;
 import com.yahoo.document.update.ValueUpdate;
-import org.apache.commons.codec.binary.Base64;
 
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -86,7 +86,7 @@ public class SingleValueReader {
 
     public static FieldValue readAtomic(String field, DataType expectedType) {
         if (expectedType.equals(DataType.RAW)) {
-            return expectedType.createFieldValue(new Base64().decode(field));
+            return expectedType.createFieldValue(Base64.getMimeDecoder().decode(field));
         } else if (expectedType.equals(PositionDataType.INSTANCE)) {
             return PositionDataType.fromString(field);
         } else if (expectedType instanceof ReferenceDataType) {
diff --git a/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java b/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java
index a0e7f81ea73..85bc4d032ff 100644
--- a/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java
+++ b/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java
@@ -5,8 +5,8 @@ import com.yahoo.document.Document;
 import com.yahoo.document.Field;
 import com.yahoo.document.datatypes.*;
 import com.yahoo.text.Utf8;
-import org.apache.commons.codec.binary.Base64;
 
+import java.util.Base64;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -84,7 +84,7 @@ public class XmlSerializationHelper {
 
     public static void printRawXml(Raw r, XmlStream xml) {
         xml.addAttribute("binaryencoding", "base64");
-        xml.addContent(new Base64(0).encodeToString(r.getByteBuffer().array()));
+        xml.addContent(Base64.getEncoder().encodeToString(r.getByteBuffer().array()));
     }
 
     public static void printStringXml(StringFieldValue s, XmlStream xml) {
@@ -92,7 +92,7 @@ public class XmlSerializationHelper {
         if (containsNonPrintableCharactersString(content)) {
             byte[] bytecontent = Utf8.toBytes(content);
             xml.addAttribute("binaryencoding", "base64");
-            xml.addContent(new Base64(0).encodeToString(bytecontent));
+            xml.addContent(Base64.getEncoder().encodeToString(bytecontent));
         } else {
             xml.addContent(content);
         }
diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java
index 737371f2375..02682fa943f 100644
--- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java
+++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java
@@ -16,12 +16,12 @@ import com.yahoo.document.serialization.DeserializationException;
 import com.yahoo.document.serialization.FieldReader;
 import com.yahoo.text.Utf8;
 import com.yahoo.vespa.objects.FieldBase;
-import org.apache.commons.codec.binary.Base64;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import java.io.InputStream;
 import java.math.BigInteger;
+import java.util.Base64;
 import java.util.Optional;
 
 /**
@@ -242,7 +242,7 @@ public class VespaXMLFieldReader extends VespaXMLReader implements FieldReader {
     }
 
     private void assignPositionFieldFromStringIfNonEmpty(Struct value, String elementText, boolean base64) {
-        String str = base64 ? Utf8.toString(new Base64().decode(elementText)) : elementText;
+        String str = base64 ? Utf8.toString(Base64.getMimeDecoder().decode(elementText)) : elementText;
         str = str.trim();
         if (str.isEmpty()) {
             return;
@@ -409,7 +409,7 @@ public class VespaXMLFieldReader extends VespaXMLReader implements FieldReader {
     public void read(FieldBase field, Raw value) {
         try {
             if (isBase64EncodedElement(reader)) {
-                value.assign(new Base64().decode(reader.getElementText()));
+                value.assign(Base64.getMimeDecoder().decode(reader.getElementText()));
             } else {
                 value.assign(reader.getElementText().getBytes());
             }
@@ -422,7 +422,7 @@ public class VespaXMLFieldReader extends VespaXMLReader implements FieldReader {
     public void read(FieldBase field, PredicateFieldValue value) {
         try {
             if (isBase64EncodedElement(reader)) {
-                value.assign(Predicate.fromBinary(new Base64().decode(reader.getElementText())));
+                value.assign(Predicate.fromBinary(Base64.getMimeDecoder().decode(reader.getElementText())));
             } else {
                 value.assign(Predicate.fromString(reader.getElementText()));
             }