summaryrefslogtreecommitdiff
path: root/plugins/ingest-attachment
diff options
context:
space:
mode:
authorAdrien Grand <jpountz@gmail.com>2016-05-17 17:16:23 +0200
committerAdrien Grand <jpountz@gmail.com>2016-05-23 11:32:42 +0200
commit459916f5ddb597204c428c35d239d45812a78205 (patch)
treeafa51ad61d326600c8b10adf24bc6273dff3c171 /plugins/ingest-attachment
parente7eb664c78dce2451dbeb55db0c0b761a65b295b (diff)
Remove custom Base64 implementation. #18413
This replaces o.e.common.Base64 with java.util.Base64.
Diffstat (limited to 'plugins/ingest-attachment')
-rw-r--r--plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorTests.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorTests.java b/plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorTests.java
index 945c5d3479..56e72be351 100644
--- a/plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorTests.java
+++ b/plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorTests.java
@@ -21,7 +21,6 @@ package org.elasticsearch.ingest.attachment;
import org.apache.commons.io.IOUtils;
import org.elasticsearch.ElasticsearchParseException;
-import org.elasticsearch.common.Base64;
import org.elasticsearch.ingest.RandomDocumentPicks;
import org.elasticsearch.ingest.core.IngestDocument;
import org.elasticsearch.test.ESTestCase;
@@ -30,6 +29,7 @@ import org.junit.Before;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Base64;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -209,7 +209,7 @@ public class AttachmentProcessorTests extends ESTestCase {
String path = "/org/elasticsearch/ingest/attachment/test/sample-files/" + filename;
try (InputStream is = AttachmentProcessorTests.class.getResourceAsStream(path)) {
byte bytes[] = IOUtils.toByteArray(is);
- return Base64.encodeBytes(bytes);
+ return Base64.getEncoder().encodeToString(bytes);
}
}
}