aboutsummaryrefslogtreecommitdiffstats
path: root/document/src/main/java/com/yahoo/vespaxmlparser
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-01-06 14:25:51 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-01-06 14:25:51 +0100
commit6c05292f7c58bc175989b5423a639f203f029574 (patch)
treec88f2813364f8e54957843a2bbf54093ceaf121b /document/src/main/java/com/yahoo/vespaxmlparser
parentd91b233668771fc43739254b59fd46ce5b3bf876 (diff)
Remove use of commons-lang from document
Diffstat (limited to 'document/src/main/java/com/yahoo/vespaxmlparser')
-rw-r--r--document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java8
1 files changed, 4 insertions, 4 deletions
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()));
}