Author: nick
Date: Thu Aug 20 10:06:32 2015
New Revision: 1696750
URL: http://svn.apache.org/r1696750
Log:
TIKA-1710 patch from Yaniv Kunda - Use Commons IO instead of the Tika Core IO
copies, and java.nio.charset.StandardCharsets
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/HTMLHelper.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/LanguageResource.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/CSVMessageBodyWriter.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/JSONMessageBodyWriter.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/MetadataListMessageBodyWriter.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/TextMessageBodyWriter.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/XMPMessageBodyWriter.java
tika/trunk/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java
tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java
tika/trunk/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/HTMLHelper.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/HTMLHelper.java?rev=1696750&r1=1696749&r2=1696750&view=diff
==============================================================================
--- tika/trunk/tika-server/src/main/java/org/apache/tika/server/HTMLHelper.java
(original)
+++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/HTMLHelper.java
Thu Aug 20 10:06:32 2015
@@ -17,10 +17,12 @@
package org.apache.tika.server;
+import org.apache.commons.io.IOUtils;
+
import java.io.IOException;
import java.io.InputStream;
-import org.apache.tika.io.IOUtils;
+import static java.nio.charset.StandardCharsets.UTF_8;
/**
* Helps produce user facing HTML output.
@@ -40,7 +42,7 @@ public class HTMLHelper {
throw new IllegalArgumentException("Template Not Found - " + PATH);
}
try {
- String html = IOUtils.toString(htmlStr, IOUtils.UTF_8.name());
+ String html = IOUtils.toString(htmlStr, UTF_8);
int bodyAt = html.indexOf(BODY_VAR);
PRE_BODY = html.substring(0, bodyAt);
POST_BODY = html.substring(bodyAt + BODY_VAR.length());
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/LanguageResource.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/LanguageResource.java?rev=1696750&r1=1696749&r2=1696750&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/LanguageResource.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/LanguageResource.java
Thu Aug 20 10:06:32 2015
@@ -25,13 +25,14 @@ import javax.ws.rs.Produces;
import java.io.IOException;
import java.io.InputStream;
-import com.google.common.base.Charsets;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tika.language.LanguageIdentifier;
import org.apache.tika.language.LanguageProfile;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
@Path("/language")
public class LanguageResource {
@@ -46,7 +47,7 @@ public class LanguageResource {
public String detect(final InputStream is) throws IOException {
// comme çi comme ça
// this is English!
- String fileTxt = IOUtils.toString(is, Charsets.UTF_8);
+ String fileTxt = IOUtils.toString(is, UTF_8);
logger.debug("File: " + fileTxt);
LanguageIdentifier lang = new LanguageIdentifier(new
LanguageProfile(
fileTxt));
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java?rev=1696750&r1=1696749&r2=1696750&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
Thu Aug 20 10:06:32 2015
@@ -56,7 +56,6 @@ import org.apache.poi.extractor.Extracto
import org.apache.tika.config.TikaConfig;
import org.apache.tika.detect.Detector;
import org.apache.tika.exception.EncryptedDocumentException;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaMetadataKeys;
@@ -77,6 +76,8 @@ import org.apache.tika.server.TikaServer
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
@Path("/tika")
public class TikaResource {
public static final String GREETING = "This is Tika Server. Please PUT\n";
@@ -350,7 +351,7 @@ public class TikaResource {
return new StreamingOutput() {
public void write(OutputStream outputStream) throws IOException,
WebApplicationException {
- Writer writer = new OutputStreamWriter(outputStream,
IOUtils.UTF_8);
+ Writer writer = new OutputStreamWriter(outputStream, UTF_8);
BodyContentHandler body = new BodyContentHandler(new
RichTextContentHandler(writer));
@@ -408,7 +409,7 @@ public class TikaResource {
return new StreamingOutput() {
public void write(OutputStream outputStream)
throws IOException, WebApplicationException {
- Writer writer = new OutputStreamWriter(outputStream,
IOUtils.UTF_8);
+ Writer writer = new OutputStreamWriter(outputStream, UTF_8);
ContentHandler content;
try {
@@ -416,7 +417,7 @@ public class TikaResource {
TransformerHandler handler =
factory.newTransformerHandler();
handler.getTransformer().setOutputProperty(OutputKeys.METHOD, format);
handler.getTransformer().setOutputProperty(OutputKeys.INDENT, "yes");
-
handler.getTransformer().setOutputProperty(OutputKeys.ENCODING,
IOUtils.UTF_8.name());
+
handler.getTransformer().setOutputProperty(OutputKeys.ENCODING, UTF_8.name());
handler.setResult(new StreamResult(writer));
content = new ExpandedTitleContentHandler(handler);
} catch (TransformerConfigurationException e) {
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java?rev=1696750&r1=1696749&r2=1696750&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
Thu Aug 20 10:06:32 2015
@@ -37,6 +37,8 @@ import org.apache.tika.language.Language
import org.apache.tika.language.LanguageProfile;
import org.apache.tika.language.translate.Translator;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
@Path("/translate")
public class TranslateResource {
@@ -62,7 +64,7 @@ public class TranslateResource {
@PathParam("translator") String translator,
@PathParam("src") String sLang, @PathParam("dest")
String dLang)
throws TikaException, IOException {
- return doTranslate(IOUtils.toString(is, "utf-8"), translator,
sLang, dLang);
+ return doTranslate(IOUtils.toString(is, UTF_8), translator,
sLang, dLang);
}
@@ -74,7 +76,7 @@ public class TranslateResource {
public String autoTranslate(final InputStream is,
@PathParam("translator") String translator,
@PathParam("dest") String dLang) throws TikaException,
IOException {
- final String content = IOUtils.toString(is, "utf-8");
+ final String content = IOUtils.toString(is, UTF_8);
LanguageIdentifier language = new LanguageIdentifier(
new LanguageProfile(content));
String sLang = language.getLanguage();
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java?rev=1696750&r1=1696749&r2=1696750&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java
Thu Aug 20 10:06:32 2015
@@ -63,6 +63,8 @@ import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
@Path("/unpack")
public class UnpackerResource {
public static final String TEXT_FILENAME = "__TEXT__";
@@ -70,7 +72,7 @@ public class UnpackerResource {
private static final String META_FILENAME = "__METADATA__";
public static void metadataToCsv(Metadata metadata, OutputStream
outputStream) throws IOException {
- CSVWriter writer = new CSVWriter(new OutputStreamWriter(outputStream,
org.apache.tika.io.IOUtils.UTF_8));
+ CSVWriter writer = new CSVWriter(new OutputStreamWriter(outputStream,
UTF_8));
for (String name : metadata.names()) {
String[] values = metadata.getValues(name);
@@ -127,7 +129,7 @@ public class UnpackerResource {
ByteArrayOutputStream text = new ByteArrayOutputStream();
if (saveAll) {
- ch = new BodyContentHandler(new RichTextContentHandler(new
OutputStreamWriter(text, org.apache.tika.io.IOUtils.UTF_8)));
+ ch = new BodyContentHandler(new RichTextContentHandler(new
OutputStreamWriter(text, UTF_8)));
} else {
ch = new DefaultHandler();
}
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/CSVMessageBodyWriter.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/CSVMessageBodyWriter.java?rev=1696750&r1=1696749&r2=1696750&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/CSVMessageBodyWriter.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/CSVMessageBodyWriter.java
Thu Aug 20 10:06:32 2015
@@ -33,9 +33,10 @@ import java.util.ArrayList;
import java.util.Arrays;
import au.com.bytecode.opencsv.CSVWriter;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
@Provider
@Produces("text/csv")
public class CSVMessageBodyWriter implements MessageBodyWriter<Metadata> {
@@ -54,7 +55,7 @@ public class CSVMessageBodyWriter implem
MediaType mediaType, MultivaluedMap<String, Object>
httpHeaders, OutputStream entityStream) throws IOException,
WebApplicationException {
- CSVWriter writer = new CSVWriter(new OutputStreamWriter(entityStream,
IOUtils.UTF_8));
+ CSVWriter writer = new CSVWriter(new OutputStreamWriter(entityStream,
UTF_8));
for (String name : metadata.names()) {
String[] values = metadata.getValues(name);
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/JSONMessageBodyWriter.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/JSONMessageBodyWriter.java?rev=1696750&r1=1696749&r2=1696750&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/JSONMessageBodyWriter.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/JSONMessageBodyWriter.java
Thu Aug 20 10:06:32 2015
@@ -32,10 +32,11 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.serialization.JsonMetadata;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
@Provider
@Produces(MediaType.APPLICATION_JSON)
public class JSONMessageBodyWriter implements MessageBodyWriter<Metadata> {
@@ -53,7 +54,7 @@ public class JSONMessageBodyWriter imple
MediaType mediaType, MultivaluedMap<String, Object>
httpHeaders, OutputStream entityStream) throws IOException,
WebApplicationException {
try {
- Writer writer = new OutputStreamWriter(entityStream,
IOUtils.UTF_8);
+ Writer writer = new OutputStreamWriter(entityStream, UTF_8);
JsonMetadata.toJson(metadata, writer);
writer.flush();
} catch (TikaException e) {
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/MetadataListMessageBodyWriter.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/MetadataListMessageBodyWriter.java?rev=1696750&r1=1696749&r2=1696750&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/MetadataListMessageBodyWriter.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/MetadataListMessageBodyWriter.java
Thu Aug 20 10:06:32 2015
@@ -32,10 +32,11 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.serialization.JsonMetadataList;
import org.apache.tika.server.MetadataList;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
@Provider
@Produces(MediaType.APPLICATION_JSON)
public class MetadataListMessageBodyWriter implements
MessageBodyWriter<MetadataList> {
@@ -56,7 +57,7 @@ public class MetadataListMessageBodyWrit
MediaType mediaType, MultivaluedMap<String, Object>
httpHeaders, OutputStream entityStream) throws IOException,
WebApplicationException {
try {
- Writer writer = new OutputStreamWriter(entityStream,
IOUtils.UTF_8);
+ Writer writer = new OutputStreamWriter(entityStream, UTF_8);
JsonMetadataList.toJson(list.getMetadata(), writer);
writer.flush();
} catch (TikaException e) {
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/TextMessageBodyWriter.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/TextMessageBodyWriter.java?rev=1696750&r1=1696749&r2=1696750&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/TextMessageBodyWriter.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/TextMessageBodyWriter.java
Thu Aug 20 10:06:32 2015
@@ -31,9 +31,10 @@ import java.io.Writer;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
/**
* Returns simple text string for a particular metadata value.
* This assumes that the metadata object only has one key;
@@ -62,7 +63,7 @@ public class TextMessageBodyWriter imple
if (metadata.names().length != 1) {
throw new WebApplicationException("Metadata object must only have
one entry!");
}
- Writer writer = new OutputStreamWriter(entityStream, IOUtils.UTF_8);
+ Writer writer = new OutputStreamWriter(entityStream, UTF_8);
for (String name : metadata.names()) {
writer.write(metadata.get(name));
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/XMPMessageBodyWriter.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/XMPMessageBodyWriter.java?rev=1696750&r1=1696749&r2=1696750&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/XMPMessageBodyWriter.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/writer/XMPMessageBodyWriter.java
Thu Aug 20 10:06:32 2015
@@ -32,10 +32,11 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.xmp.XMPMetadata;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
@Provider
@Produces("application/rdf+xml")
public class XMPMessageBodyWriter implements MessageBodyWriter<Metadata> {
@@ -55,7 +56,7 @@ public class XMPMessageBodyWriter implem
MediaType mediaType, MultivaluedMap<String, Object>
httpHeaders, OutputStream entityStream) throws IOException,
WebApplicationException {
try {
- Writer writer = new OutputStreamWriter(entityStream,
IOUtils.UTF_8);
+ Writer writer = new OutputStreamWriter(entityStream, UTF_8);
XMPMetadata xmp = new XMPMetadata(metadata);
writer.write(xmp.toString());
writer.flush();
Modified:
tika/trunk/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java?rev=1696750&r1=1696749&r2=1696750&view=diff
==============================================================================
---
tika/trunk/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java
(original)
+++
tika/trunk/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java
Thu Aug 20 10:06:32 2015
@@ -17,6 +17,7 @@
package org.apache.tika.server;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -35,12 +36,12 @@ import org.apache.commons.compress.archi
import org.apache.commons.compress.archivers.ArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipFile;
+import org.apache.commons.io.IOUtils;
import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.JAXRSBindingFactory;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.tika.config.TikaConfig;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.parser.utils.CommonsDigester;
import org.apache.tika.server.resource.TikaResource;
import org.apache.tika.server.resource.UnpackerResource;
@@ -119,7 +120,7 @@ public abstract class CXFTestBase {
}
protected String getStringFromInputStream(InputStream in) throws Exception
{
- return IOUtils.toString(in);
+ return IOUtils.toString(in, UTF_8);
}
protected Map<String, String> readZipArchive(InputStream inputStream)
throws IOException {
@@ -148,7 +149,7 @@ public abstract class CXFTestBase {
zip.close();
tempFile.delete();
- return bos.toString(IOUtils.UTF_8.name());
+ return bos.toString(UTF_8.name());
}
protected Map<String, String> readArchiveFromStream(ArchiveInputStream
zip) throws IOException {
Modified:
tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java?rev=1696750&r1=1696749&r2=1696750&view=diff
==============================================================================
---
tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java
(original)
+++
tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java
Thu Aug 20 10:06:32 2015
@@ -17,6 +17,7 @@
package org.apache.tika.server;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -75,7 +76,7 @@ public class MetadataResourceTest extend
.put(ClassLoader
.getSystemResourceAsStream(TikaResourceTest.TEST_DOC));
- Reader reader = new InputStreamReader((InputStream)
response.getEntity(), org.apache.tika.io.IOUtils.UTF_8);
+ Reader reader = new InputStreamReader((InputStream)
response.getEntity(), UTF_8);
CSVReader csvReader = new CSVReader(reader);
@@ -127,7 +128,7 @@ public class MetadataResourceTest extend
assertEquals(200, response.getStatus());
// Check results
- Reader reader = new InputStreamReader((InputStream)
response.getEntity(), org.apache.tika.io.IOUtils.UTF_8);
+ Reader reader = new InputStreamReader((InputStream)
response.getEntity(), UTF_8);
CSVReader csvReader = new CSVReader(reader);
Map<String, String> metadata = new HashMap<String, String>();
@@ -151,7 +152,7 @@ public class MetadataResourceTest extend
.put(ClassLoader
.getSystemResourceAsStream(TikaResourceTest.TEST_DOC));
- Reader reader = new InputStreamReader((InputStream)
response.getEntity(), org.apache.tika.io.IOUtils.UTF_8);
+ Reader reader = new InputStreamReader((InputStream)
response.getEntity(), UTF_8);
Metadata metadata = JsonMetadata.fromJson(reader);
assertNotNull(metadata.get("Author"));
@@ -210,7 +211,7 @@ public class MetadataResourceTest extend
.accept(MediaType.APPLICATION_JSON).put(copy(stream, 12000));
Assert.assertEquals(Response.Status.OK.getStatusCode(),
response.getStatus());
Metadata metadata = JsonMetadata.fromJson(new InputStreamReader(
- (InputStream) response.getEntity(),
org.apache.tika.io.IOUtils.UTF_8));
+ (InputStream) response.getEntity(), UTF_8));
assertEquals("Maxim Valyanskiy", metadata.get("Author"));
assertEquals(1, metadata.names().length);
}
Modified:
tika/trunk/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java?rev=1696750&r1=1696749&r2=1696750&view=diff
==============================================================================
---
tika/trunk/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java
(original)
+++
tika/trunk/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java
Thu Aug 20 10:06:32 2015
@@ -17,6 +17,7 @@
package org.apache.tika.server;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -31,7 +32,6 @@ import java.util.List;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.serialization.JsonMetadataList;
import org.apache.tika.server.resource.RecursiveMetadataResource;
@@ -64,7 +64,7 @@ public class RecursiveMetadataResourceTe
.put(ClassLoader
.getSystemResourceAsStream(TEST_RECURSIVE_DOC));
- Reader reader = new InputStreamReader((InputStream)
response.getEntity(), IOUtils.UTF_8);
+ Reader reader = new InputStreamReader((InputStream)
response.getEntity(), UTF_8);
List<Metadata> metadataList = JsonMetadataList.fromJson(reader);
assertEquals(12, metadataList.size());
@@ -98,7 +98,7 @@ public class RecursiveMetadataResourceTe
assertEquals(200, response.getStatus());
// Check results
- Reader reader = new InputStreamReader((InputStream)
response.getEntity(), IOUtils.UTF_8);
+ Reader reader = new InputStreamReader((InputStream)
response.getEntity(), UTF_8);
List<Metadata> metadataList = JsonMetadataList.fromJson(reader);
assertNotNull(metadataList.get(0).get("Author"));
assertEquals("pavel", metadataList.get(0).get("Author"));
