diff options
Diffstat (limited to 'indexinglanguage')
4 files changed, 7 insertions, 11 deletions
diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml index 74c2f701a67..0c6791e05b5 100644 --- a/indexinglanguage/pom.xml +++ b/indexinglanguage/pom.xml @@ -44,11 +44,6 @@ <artifactId>predicate-search-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.4</version> - </dependency> </dependencies> <build> <plugins> diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java index 0b392ebfa03..463c009e0a3 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeExpression.java @@ -3,7 +3,8 @@ package com.yahoo.vespa.indexinglanguage.expressions; import com.yahoo.document.DataType; import com.yahoo.document.datatypes.LongFieldValue; -import org.apache.commons.codec.binary.Base64; + +import java.util.Base64; /** * @author Simon Thoresen Hult @@ -24,7 +25,7 @@ public final class Base64DecodeExpression extends Expression { if (input.length() > 12) { throw new NumberFormatException("Base64 value '" + input + "' is out of range."); } - byte[] decoded = Base64.decodeBase64(input); + byte[] decoded = Base64.getDecoder().decode(input); if (decoded == null || decoded.length == 0) { throw new NumberFormatException("Illegal base64 value '" + input + "'."); } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeExpression.java index ff698bf2dd7..e61ac7051c1 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Base64EncodeExpression.java @@ -2,10 +2,10 @@ package com.yahoo.vespa.indexinglanguage.expressions; import com.yahoo.document.DataType; -import com.yahoo.document.DocumentType; import com.yahoo.document.datatypes.LongFieldValue; import com.yahoo.document.datatypes.StringFieldValue; -import org.apache.commons.codec.binary.Base64; + +import java.util.Base64; /** * @author Simon Thoresen Hult @@ -23,7 +23,7 @@ public final class Base64EncodeExpression extends Expression { output[i] = (byte)(input & 0xffL); input >>>= 8; } - String encoded = new Base64(0).encodeToString(output); + String encoded = Base64.getEncoder().encodeToString(output); ctx.setValue(new StringFieldValue(encoded)); } diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeTestCase.java index df4fd981e01..3e547cedc4b 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/Base64DecodeTestCase.java @@ -58,7 +58,7 @@ public class Base64DecodeTestCase { new Base64DecodeExpression().execute(new StringFieldValue("???")); fail(); } catch (IllegalArgumentException e) { - assertEquals("Illegal base64 value '???'.", e.getMessage()); + assertEquals("Illegal base64 character 3f", e.getMessage()); } } |