Index: tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java (revision ) @@ -17,11 +17,11 @@ package org.apache.tika.parser.chm; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet; import org.apache.tika.parser.chm.accessor.ChmItsfHeader; import org.apache.tika.parser.chm.accessor.ChmItspHeader; @@ -65,7 +65,7 @@ ChmConstants.CONTROL_DATA); int indexOfResetTable = ChmCommons.indexOfResetTableBlock(data, - ChmConstants.LZXC.getBytes(IOUtils.UTF_8)); + ChmConstants.LZXC.getBytes(UTF_8)); byte[] dir_chunk = null; if (indexOfResetTable > 0) { // dir_chunk = Arrays.copyOfRange( data, indexOfResetTable, Index: tika-parsers/src/main/java/org/apache/tika/parser/gdal/GDALParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/gdal/GDALParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/gdal/GDALParser.java (revision ) @@ -31,7 +31,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TemporaryResources; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; @@ -43,6 +42,7 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.tika.parser.external.ExternalParser.INPUT_FILE_TOKEN; //Tika imports @@ -384,7 +384,7 @@ private String extractOutput(InputStream stream) throws SAXException, IOException { StringBuilder sb = new StringBuilder(); - Reader reader = new InputStreamReader(stream, IOUtils.UTF_8); + Reader reader = new InputStreamReader(stream, UTF_8); try { char[] buffer = new char[1024]; for (int n = reader.read(buffer); n != -1; n = reader.read(buffer)) { @@ -399,8 +399,8 @@ private void processOutput(ContentHandler handler, Metadata metadata, String output) throws SAXException, IOException { XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata); - InputStream stream = new ByteArrayInputStream(output.getBytes(IOUtils.UTF_8)); - Reader reader = new InputStreamReader(stream, IOUtils.UTF_8); + InputStream stream = new ByteArrayInputStream(output.getBytes(UTF_8)); + Reader reader = new InputStreamReader(stream, UTF_8); try { xhtml.startDocument(); xhtml.startElement("p"); Index: tika-batch/src/test/java/org/apache/tika/batch/fs/BatchDriverTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-batch/src/test/java/org/apache/tika/batch/fs/BatchDriverTest.java (revision 1696252) +++ tika-batch/src/test/java/org/apache/tika/batch/fs/BatchDriverTest.java (revision ) @@ -17,6 +17,7 @@ * limitations under the License. */ +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -29,7 +30,6 @@ import org.apache.commons.io.FileUtils; import org.apache.tika.batch.BatchProcessDriverCLI; -import org.apache.tika.io.IOUtils; import org.junit.Test; @@ -53,10 +53,7 @@ assertFalse(driver.getUserInterrupted()); assertEquals(5, outputDir.listFiles().length); assertContains("first test file", - FileUtils.readFileToString(new File(outputDir, "test2_ok.xml.xml"), - IOUtils.UTF_8.toString())); - - + FileUtils.readFileToString(new File(outputDir, "test2_ok.xml.xml"), UTF_8)); } @Test(timeout = 30000) @@ -74,8 +71,7 @@ assertTrue(driver.getNumRestarts() > 0); assertFalse(driver.getUserInterrupted()); assertContains("first test file", - FileUtils.readFileToString(new File(outputDir, "test6_ok.xml.xml"), - IOUtils.UTF_8.toString())); + FileUtils.readFileToString(new File(outputDir, "test6_ok.xml.xml"), UTF_8)); } @Test(timeout = 15000) @@ -117,8 +113,7 @@ assertEquals(1, driver.getNumRestarts()); assertFalse(driver.getUserInterrupted()); assertContains("first test file", - FileUtils.readFileToString(new File(outputDir, "test2_ok.xml.xml"), - IOUtils.UTF_8.toString())); + FileUtils.readFileToString(new File(outputDir, "test2_ok.xml.xml"), UTF_8)); } @Test(timeout = 30000) @@ -136,8 +131,7 @@ assertEquals(3, driver.getNumRestarts()); assertFalse(driver.getUserInterrupted()); assertContains("first test file", - FileUtils.readFileToString(new File(outputDir, "test6_ok.xml.xml"), - IOUtils.UTF_8.toString())); + FileUtils.readFileToString(new File(outputDir, "test6_ok.xml.xml"), UTF_8)); } @Test(timeout = 30000) Index: tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java (revision ) @@ -32,11 +32,11 @@ import java.util.List; import java.util.Set; +import org.apache.commons.io.FilenameUtils; import org.apache.tika.Tika; import org.apache.tika.TikaTest; import org.apache.tika.extractor.ContainerExtractor; import org.apache.tika.extractor.ParserContainerExtractor; -import org.apache.tika.io.FilenameUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.Office; Index: tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmItsfHeader.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmItsfHeader.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmItsfHeader.java (revision ) @@ -19,11 +19,12 @@ import java.math.BigInteger; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.chm.assertion.ChmAssert; import org.apache.tika.parser.chm.core.ChmConstants; import org.apache.tika.parser.chm.exception.ChmParsingException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * The Header 0000: char[4] 'ITSF' 0004: DWORD 3 (Version number) 0008: DWORD * Total header length, including header section table and following data. 000C: @@ -62,7 +63,7 @@ private int currentPlace = 0; public ChmItsfHeader() { - signature = ChmConstants.ITSF.getBytes(IOUtils.UTF_8); /* 0 (ITSF) */ + signature = ChmConstants.ITSF.getBytes(UTF_8); /* 0 (ITSF) */ } /** @@ -70,7 +71,7 @@ */ public String toString() { StringBuilder sb = new StringBuilder(); - sb.append(new String(getSignature(), IOUtils.UTF_8) + " "); + sb.append(new String(getSignature(), UTF_8) + " "); sb.append(getVersion() + " "); sb.append(getHeaderLen() + " "); sb.append(getUnknown_000c() + " "); @@ -463,7 +464,7 @@ chmItsfHeader.setUnknownLen(chmItsfHeader.unmarshalUint64(data, chmItsfHeader.getUnknownLen())); chmItsfHeader.setDirOffset(chmItsfHeader.unmarshalUint64(data, chmItsfHeader.getDirOffset())); chmItsfHeader.setDirLen(chmItsfHeader.unmarshalUint64(data, chmItsfHeader.getDirLen())); - if (!new String(chmItsfHeader.getSignature(), IOUtils.UTF_8).equals(ChmConstants.ITSF)) + if (!new String(chmItsfHeader.getSignature(), UTF_8).equals(ChmConstants.ITSF)) throw new TikaException("seems not valid file"); if (chmItsfHeader.getVersion() == ChmConstants.CHM_VER_2) { if (chmItsfHeader.getHeaderLen() < ChmConstants.CHM_ITSF_V2_LEN) Index: tika-example/src/main/java/org/apache/tika/example/SpringExample.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-example/src/main/java/org/apache/tika/example/SpringExample.java (revision 1696252) +++ tika-example/src/main/java/org/apache/tika/example/SpringExample.java (revision ) @@ -15,6 +15,7 @@ package org.apache.tika.example; import java.io.ByteArrayInputStream; + import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.ParseContext; import org.apache.tika.parser.Parser; @@ -22,7 +23,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import com.google.common.base.Charsets; +import static java.nio.charset.StandardCharsets.UTF_8; public class SpringExample { @@ -30,7 +31,7 @@ ApplicationContext context = new ClassPathXmlApplicationContext( new String[] { "org/apache/tika/example/spring.xml" }); Parser parser = context.getBean("tika", Parser.class); - parser.parse(new ByteArrayInputStream("Hello, World!".getBytes(Charsets.UTF_8)), + parser.parse(new ByteArrayInputStream("Hello, World!".getBytes(UTF_8)), new WriteOutContentHandler(System.out), new Metadata(), new ParseContext()); } Index: tika-server/src/main/java/org/apache/tika/server/writer/XMPMessageBodyWriter.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-server/src/main/java/org/apache/tika/server/writer/XMPMessageBodyWriter.java (revision 1696252) +++ tika-server/src/main/java/org/apache/tika/server/writer/XMPMessageBodyWriter.java (revision ) @@ -32,10 +32,11 @@ 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 { @@ -55,7 +56,7 @@ MediaType mediaType, MultivaluedMap 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(); Index: tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java (revision ) @@ -18,7 +18,8 @@ import java.io.IOException; import java.io.InputStream; -import org.apache.tika.io.IOUtils; + +import org.apache.commons.io.IOUtils; import org.apache.tika.parser.chm.core.ChmCommons.EntryType; /** Index: tika-parsers/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java (revision ) @@ -21,11 +21,11 @@ import java.util.Collections; import java.util.Set; +import org.apache.commons.io.input.TaggedInputStream; import org.apache.james.mime4j.MimeException; import org.apache.james.mime4j.parser.MimeStreamParser; import org.apache.james.mime4j.stream.MimeConfig; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.TaggedInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; @@ -73,7 +73,9 @@ xhtml, metadata, context, config.isStrictParsing()); parser.setContentHandler(mch); parser.setContentDecoding(true); - TaggedInputStream tagged = TaggedInputStream.get(stream); + TaggedInputStream tagged = stream instanceof TaggedInputStream + ? (TaggedInputStream)stream + : new TaggedInputStream(stream); try { parser.parse(tagged); } catch (IOException e) { Index: tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java (revision ) @@ -16,6 +16,9 @@ */ package org.apache.tika.parser.html; +import static java.nio.charset.StandardCharsets.ISO_8859_1; +import static java.nio.charset.StandardCharsets.US_ASCII; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.tika.TikaTest.assertContains; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -37,7 +40,6 @@ import org.apache.tika.Tika; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Geographic; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; @@ -164,7 +166,7 @@ public void testCharactersDirectlyUnderBodyElement() throws Exception { String test = "test"; String content = new Tika().parseToString( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8))); + new ByteArrayInputStream(test.getBytes(UTF_8))); assertEquals("test", content); } @@ -222,7 +224,7 @@ + "test"; final List links = new ArrayList(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), new DefaultHandler() { @Override public void startElement( @@ -248,7 +250,7 @@ String test = "
ab
"; String content = new Tika().parseToString( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8))); + new ByteArrayInputStream(test.getBytes(UTF_8))); assertContains("a", content); assertContains("b", content); assertFalse(content.contains("ab")); @@ -268,7 +270,7 @@ + ""; Metadata metadata = new Metadata(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("ISO-8859-1")), + new ByteArrayInputStream(test.getBytes(ISO_8859_1)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("ISO-8859-1", metadata.get(Metadata.CONTENT_ENCODING)); } @@ -286,7 +288,7 @@ + ""; Metadata metadata = new Metadata(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("ISO-8859-1")), + new ByteArrayInputStream(test.getBytes(ISO_8859_1)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("ISO-8859-15", metadata.get(Metadata.CONTENT_ENCODING)); } @@ -302,7 +304,7 @@ "\u017d"; Metadata metadata = new Metadata(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("\u017d", metadata.get(TikaCoreProperties.TITLE)); } @@ -320,14 +322,14 @@ Metadata metadata = new Metadata(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("UTF-8", metadata.get(Metadata.CONTENT_ENCODING)); metadata = new Metadata(); metadata.set(Metadata.CONTENT_TYPE, "text/html; charset=ISO-8859-1"); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("ISO-8859-1")), + new ByteArrayInputStream(test.getBytes(ISO_8859_1)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("ISO-8859-1", metadata.get(Metadata.CONTENT_ENCODING)); } @@ -344,7 +346,7 @@ public void testLineBreak() throws Exception { String test = "
foo
bar
baz"; String text = new Tika().parseToString( - new ByteArrayInputStream(test.getBytes("US-ASCII"))); + new ByteArrayInputStream(test.getBytes(US_ASCII))); String[] parts = text.trim().split("\\s+"); assertEquals(3, parts.length); assertEquals("foo", parts[0]); @@ -363,7 +365,7 @@ Metadata metadata = new Metadata(); metadata.add(Metadata.CONTENT_LANGUAGE, "en"); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("en", metadata.get(Metadata.CONTENT_LANGUAGE)); @@ -383,7 +385,7 @@ + ""; Metadata metadata = new Metadata(); new HtmlParser().parse( - new ByteArrayInputStream(test1.getBytes("ISO-8859-1")), + new ByteArrayInputStream(test1.getBytes(ISO_8859_1)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("ISO-8859-15", metadata.get(Metadata.CONTENT_ENCODING)); @@ -395,7 +397,7 @@ + ""; metadata = new Metadata(); new HtmlParser().parse( - new ByteArrayInputStream(test2.getBytes("ISO-8859-1")), + new ByteArrayInputStream(test2.getBytes(ISO_8859_1)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("ISO-8859-15", metadata.get(Metadata.CONTENT_ENCODING)); } @@ -413,14 +415,14 @@ Metadata metadata = new Metadata(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("UTF-8", metadata.get(Metadata.CONTENT_ENCODING)); metadata = new Metadata(); metadata.set(Metadata.CONTENT_TYPE, "charset=ISO-8859-1;text/html"); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("ISO-8859-1")), + new ByteArrayInputStream(test.getBytes(ISO_8859_1)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("ISO-8859-1", metadata.get(Metadata.CONTENT_ENCODING)); } @@ -478,7 +480,7 @@ StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), makeHtmlTransformer(sw), new Metadata(), new ParseContext()); String result = sw.toString(); @@ -516,7 +518,7 @@ StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), makeHtmlTransformer(sw), new Metadata(), new ParseContext()); String result = sw.toString(); @@ -538,7 +540,7 @@ StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), makeHtmlTransformer(sw), new Metadata(), new ParseContext()); String result = sw.toString(); @@ -561,7 +563,7 @@ StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), makeHtmlTransformer(sw), new Metadata(), new ParseContext()); String result = sw.toString(); @@ -585,7 +587,7 @@ StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), makeHtmlTransformer(sw), new Metadata(), new ParseContext()); String result = sw.toString(); @@ -609,7 +611,7 @@ StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), makeHtmlTransformer(sw), new Metadata(), new ParseContext()); String result = sw.toString(); @@ -636,7 +638,7 @@ StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), makeHtmlTransformer(sw), metadata, new ParseContext()); String result = sw.toString(); @@ -659,7 +661,7 @@ StringWriter sw1 = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test1.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test1.getBytes(UTF_8)), makeHtmlTransformer(sw1), new Metadata(), new ParseContext()); String result = sw1.toString(); @@ -680,7 +682,7 @@ StringWriter sw2 = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test2.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test2.getBytes(UTF_8)), makeHtmlTransformer(sw2), new Metadata(), new ParseContext()); result = sw2.toString(); @@ -734,7 +736,7 @@ StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), makeHtmlTransformer(sw), new Metadata(), new ParseContext()); String result = sw.toString(); @@ -817,7 +819,7 @@ StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(html.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(html.getBytes(UTF_8)), makeHtmlTransformer(sw), metadata, parseContext); String result = sw.toString(); @@ -838,7 +840,7 @@ BodyContentHandler handler = new BodyContentHandler(); new HtmlParser().parse( - new ByteArrayInputStream(html.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(html.getBytes(UTF_8)), handler, new Metadata(), new ParseContext()); // Make sure we get , "one", newline, newline @@ -894,7 +896,7 @@ + ""; Metadata metadata = new Metadata(); new HtmlParser().parse( - new ByteArrayInputStream(test1.getBytes("ISO-8859-1")), + new ByteArrayInputStream(test1.getBytes(ISO_8859_1)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("some description", metadata.get("og:description")); assertTrue(metadata.isMultiValued("og:image")); @@ -932,7 +934,7 @@ LinkContentHandler linkContentHandler = new LinkContentHandler(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("ISO-8859-1")), + new ByteArrayInputStream(test.getBytes(ISO_8859_1)), linkContentHandler, metadata, new ParseContext()); // Expect no anchor text @@ -946,7 +948,7 @@ parseContext.set(Schema.class, schema); linkContentHandler = new LinkContentHandler(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("ISO-8859-1")), + new ByteArrayInputStream(test.getBytes(ISO_8859_1)), linkContentHandler, metadata, parseContext); // Expect anchor text @@ -1037,7 +1039,7 @@ Metadata metadata = new Metadata(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); //Expecting first title to be set in meta data and second one to be ignored. @@ -1053,7 +1055,7 @@ Metadata metadata = new Metadata(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("text/html; charset=UTF-ELEVEN", metadata.get(TikaCoreProperties.CONTENT_TYPE_HINT)); assertEquals("text/html; charset=ISO-8859-1", metadata.get(Metadata.CONTENT_TYPE)); @@ -1063,7 +1065,7 @@ metadata = new Metadata(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("application/pdf", metadata.get(TikaCoreProperties.CONTENT_TYPE_HINT)); assertEquals("text/html; charset=ISO-8859-1", metadata.get(Metadata.CONTENT_TYPE)); @@ -1074,7 +1076,7 @@ metadata = new Metadata(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("application/ms-word", metadata.get(TikaCoreProperties.CONTENT_TYPE_HINT)); assertEquals("text/html; charset=ISO-8859-1", metadata.get(Metadata.CONTENT_TYPE)); @@ -1091,7 +1093,7 @@ "titlebody"; Metadata metadata = new Metadata(); new AutoDetectParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("text/html; charset=iso-8859-1", metadata.get(TikaCoreProperties.CONTENT_TYPE_HINT)); @@ -1105,7 +1107,7 @@ "titlebody"; metadata = new Metadata(); new AutoDetectParser().parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("text/html; charset=iso-NUMBER_SEVEN", metadata.get(TikaCoreProperties.CONTENT_TYPE_HINT)); Index: tika-batch/pom.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-batch/pom.xml (revision 1696252) +++ tika-batch/pom.xml (revision ) @@ -67,6 +67,11 @@ ${cli.version} + commons-io + commons-io + ${commons.io.version} + + org.apache.tika tika-core ${project.version} @@ -84,12 +89,6 @@ junit junit test - - - commons-io - commons-io - test - ${commons.io.version} Index: tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java (revision ) @@ -40,9 +40,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.LogFactory; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TemporaryResources; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; @@ -60,6 +60,8 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * TesseractOCRParser powered by tesseract-ocr engine. To enable this parser, * create a {@link TesseractOCRConfig} object and pass it through a @@ -288,7 +290,7 @@ */ private void extractOutput(InputStream stream, XHTMLContentHandler xhtml) throws SAXException, IOException { - Reader reader = new InputStreamReader(stream, IOUtils.UTF_8); + Reader reader = new InputStreamReader(stream, UTF_8); xhtml.startDocument(); xhtml.startElement("div"); try { @@ -312,7 +314,7 @@ private void logStream(final String logType, final InputStream stream, final File file) { new Thread() { public void run() { - Reader reader = new InputStreamReader(stream, IOUtils.UTF_8); + Reader reader = new InputStreamReader(stream, UTF_8); StringBuilder out = new StringBuilder(); char[] buffer = new char[1024]; try { Index: tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java (revision ) @@ -17,6 +17,7 @@ * limitations under the License. */ +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import java.io.ByteArrayInputStream; @@ -26,10 +27,10 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.io.IOUtils; import org.apache.tika.TikaTest; import org.apache.tika.extractor.EmbeddedResourceHandler; import org.apache.tika.extractor.ParserContainerExtractor; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Database; import org.apache.tika.metadata.Metadata; @@ -47,7 +48,6 @@ public class SQLite3ParserTest extends TikaTest { private final static String TEST_FILE_NAME = "testSqlite3b.db"; private final static String TEST_FILE1 = "/test-documents/" + TEST_FILE_NAME; - ; @Test public void testBasic() throws Exception { @@ -189,7 +189,7 @@ String[] strings = new String[4]; for (int i = 1; i < byteCopier.bytes.size(); i++) { byte[] byteArr = byteCopier.bytes.get(i); - String s = new String(byteArr, 0, Math.min(byteArr.length, 1000), "UTF-8"); + String s = new String(byteArr, 0, Math.min(byteArr.length, 1000), UTF_8); strings[i] = s; } byte[] oleBytes = new byte[]{ Index: tika-core/src/test/java/org/apache/tika/parser/mock/MockParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/test/java/org/apache/tika/parser/mock/MockParser.java (revision 1696252) +++ tika-core/src/test/java/org/apache/tika/parser/mock/MockParser.java (revision ) @@ -34,7 +34,6 @@ import org.apache.tika.exception.TikaException; import org.apache.tika.extractor.EmbeddedDocumentExtractor; import org.apache.tika.extractor.ParsingEmbeddedDocumentExtractor; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaMetadataKeys; import org.apache.tika.mime.MediaType; @@ -50,6 +49,8 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * This class enables mocking of parser behavior for use in testing * wrappers and drivers of parsers. @@ -150,7 +151,7 @@ if (! "".equals(contentType)) { m.set(Metadata.CONTENT_TYPE, contentType); } - InputStream is = new ByteArrayInputStream(embeddedText.getBytes(IOUtils.UTF_8)); + InputStream is = new ByteArrayInputStream(embeddedText.getBytes(UTF_8)); extractor.parseEmbedded( is, Index: tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java (revision ) @@ -24,10 +24,10 @@ import java.util.HashSet; import java.util.Set; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.config.ServiceLoader; import org.apache.tika.detect.AutoDetectReader; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; Index: tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java (revision 1696252) +++ tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java (revision ) @@ -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.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 @@ } protected String getStringFromInputStream(InputStream in) throws Exception { - return IOUtils.toString(in); + return IOUtils.toString(in, UTF_8); } protected Map readZipArchive(InputStream inputStream) throws IOException { @@ -148,7 +149,7 @@ zip.close(); tempFile.delete(); - return bos.toString(IOUtils.UTF_8.name()); + return bos.toString(UTF_8.name()); } protected Map readArchiveFromStream(ArchiveInputStream zip) throws IOException { Index: tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java (revision ) @@ -16,9 +16,9 @@ */ package org.apache.tika.parser.chm; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertTrue; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet; import org.apache.tika.parser.chm.accessor.ChmItsfHeader; import org.apache.tika.parser.chm.accessor.ChmItspHeader; @@ -68,7 +68,7 @@ int indexOfControlData = chmDirListCont.getControlDataIndex(); int indexOfResetTable = ChmCommons.indexOfResetTableBlock(data, - ChmConstants.LZXC.getBytes(IOUtils.UTF_8)); + ChmConstants.LZXC.getBytes(UTF_8)); byte[] dir_chunk = null; if (indexOfResetTable > 0) { // dir_chunk = Arrays.copyOfRange( data, indexOfResetTable, Index: tika-core/src/main/java/org/apache/tika/language/LanguageProfilerBuilder.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/main/java/org/apache/tika/language/LanguageProfilerBuilder.java (revision 1696252) +++ tika-core/src/main/java/org/apache/tika/language/LanguageProfilerBuilder.java (revision ) @@ -35,7 +35,9 @@ import java.util.Map; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; + +import static java.nio.charset.StandardCharsets.UTF_8; + /** * This class runs a ngram analysis over submitted text, results might be used * for automatic language identification. @@ -342,7 +344,7 @@ ngrams.clear(); ngramcounts = new int[maxLength + 1]; - BufferedReader reader = new BufferedReader(new InputStreamReader(is, IOUtils.UTF_8)); + BufferedReader reader = new BufferedReader(new InputStreamReader(is, UTF_8)); String line = null; while ((line = reader.readLine()) != null) { @@ -406,7 +408,7 @@ */ public void save(OutputStream os) throws IOException { os.write(("# NgramProfile generated at " + new Date() + - " for Apache Tika Language Identification\n").getBytes(IOUtils.UTF_8)); + " for Apache Tika Language Identification\n").getBytes(UTF_8)); // And then each ngram @@ -433,7 +435,7 @@ for (int i = 0; i < list.size(); i++) { NGramEntry e = list.get(i); String line = e.toString() + " " + e.getCount() + "\n"; - os.write(line.getBytes(IOUtils.UTF_8)); + os.write(line.getBytes(UTF_8)); } os.flush(); } Index: tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java (revision ) @@ -25,6 +25,7 @@ import java.util.Locale; import java.util.Set; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.jempbox.xmp.XMPSchema; import org.apache.jempbox.xmp.XMPSchemaDublinCore; import org.apache.jempbox.xmp.pdfa.XMPSchemaPDFAId; @@ -44,7 +45,6 @@ import org.apache.tika.exception.EncryptedDocumentException; import org.apache.tika.exception.TikaException; import org.apache.tika.extractor.EmbeddedDocumentExtractor; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.io.TemporaryResources; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.AccessPermissions; Index: tika-bundle/src/test/java/org/apache/tika/bundle/BundleIT.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-bundle/src/test/java/org/apache/tika/bundle/BundleIT.java (revision 1696252) +++ tika-bundle/src/test/java/org/apache/tika/bundle/BundleIT.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.bundle; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; @@ -141,7 +142,7 @@ public void testForkParser() throws Exception { ForkParser parser = new ForkParser(Activator.class.getClassLoader(), defaultParser); String data = "\n

test content

"; - InputStream stream = new ByteArrayInputStream(data.getBytes("UTF-8")); + InputStream stream = new ByteArrayInputStream(data.getBytes(UTF_8)); Writer writer = new StringWriter(); ContentHandler contentHandler = new BodyContentHandler(writer); Metadata metadata = new Metadata(); Index: tika-parsers/src/main/java/org/apache/tika/parser/audio/MidiParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/audio/MidiParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/audio/MidiParser.java (revision ) @@ -41,6 +41,8 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.ISO_8859_1; + public class MidiParser extends AbstractParser { /** Serial version UID */ @@ -101,7 +103,7 @@ if (meta.getType() >= 1 && meta.getType() <= 15) { // FIXME: What's the encoding? xhtml.characters( - new String(meta.getData(), "ISO-8859-1")); + new String(meta.getData(), ISO_8859_1)); } } } Index: tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchCommandLineTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchCommandLineTest.java (revision 1696252) +++ tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchCommandLineTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.cli; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -27,7 +28,7 @@ import java.util.Map; import org.apache.commons.io.FileUtils; -import org.apache.tika.io.IOUtils; +import org.apache.commons.io.IOUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -47,7 +48,7 @@ OutputStream os = null; try { os = new FileOutputStream(testFile); - IOUtils.write("test output", os, "UTF-8"); + IOUtils.write("test output", os, UTF_8); } catch (IOException e) { throw new RuntimeException("Couldn't open testFile"); } finally { Index: tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubParser.java (revision ) @@ -25,8 +25,8 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import org.apache.commons.io.IOUtils; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; @@ -40,6 +40,8 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Epub parser */ @@ -93,7 +95,7 @@ ZipEntry entry = zip.getNextEntry(); while (entry != null) { if (entry.getName().equals("mimetype")) { - String type = IOUtils.toString(zip, IOUtils.UTF_8.name()); + String type = IOUtils.toString(zip, UTF_8); metadata.set(Metadata.CONTENT_TYPE, type); } else if (entry.getName().equals("metadata.xml")) { meta.parse(zip, new DefaultHandler(), metadata, context); Index: tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java (revision ) @@ -26,8 +26,8 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; Index: tika-core/src/main/java/org/apache/tika/fork/ForkClient.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/main/java/org/apache/tika/fork/ForkClient.java (revision 1696252) +++ tika-core/src/main/java/org/apache/tika/fork/ForkClient.java (revision ) @@ -34,6 +34,8 @@ import org.apache.tika.io.IOUtils; import org.xml.sax.ContentHandler; +import static java.nio.charset.StandardCharsets.UTF_8; + class ForkClient { private final List resources = new ArrayList(); @@ -262,7 +264,7 @@ String manifest = "Main-Class: " + ForkServer.class.getName() + "\n"; jar.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF")); - jar.write(manifest.getBytes(IOUtils.UTF_8)); + jar.write(manifest.getBytes(UTF_8)); Class[] bootstrap = { ForkServer.class, ForkObjectInputStream.class, Index: tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java (revision 1696252) +++ tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java (revision ) @@ -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 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 @@ .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 metadataList = JsonMetadataList.fromJson(reader); assertEquals(12, metadataList.size()); @@ -98,7 +98,7 @@ 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 metadataList = JsonMetadataList.fromJson(reader); assertNotNull(metadataList.get(0).get("Author")); assertEquals("pavel", metadataList.get(0).get("Author")); Index: tika-batch/src/test/java/org/apache/tika/batch/CommandLineParserBuilderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-batch/src/test/java/org/apache/tika/batch/CommandLineParserBuilderTest.java (revision 1696252) +++ tika-batch/src/test/java/org/apache/tika/batch/CommandLineParserBuilderTest.java (revision ) @@ -22,9 +22,9 @@ import java.io.InputStream; import org.apache.commons.cli.Options; +import org.apache.commons.io.IOUtils; import org.apache.tika.batch.builders.CommandLineParserBuilder; import org.apache.tika.batch.fs.FSBatchTestBase; -import org.apache.tika.io.IOUtils; import org.junit.Test; Index: tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java (revision ) @@ -31,8 +31,8 @@ import java.util.Set; import java.util.Stack; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; Index: tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmConstants.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmConstants.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmConstants.java (revision ) @@ -16,14 +16,14 @@ */ package org.apache.tika.parser.chm.core; -import org.apache.tika.io.IOUtils; +import static java.nio.charset.StandardCharsets.UTF_8; public class ChmConstants { /* Prevents instantiation */ private ChmConstants() { } - public static final String DEFAULT_CHARSET = IOUtils.UTF_8.name(); + public static final String DEFAULT_CHARSET = UTF_8.name(); public static final String ITSF = "ITSF"; public static final String ITSP = "ITSP"; public static final String PMGL = "PMGL"; Index: tika-server/src/main/java/org/apache/tika/server/writer/CSVMessageBodyWriter.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-server/src/main/java/org/apache/tika/server/writer/CSVMessageBodyWriter.java (revision 1696252) +++ tika-server/src/main/java/org/apache/tika/server/writer/CSVMessageBodyWriter.java (revision ) @@ -33,9 +33,10 @@ 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 { @@ -54,7 +55,7 @@ MediaType mediaType, MultivaluedMap 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); Index: tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java (revision ) @@ -17,6 +17,7 @@ * limitations under the License. */ +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -27,9 +28,9 @@ import java.io.PrintStream; import java.util.Date; +import org.apache.commons.io.IOUtils; import org.apache.tika.TikaTest; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.parser.Parser; @@ -57,8 +58,8 @@ PrintStream err = System.err; ByteArrayOutputStream outBos = new ByteArrayOutputStream(); ByteArrayOutputStream errBos = new ByteArrayOutputStream(); - PrintStream tmpOut = new PrintStream(outBos, true, IOUtils.UTF_8.toString()); - PrintStream tmpErr = new PrintStream(errBos, true, IOUtils.UTF_8.toString()); + PrintStream tmpOut = new PrintStream(outBos, true, UTF_8.toString()); + PrintStream tmpErr = new PrintStream(errBos, true, UTF_8.toString()); System.setOut(tmpOut); System.setErr(tmpErr); try { @@ -68,10 +69,10 @@ System.setOut(out); System.setErr(err); } - String outString = new String(outBos.toByteArray(), IOUtils.UTF_8); + String outString = new String(outBos.toByteArray(), UTF_8); assertContains("writing to System.out", outString); - String errString = new String(errBos.toByteArray(), IOUtils.UTF_8); + String errString = new String(errBos.toByteArray(), UTF_8); assertContains("writing to System.err", errString); } Index: tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java (revision ) @@ -20,8 +20,8 @@ import java.io.InputStream; import java.util.Set; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; Index: tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.parser.pkg; +import static java.nio.charset.StandardCharsets.US_ASCII; import static org.junit.Assert.assertEquals; import java.io.InputStream; @@ -98,6 +99,6 @@ assertEquals(null, tracker.modifiedAts.get(0)); // Tar file starts with the directory name - assertEquals("test-documents/", new String(tracker.lastSeenStart, 0, 15, "ASCII")); + assertEquals("test-documents/", new String(tracker.lastSeenStart, 0, 15, US_ASCII)); } } Index: tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFEmbObjHandler.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFEmbObjHandler.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFEmbObjHandler.java (revision ) @@ -21,12 +21,12 @@ import java.io.InputStream; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.commons.io.FilenameUtils; import org.apache.tika.config.TikaConfig; import org.apache.tika.detect.Detector; import org.apache.tika.exception.TikaException; import org.apache.tika.extractor.EmbeddedDocumentExtractor; import org.apache.tika.extractor.ParsingEmbeddedDocumentExtractor; -import org.apache.tika.io.FilenameUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.RTFMetadata; Index: tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java (revision ) @@ -21,8 +21,8 @@ import java.util.Collections; import java.util.Set; +import org.apache.commons.io.input.TaggedInputStream; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.TaggedInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; Index: tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java (revision ) @@ -28,8 +28,8 @@ import java.util.List; import java.util.Set; +import org.apache.commons.io.IOUtils; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaMetadataKeys; Index: tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmLzxcControlData.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmLzxcControlData.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmLzxcControlData.java (revision ) @@ -16,14 +16,13 @@ */ package org.apache.tika.parser.chm.accessor; -import java.io.UnsupportedEncodingException; - import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.chm.assertion.ChmAssert; import org.apache.tika.parser.chm.core.ChmConstants; import org.apache.tika.parser.chm.exception.ChmParsingException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * * ::DataSpace/Storage//ControlData This file contains $20 bytes of @@ -55,11 +54,11 @@ private int currentPlace = 0; public ChmLzxcControlData() { - signature = ChmConstants.LZXC.getBytes(IOUtils.UTF_8); /* + signature = ChmConstants.LZXC.getBytes(UTF_8); /* - * 4 - * (LZXC - * ) - */ + * 4 + * (LZXC + * ) + */ } /** @@ -255,7 +254,7 @@ StringBuilder sb = new StringBuilder(); sb.append("size(unknown):=" + this.getSize() + ", "); sb.append("signature(Compression type identifier):=" - + new String(this.getSignature(), IOUtils.UTF_8) + ", "); + + new String(this.getSignature(), UTF_8) + ", "); sb.append("version(Possibly numeric code for LZX):=" + this.getVersion() + System.getProperty("line.separator")); sb.append("resetInterval(The Huffman reset interval):=" @@ -306,7 +305,7 @@ "window size / resetInterval should be more than 1"); /* checks a signature */ - if (!new String(chmLzxcControlData.getSignature(), IOUtils.UTF_8) + if (!new String(chmLzxcControlData.getSignature(), UTF_8) .equals(ChmConstants.LZXC)) throw new ChmParsingException( "the signature does not seem to be correct"); Index: tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3v2Frame.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3v2Frame.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3v2Frame.java (revision ) @@ -24,6 +24,8 @@ import org.apache.tika.parser.mp3.ID3Tags.ID3Comment; +import static java.nio.charset.StandardCharsets.ISO_8859_1; + /** * A frame of ID3v2 data, which is then passed to a handler to * be turned into useful data. @@ -331,12 +333,7 @@ * offset and length. Strings are ISO-8859-1 */ protected static String getString(byte[] data, int offset, int length) { - try { - return new String(data, offset, length, "ISO-8859-1"); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException( - "Core encoding ISO-8859-1 encoding is not available", e); - } + return new String(data, offset, length, ISO_8859_1); } Index: tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java (revision 1696252) +++ tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.cli; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -26,7 +27,6 @@ import org.apache.commons.io.FileUtils; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -50,7 +50,7 @@ outContent = new ByteArrayOutputStream(); resourcePrefix = testDataURI.toString(); stdout = System.out; - System.setOut(new PrintStream(outContent, true, IOUtils.UTF_8.name())); + System.setOut(new PrintStream(outContent, true, UTF_8.name())); } /** @@ -74,7 +74,7 @@ public void testListParserDetail() throws Exception{ String[] params = {"--list-parser-detail"}; TikaCLI.main(params); - assertTrue(outContent.toString(IOUtils.UTF_8.name()).contains("application/vnd.oasis.opendocument.text-web")); + assertTrue(outContent.toString(UTF_8.name()).contains("application/vnd.oasis.opendocument.text-web")); } /** @@ -99,11 +99,11 @@ public void testXMLOutput() throws Exception{ String[] params = {"-x", resourcePrefix + "alice.cli.test"}; TikaCLI.main(params); - assertTrue(outContent.toString(IOUtils.UTF_8.name()).contains("?xml version=\"1.0\" encoding=\"UTF-8\"?")); + assertTrue(outContent.toString(UTF_8.name()).contains("?xml version=\"1.0\" encoding=\"UTF-8\"?")); params = new String[]{"-x", "--digest=SHA256", resourcePrefix + "alice.cli.test"}; TikaCLI.main(params); - assertTrue(outContent.toString(IOUtils.UTF_8.name()) + assertTrue(outContent.toString(UTF_8.name()) .contains(" element should be present", - outContent.toString(IOUtils.UTF_8.name()).contains("")); + outContent.toString(UTF_8.name()).contains("")); params = new String[]{"-h", "--digest=SHA384", resourcePrefix + "alice.cli.test"}; TikaCLI.main(params); @@ -136,7 +136,7 @@ public void testTextOutput() throws Exception{ String[] params = {"-t", resourcePrefix + "alice.cli.test"}; TikaCLI.main(params); - assertTrue(outContent.toString(IOUtils.UTF_8.name()).contains("finished off the cake")); + assertTrue(outContent.toString(UTF_8.name()).contains("finished off the cake")); } /** @@ -147,12 +147,12 @@ public void testMetadataOutput() throws Exception{ String[] params = {"-m", resourcePrefix + "alice.cli.test"}; TikaCLI.main(params); - assertTrue(outContent.toString(IOUtils.UTF_8.name()).contains("text/plain")); + assertTrue(outContent.toString(UTF_8.name()).contains("text/plain")); params = new String[]{"-m", "--digest=SHA512", resourcePrefix + "alice.cli.test"}; TikaCLI.main(params); - assertTrue(outContent.toString(IOUtils.UTF_8.name()).contains("text/plain")); - assertTrue(outContent.toString(IOUtils.UTF_8.name()) + assertTrue(outContent.toString(UTF_8.name()).contains("text/plain")); + assertTrue(outContent.toString(UTF_8.name()) .contains("X-TIKA:digest:SHA512: dd459d99bc19ff78fd31fbae46e0")); } @@ -165,7 +165,7 @@ public void testJsonMetadataOutput() throws Exception { String[] params = {"--json", "--digest=MD2", resourcePrefix + "testJsonMultipleInts.html"}; TikaCLI.main(params); - String json = outContent.toString(IOUtils.UTF_8.name()); + String json = outContent.toString(UTF_8.name()); //TIKA-1310 assertTrue(json.contains("\"fb:admins\":\"1,2,3,4\",")); @@ -187,7 +187,7 @@ public void testJsonMetadataPrettyPrintOutput() throws Exception { String[] params = {"--json", "-r", resourcePrefix + "testJsonMultipleInts.html"}; TikaCLI.main(params); - String json = outContent.toString(IOUtils.UTF_8.name()); + String json = outContent.toString(UTF_8.name()); assertTrue(json.contains(" \"X-Parsed-By\": [\n" + " \"org.apache.tika.parser.DefaultParser\",\n" + @@ -210,7 +210,7 @@ public void testLanguageOutput() throws Exception{ String[] params = {"-l", resourcePrefix + "alice.cli.test"}; TikaCLI.main(params); - assertTrue(outContent.toString(IOUtils.UTF_8.name()).contains("en")); + assertTrue(outContent.toString(UTF_8.name()).contains("en")); } /** @@ -222,7 +222,7 @@ public void testDetectOutput() throws Exception{ String[] params = {"-d", resourcePrefix + "alice.cli.test"}; TikaCLI.main(params); - assertTrue(outContent.toString(IOUtils.UTF_8.name()).contains("text/plain")); + assertTrue(outContent.toString(UTF_8.name()).contains("text/plain")); } /** @@ -234,7 +234,7 @@ public void testListMetModels() throws Exception{ String[] params = {"--list-met-models", resourcePrefix + "alice.cli.test"}; TikaCLI.main(params); - assertTrue(outContent.toString(IOUtils.UTF_8.name()).contains("text/plain")); + assertTrue(outContent.toString(UTF_8.name()).contains("text/plain")); } /** @@ -246,7 +246,7 @@ public void testListSupportedTypes() throws Exception{ String[] params = {"--list-supported-types", resourcePrefix + "alice.cli.test"}; TikaCLI.main(params); - assertTrue(outContent.toString(IOUtils.UTF_8.name()).contains("supertype: application/octet-stream")); + assertTrue(outContent.toString(UTF_8.name()).contains("supertype: application/octet-stream")); } /** @@ -319,7 +319,7 @@ public void testMultiValuedMetadata() throws Exception { String[] params = {"-m", resourcePrefix + "testMultipleSheets.numbers"}; TikaCLI.main(params); - String content = outContent.toString(IOUtils.UTF_8.name()); + String content = outContent.toString(UTF_8.name()); assertTrue(content.contains("sheetNames: Checking")); assertTrue(content.contains("sheetNames: Secon sheet")); assertTrue(content.contains("sheetNames: Logical Sheet 3")); @@ -333,7 +333,7 @@ new File("subdir/foo.txt").delete(); new File("subdir").delete(); TikaCLI.main(params); - String content = outContent.toString(IOUtils.UTF_8.name()); + String content = outContent.toString(UTF_8.name()); assertTrue(content.contains("Extracting 'subdir/foo.txt'")); // clean up. TODO: These should be in target. new File("target/subdir/foo.txt").delete(); @@ -359,7 +359,7 @@ public void testConfig() throws Exception { String[] params = new String[]{"--config="+testDataFile.toString()+"/tika-config1.xml", resourcePrefix+"bad_xml.xml"}; TikaCLI.main(params); - String content = outContent.toString(IOUtils.UTF_8.name()); + String content = outContent.toString(UTF_8.name()); assertTrue(content.contains("apple")); assertTrue(content.contains("org.apache.tika.parser.html.HtmlParser")); } @@ -368,7 +368,7 @@ public void testJsonRecursiveMetadataParserMetadataOnly() throws Exception { String[] params = new String[]{"-m", "-J", "-r", resourcePrefix+"test_recursive_embedded.docx"}; TikaCLI.main(params); - String content = outContent.toString(IOUtils.UTF_8.name()); + String content = outContent.toString(UTF_8.name()); assertTrue(content.contains("[\n" + " {\n" + " \"Application-Name\": \"Microsoft Office Word\",\n" + @@ -384,7 +384,7 @@ public void testJsonRecursiveMetadataParserDefault() throws Exception { String[] params = new String[]{"-J", "-r", resourcePrefix+"test_recursive_embedded.docx"}; TikaCLI.main(params); - String content = outContent.toString(IOUtils.UTF_8.name()); + String content = outContent.toString(UTF_8.name()); assertTrue(content.contains("\"X-TIKA:content\": \"\\u003chtml xmlns\\u003d\\\"http://www.w3.org/1999/xhtml")); } @@ -392,7 +392,7 @@ public void testJsonRecursiveMetadataParserText() throws Exception { String[] params = new String[]{"-J", "-r", "-t", resourcePrefix+"test_recursive_embedded.docx"}; TikaCLI.main(params); - String content = outContent.toString(IOUtils.UTF_8.name()); + String content = outContent.toString(UTF_8.name()); assertTrue(content.contains("\\n\\nembed_4\\n")); assertTrue(content.contains("\\n\\nembed_0")); } @@ -401,7 +401,7 @@ public void testDigestInJson() throws Exception { String[] params = new String[]{"-J", "-r", "-t", "--digest=MD5", resourcePrefix+"test_recursive_embedded.docx"}; TikaCLI.main(params); - String content = outContent.toString(IOUtils.UTF_8.name()); + String content = outContent.toString(UTF_8.name()); assertTrue(content.contains("\"X-TIKA:digest:MD5\": \"59f626e09a8c16ab6dbc2800c685f772\",")); assertTrue(content.contains("\"X-TIKA:digest:MD5\": \"f9627095ef86c482e61d99f0cc1cf87d\"")); } Index: tika-parsers/src/main/java/org/apache/tika/parser/microsoft/WordExtractor.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/microsoft/WordExtractor.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/microsoft/WordExtractor.java (revision ) @@ -47,13 +47,14 @@ import org.apache.poi.poifs.filesystem.Entry; import org.apache.poi.poifs.filesystem.NPOIFSFileSystem; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.parser.ParseContext; import org.apache.tika.sax.XHTMLContentHandler; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; +import static java.nio.charset.StandardCharsets.UTF_8; + public class WordExtractor extends AbstractPOIFSExtractor { private static final char UNICODECHAR_NONBREAKING_HYPHEN = '\u2011'; @@ -298,7 +299,7 @@ CharacterRun cr = p.getCharacterRun(j); // FIELD_BEGIN_MARK: - if (cr.text().getBytes(IOUtils.UTF_8)[0] == 0x13) { + if (cr.text().getBytes(UTF_8)[0] == 0x13) { Field field = document.getFields().getFieldByStartOffset(docPart, cr.getStartOffset()); // 58 is an embedded document // 56 is a document link Index: tika-core/src/main/java/org/apache/tika/config/ServiceLoader.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/main/java/org/apache/tika/config/ServiceLoader.java (revision 1696252) +++ tika-core/src/main/java/org/apache/tika/config/ServiceLoader.java (revision ) @@ -29,8 +29,9 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import org.apache.tika.io.IOUtils; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Internal utility class that Tika uses to look up service providers. * @@ -345,7 +346,7 @@ InputStream stream = resource.openStream(); try { BufferedReader reader = - new BufferedReader(new InputStreamReader(stream, IOUtils.UTF_8)); + new BufferedReader(new InputStreamReader(stream, UTF_8)); String line = reader.readLine(); while (line != null) { line = COMMENT.matcher(line).replaceFirst(""); Index: tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmDirectoryListingSet.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmDirectoryListingSet.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmDirectoryListingSet.java (revision ) @@ -20,11 +20,12 @@ import java.util.ArrayList; import java.util.List; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.chm.core.ChmCommons; import org.apache.tika.parser.chm.core.ChmConstants; import org.apache.tika.parser.chm.exception.ChmParsingException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Holds chm listing entries */ @@ -234,7 +235,7 @@ dle.setNameLength(strlen); dle.setName(new String(ChmCommons.copyOfRange( dir_chunk, placeHolder, - (placeHolder + dle.getNameLength())), IOUtils.UTF_8)); + (placeHolder + dle.getNameLength())), UTF_8)); checkControlData(dle); checkResetTable(dle); @@ -255,9 +256,9 @@ } // int indexWorkData = ChmCommons.indexOf(dir_chunk, -// "::".getBytes("UTF-8")); +// "::".getBytes(UTF_8)); // int indexUserData = ChmCommons.indexOf(dir_chunk, -// "/".getBytes("UTF-8")); +// "/".getBytes(UTF_8)); // // if (indexUserData>=0 && indexUserData < indexWorkData) // setPlaceHolder(indexUserData); @@ -285,7 +286,7 @@ // // dle.getNameLength())))); // dle.setName(new String(ChmCommons.copyOfRange( // dir_chunk, placeHolder, -// (placeHolder + dle.getNameLength())), "UTF-8")); +// (placeHolder + dle.getNameLength())), UTF_8)); // checkControlData(dle); // checkResetTable(dle); // setPlaceHolder(placeHolder Index: tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFObjDataParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFObjDataParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFObjDataParser.java (revision ) @@ -27,6 +27,7 @@ import java.util.Locale; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.commons.io.FilenameUtils; import org.apache.poi.poifs.filesystem.DirectoryNode; import org.apache.poi.poifs.filesystem.DocumentEntry; import org.apache.poi.poifs.filesystem.DocumentInputStream; @@ -35,7 +36,6 @@ import org.apache.poi.poifs.filesystem.Ole10Native; import org.apache.poi.poifs.filesystem.Ole10NativeException; import org.apache.poi.util.IOUtils; -import org.apache.tika.io.FilenameUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.RTFMetadata; Index: tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java (revision ) @@ -31,6 +31,7 @@ import java.util.Map; import java.util.Set; +import org.apache.commons.io.IOUtils; import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.tika.TikaTest; @@ -40,7 +41,6 @@ import org.apache.tika.extractor.ContainerExtractor; import org.apache.tika.extractor.DocumentSelector; import org.apache.tika.extractor.ParserContainerExtractor; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.OfficeOpenXMLCore; Index: tika-example/src/main/java/org/apache/tika/example/RollbackSoftware.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-example/src/main/java/org/apache/tika/example/RollbackSoftware.java (revision 1696252) +++ tika-example/src/main/java/org/apache/tika/example/RollbackSoftware.java (revision ) @@ -37,6 +37,8 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Demonstrates Tika and its ability to sense symlinks. */ @@ -52,7 +54,7 @@ LinkContentHandler handler = new LinkContentHandler(); Metadata met = new Metadata(); DeploymentAreaParser parser = new DeploymentAreaParser(); - parser.parse(IOUtils.toInputStream(deployArea.getAbsolutePath(), "utf-8"), + parser.parse(IOUtils.toInputStream(deployArea.getAbsolutePath(), UTF_8), handler, met); List links = handler.getLinks(); if (links.size() < 2) @@ -110,7 +112,7 @@ Metadata metadata, ParseContext context) throws IOException, SAXException, TikaException { - File deployArea = new File(IOUtils.toString(is, "utf-8")); + File deployArea = new File(IOUtils.toString(is, UTF_8)); File[] versions = deployArea.listFiles(new FileFilter() { public boolean accept(File pathname) { Index: tika-parsers/src/main/java/org/apache/tika/parser/prt/PRTParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/prt/PRTParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/prt/PRTParser.java (revision ) @@ -34,6 +34,8 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.US_ASCII; + /** * A basic text extracting parser for the CADKey PRT (CAD Drawing) * format. It outputs text from note entries. @@ -80,7 +82,7 @@ byte[] date = new byte[12]; IOUtils.readFully(stream, date); - String dateStr = new String(date, "ASCII"); + String dateStr = new String(date, US_ASCII); if(dateStr.startsWith("19") || dateStr.startsWith("20")) { String formattedDate = dateStr.substring(0, 4) + "-" + dateStr.substring(4,6) + "-" + dateStr.substring(6,8) + "T" + dateStr.substring(8,10) + ":" + Index: tika-batch/src/test/java/org/apache/tika/batch/fs/BatchProcessTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-batch/src/test/java/org/apache/tika/batch/fs/BatchProcessTest.java (revision 1696252) +++ tika-batch/src/test/java/org/apache/tika/batch/fs/BatchProcessTest.java (revision ) @@ -17,6 +17,7 @@ */ +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -29,7 +30,6 @@ import org.apache.commons.io.FileUtils; import org.apache.tika.batch.BatchProcess; import org.apache.tika.batch.BatchProcessDriverCLI; -import org.apache.tika.io.IOUtils; import org.junit.Test; public class BatchProcessTest extends FSBatchTestBase { @@ -85,8 +85,7 @@ assertEquals(0, hvyHang.length()); } assertContains("This is tika-batch's first test file", - FileUtils.readFileToString(new File(outputDir, "test6_ok.xml.xml"), - IOUtils.UTF_8.toString())); + FileUtils.readFileToString(new File(outputDir, "test6_ok.xml.xml"), UTF_8)); //key that the process realize that there were no more processable files //in the queue and does not ask for a restart! @@ -137,8 +136,7 @@ assertEquals(4, outputDir.listFiles().length); assertContains("This is tika-batch's first test file", - FileUtils.readFileToString(new File(outputDir, "test2_ok.xml.xml"), - IOUtils.UTF_8.toString())); + FileUtils.readFileToString(new File(outputDir, "test2_ok.xml.xml"), UTF_8)); assertContains(BatchProcess.BATCH_CONSTANTS.BATCH_PROCESS_FATAL_MUST_RESTART.toString(), streamStrings.getErrString()); @@ -191,8 +189,7 @@ File[] files = outputDir.listFiles(); assertEquals(1, files.length); assertContains("

some content

", - FileUtils.readFileToString(new File(outputDir, "test0_sleep.xml.xml"), - IOUtils.UTF_8.toString())); + FileUtils.readFileToString(new File(outputDir, "test0_sleep.xml.xml"), UTF_8)); assertContains("exitStatus="+BatchProcessDriverCLI.PROCESS_RESTART_EXIT_CODE, streamStrings.getOutString()); assertContains("causeForTermination='BATCH_PROCESS_ALIVE_TOO_LONG'", Index: tika-parsers/src/main/java/org/apache/tika/parser/image/PSDParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/image/PSDParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/image/PSDParser.java (revision ) @@ -18,7 +18,6 @@ import java.io.IOException; import java.io.InputStream; -import java.io.UnsupportedEncodingException; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -38,6 +37,8 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.US_ASCII; + /** * Parser for the Adobe Photoshop PSD File Format. *

@@ -193,11 +194,7 @@ private String getDataAsString() { // Will be null padded - try { - return new String(data, 0, data.length - 1, "ASCII"); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException("Something is very broken in your JVM!"); - } + return new String(data, 0, data.length - 1, US_ASCII); } } } Index: tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.parser.mail; +import static java.nio.charset.StandardCharsets.US_ASCII; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -221,7 +222,7 @@ "really really really really really really long name "); } String name = inputBuilder.toString(); - byte[] data = ("From: " + name + "\r\n\r\n").getBytes("US-ASCII"); + byte[] data = ("From: " + name + "\r\n\r\n").getBytes(US_ASCII); Parser parser = new RFC822Parser(); ContentHandler handler = new DefaultHandler(); Index: tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java (revision ) @@ -16,11 +16,11 @@ */ package org.apache.tika.parser.chm; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet; import org.apache.tika.parser.chm.accessor.ChmItsfHeader; import org.apache.tika.parser.chm.accessor.ChmItspHeader; @@ -61,7 +61,7 @@ int indexOfControlData = chmDirListCont.getControlDataIndex(); int indexOfResetTable = ChmCommons.indexOfResetTableBlock(data, - ChmConstants.LZXC.getBytes(IOUtils.UTF_8)); + ChmConstants.LZXC.getBytes(UTF_8)); byte[] dir_chunk = null; if (indexOfResetTable > 0) { // dir_chunk = Arrays.copyOfRange( data, indexOfResetTable, @@ -130,14 +130,14 @@ @Test public void testGetSignature() { assertEquals( - TestParameters.VP_CONTROL_DATA_SIGNATURE.getBytes(IOUtils.UTF_8).length, + TestParameters.VP_CONTROL_DATA_SIGNATURE.getBytes(UTF_8).length, chmLzxcControlData.getSignature().length); } @Test public void testGetSignaure() { assertEquals( - TestParameters.VP_CONTROL_DATA_SIGNATURE.getBytes(IOUtils.UTF_8).length, + TestParameters.VP_CONTROL_DATA_SIGNATURE.getBytes(UTF_8).length, chmLzxcControlData.getSignature().length); } Index: tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmPmglHeader.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmPmglHeader.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmPmglHeader.java (revision ) @@ -17,11 +17,12 @@ package org.apache.tika.parser.chm.accessor; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.chm.assertion.ChmAssert; import org.apache.tika.parser.chm.core.ChmConstants; import org.apache.tika.parser.chm.exception.ChmParsingException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Description There are two types of directory chunks -- index chunks, and * listing chunks. The index chunk will be omitted if there is only one listing @@ -67,11 +68,11 @@ private int currentPlace = 0; public ChmPmglHeader() { - signature = ChmConstants.PMGL.getBytes(IOUtils.UTF_8); /* + signature = ChmConstants.PMGL.getBytes(UTF_8); /* - * 0 - * (PMGL - * ) - */ + * 0 + * (PMGL + * ) + */ } private int getDataRemained() { @@ -103,7 +104,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("signatute:=" + new String(getSignature(), IOUtils.UTF_8) + ", "); + sb.append("signatute:=" + new String(getSignature(), UTF_8) + ", "); sb.append("free space:=" + getFreeSpace() + ", "); sb.append("unknown0008:=" + getUnknown0008() + ", "); sb.append("prev block:=" + getBlockPrev() + ", "); @@ -166,7 +167,7 @@ chmPmglHeader.setBlockNext(chmPmglHeader.unmarshalInt32(data)); /* check structure */ - if (!new String(chmPmglHeader.getSignature(), IOUtils.UTF_8).equals(ChmConstants.PMGL)) + if (!new String(chmPmglHeader.getSignature(), UTF_8).equals(ChmConstants.PMGL)) throw new ChmParsingException(ChmPmglHeader.class.getName() + " pmgl != pmgl.signature"); } Index: tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.embedder; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -38,7 +39,6 @@ import java.util.Map; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TemporaryResources; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; @@ -59,7 +59,7 @@ protected static final DateFormat EXPECTED_METADATA_DATE_FORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ROOT); - protected static final String DEFAULT_CHARSET = IOUtils.UTF_8.name(); + protected static final String DEFAULT_CHARSET = UTF_8.name(); private static final String COMMAND_METADATA_ARGUMENT_DESCRIPTION = "dc:description"; private static final String TEST_TXT_PATH = "/test-documents/testTXT.txt"; Index: tika-batch/src/test/java/org/apache/tika/batch/fs/StringStreamGobbler.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-batch/src/test/java/org/apache/tika/batch/fs/StringStreamGobbler.java (revision 1696252) +++ tika-batch/src/test/java/org/apache/tika/batch/fs/StringStreamGobbler.java (revision ) @@ -17,13 +17,15 @@ * limitations under the License. */ +import org.apache.commons.io.IOUtils; + import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import org.apache.tika.io.IOUtils; +import static java.nio.charset.StandardCharsets.UTF_8; public class StringStreamGobbler implements Runnable { @@ -33,8 +35,7 @@ private final StringBuilder sb = new StringBuilder(); public StringStreamGobbler(InputStream is) { - this.reader = new BufferedReader(new InputStreamReader(new BufferedInputStream(is), - IOUtils.UTF_8)); + this.reader = new BufferedReader(new InputStreamReader(new BufferedInputStream(is), UTF_8)); } @Override Index: tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java (revision ) @@ -17,10 +17,10 @@ package org.apache.tika.parser.chm; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet; import org.apache.tika.parser.chm.accessor.ChmItsfHeader; import org.apache.tika.parser.chm.accessor.ChmItspHeader; @@ -60,7 +60,7 @@ int indexOfControlData = chmDirListCont.getControlDataIndex(); int indexOfResetTable = ChmCommons.indexOfResetTableBlock(data, - ChmConstants.LZXC.getBytes(IOUtils.UTF_8)); + ChmConstants.LZXC.getBytes(UTF_8)); byte[] dir_chunk = null; if (indexOfResetTable > 0) { // dir_chunk = Arrays.copyOfRange( data, indexOfResetTable, Index: tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java (revision ) @@ -16,10 +16,10 @@ */ package org.apache.tika.parser.chm; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.chm.accessor.ChmPmglHeader; import org.apache.tika.parser.chm.core.ChmCommons; import org.apache.tika.parser.chm.core.ChmConstants; @@ -47,7 +47,7 @@ @Test public void testChmPmglHeaderGet() { assertEquals(TestParameters.VP_PMGL_SIGNATURE, new String( - chmPmglHeader.getSignature(), IOUtils.UTF_8)); + chmPmglHeader.getSignature(), UTF_8)); } @Test Index: tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java (revision ) @@ -20,6 +20,7 @@ import java.io.InputStream; import java.util.Locale; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.poi.POIXMLDocument; import org.apache.poi.POIXMLTextExtractor; import org.apache.poi.extractor.ExtractorFactory; @@ -33,7 +34,6 @@ import org.apache.poi.xwpf.extractor.XWPFWordExtractor; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; Index: tika-server/src/main/java/org/apache/tika/server/HTMLHelper.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-server/src/main/java/org/apache/tika/server/HTMLHelper.java (revision 1696252) +++ tika-server/src/main/java/org/apache/tika/server/HTMLHelper.java (revision ) @@ -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 @@ 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()); \ No newline at end of file Index: tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java (revision ) @@ -25,6 +25,7 @@ import java.util.Locale; import java.util.Set; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.poi.hdgf.extractor.VisioTextExtractor; import org.apache.poi.hpbf.extractor.PublisherTextExtractor; import org.apache.poi.poifs.crypt.Decryptor; @@ -36,7 +37,6 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.tika.exception.EncryptedDocumentException; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; Index: tika-parsers/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java (revision ) @@ -32,10 +32,10 @@ import org.apache.commons.compress.compressors.gzip.GzipUtils; import org.apache.commons.compress.compressors.pack200.Pack200CompressorInputStream; import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; import org.apache.tika.extractor.EmbeddedDocumentExtractor; import org.apache.tika.extractor.ParsingEmbeddedDocumentExtractor; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; Index: tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java (revision 1696252) +++ tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java (revision ) @@ -14,6 +14,7 @@ package org.apache.tika.example; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import java.io.ByteArrayOutputStream; @@ -23,8 +24,6 @@ import org.apache.commons.io.FileUtils; import org.junit.Test; -import com.google.common.base.Charsets; - public class SimpleTextExtractorTest { @Test public void testSimpleTextExtractor() throws Exception { @@ -33,18 +32,17 @@ + " content written in English to test autodetection of" + " the character encoding of the input stream."; ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - String UTF8 = Charsets.UTF_8.name(); PrintStream out = System.out; - System.setOut(new PrintStream(buffer, true, UTF8)); + System.setOut(new PrintStream(buffer, true, UTF_8.name())); File file = new File("target", "test.txt"); - FileUtils.writeStringToFile(file, message, UTF8); + FileUtils.writeStringToFile(file, message, UTF_8); SimpleTextExtractor.main(new String[] { file.getPath() }); file.delete(); System.setOut(out); - assertEquals(message, buffer.toString(UTF8).trim()); + assertEquals(message, buffer.toString(UTF_8.name()).trim()); } } Index: tika-core/src/main/java/org/apache/tika/detect/NameDetector.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/main/java/org/apache/tika/detect/NameDetector.java (revision 1696252) +++ tika-core/src/main/java/org/apache/tika/detect/NameDetector.java (revision ) @@ -22,10 +22,11 @@ import java.util.Map; import java.util.regex.Pattern; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Content type detection based on the resource name. An instance of this * class contains a set of regular expression patterns that are matched @@ -120,7 +121,7 @@ int percent = name.indexOf('%'); if (percent != -1) { try { - name = URLDecoder.decode(name, IOUtils.UTF_8.name()); + name = URLDecoder.decode(name, UTF_8.name()); } catch (UnsupportedEncodingException e) { throw new IllegalStateException("UTF-8 not supported", e); } Index: tika-parsers/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java (revision ) @@ -28,7 +28,6 @@ import java.util.TimeZone; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.mime.MediaType; @@ -38,6 +37,8 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Parser for IPTC ANPA New Wire Feeds */ @@ -162,7 +163,7 @@ } int msgsize = is.read(buf); // read in at least the full data - String message = (new String(buf, IOUtils.UTF_8)).toLowerCase(Locale.ROOT); + String message = (new String(buf, UTF_8)).toLowerCase(Locale.ROOT); // these are not if-then-else, because we want to go from most common // and fall through to least. this is imperfect, as these tags could // show up in other agency stories, but i can't find a spec or any Index: tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java (revision 1696252) +++ tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java (revision ) @@ -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 @@ .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 @@ 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 metadata = new HashMap(); @@ -151,7 +152,7 @@ .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 @@ .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); } Index: tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java (revision 1696252) +++ tika-batch/src/test/java/org/apache/tika/batch/RecursiveParserWrapperFSConsumerTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.batch; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import java.io.ByteArrayInputStream; @@ -31,7 +32,6 @@ import org.apache.tika.TikaTest; import org.apache.tika.batch.fs.RecursiveParserWrapperFSConsumer; import org.apache.tika.config.TikaConfig; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.metadata.serialization.JsonMetadataList; @@ -76,7 +76,7 @@ IFileProcessorFutureResult result = consumer.call(); mockOSFactory.getStreams().get(0).flush(); byte[] bytes = mockOSFactory.getStreams().get(0).toByteArray(); - List results = JsonMetadataList.fromJson(new InputStreamReader(new ByteArrayInputStream(bytes), IOUtils.UTF_8)); + List results = JsonMetadataList.fromJson(new InputStreamReader(new ByteArrayInputStream(bytes), UTF_8)); assertEquals(4, results.size()); assertContains("another null pointer", @@ -123,7 +123,7 @@ IFileProcessorFutureResult result = consumer.call(); mockOSFactory.getStreams().get(0).flush(); byte[] bytes = mockOSFactory.getStreams().get(0).toByteArray(); - List results = JsonMetadataList.fromJson(new InputStreamReader(new ByteArrayInputStream(bytes), IOUtils.UTF_8)); + List results = JsonMetadataList.fromJson(new InputStreamReader(new ByteArrayInputStream(bytes), UTF_8)); assertEquals(2, results.size()); assertContains("another null pointer", results.get(0).get(TikaCoreProperties.TIKA_META_EXCEPTION_PREFIX + "runtime")); Index: tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetector.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetector.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetector.java (revision ) @@ -35,6 +35,7 @@ import org.apache.commons.compress.compressors.CompressorException; import org.apache.commons.compress.compressors.CompressorInputStream; import org.apache.commons.compress.compressors.CompressorStreamFactory; +import org.apache.commons.io.IOUtils; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.PackageAccess; @@ -43,7 +44,6 @@ import org.apache.poi.openxml4j.opc.PackageRelationshipTypes; import org.apache.tika.detect.Detector; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TemporaryResources; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; @@ -51,6 +51,8 @@ import org.apache.tika.parser.iwork.IWorkPackageParser; import org.apache.tika.parser.iwork.IWorkPackageParser.IWORKDocumentType; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * A detector that works on Zip documents and other archive and compression * formats to figure out exactly what the file is. @@ -188,7 +190,7 @@ if (mimetype != null) { InputStream stream = zip.getInputStream(mimetype); try { - return MediaType.parse(IOUtils.toString(stream, IOUtils.UTF_8.name())); + return MediaType.parse(IOUtils.toString(stream, UTF_8)); } finally { stream.close(); } Index: tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java (revision ) @@ -40,7 +40,6 @@ import com.healthmarketscience.jackcess.util.OleBlob; import org.apache.poi.poifs.filesystem.NPOIFSFileSystem; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.OfficeOpenXMLExtended; @@ -51,6 +50,8 @@ import org.apache.tika.sax.XHTMLContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Internal class. Needs to be instantiated for each parse because of * the lack of thread safety with the dateTimeFormatter @@ -198,7 +199,7 @@ Metadata m = new Metadata(); m.set(Metadata.CONTENT_TYPE, "text/html; charset=UTF-8"); try { - htmlParser.parse(new ByteArrayInputStream(v.getBytes(IOUtils.UTF_8)), + htmlParser.parse(new ByteArrayInputStream(v.getBytes(UTF_8)), h, m, EMPTY_PARSE_CONTEXT); handler.characters(h.toString()); Index: tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDF2XHTML.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDF2XHTML.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDF2XHTML.java (revision ) @@ -29,6 +29,8 @@ import java.util.Map; import java.util.TreeMap; +import org.apache.commons.io.IOExceptionWithCause; +import org.apache.commons.io.IOUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocumentCatalog; import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary; @@ -63,8 +65,6 @@ import org.apache.tika.exception.TikaException; import org.apache.tika.extractor.EmbeddedDocumentExtractor; import org.apache.tika.extractor.ParsingEmbeddedDocumentExtractor; -import org.apache.tika.io.IOExceptionWithCause; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; Index: tika-parsers/src/main/java/org/apache/tika/parser/jdbc/SQLite3DBParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/jdbc/SQLite3DBParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/jdbc/SQLite3DBParser.java (revision ) @@ -27,7 +27,7 @@ import java.util.List; import java.util.Set; -import org.apache.tika.io.IOExceptionWithCause; +import org.apache.commons.io.IOExceptionWithCause; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; Index: tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java (revision ) @@ -30,10 +30,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.config.ServiceLoader; import org.apache.tika.detect.AutoDetectReader; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.mime.MediaType; Index: tika-parsers/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/isatab/ISATabUtils.java (revision ) @@ -28,10 +28,10 @@ import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.config.ServiceLoader; import org.apache.tika.detect.AutoDetectReader; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.ParseContext; Index: tika-core/src/test/java/org/apache/tika/detect/TextDetectorTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/test/java/org/apache/tika/detect/TextDetectorTest.java (revision 1696252) +++ tika-core/src/test/java/org/apache/tika/detect/TextDetectorTest.java (revision ) @@ -21,11 +21,11 @@ import java.io.InputStream; import java.util.Arrays; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.junit.Test; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -55,8 +55,8 @@ @Test public void testDetectText() throws Exception { - assertText("Hello, World!".getBytes(IOUtils.UTF_8)); - assertText(" \t\r\n".getBytes(IOUtils.UTF_8)); + assertText("Hello, World!".getBytes(UTF_8)); + assertText(" \t\r\n".getBytes(UTF_8)); assertNotText(new byte[] { -1, -2, -3, 0x09, 0x0A, 0x0C, 0x0D, 0x1B }); assertNotText(new byte[] { 0 }); assertNotText(new byte[] { 'H', 'e', 'l', 'l', 'o', 0 }); Index: tika-parsers/src/main/java/org/apache/tika/parser/utils/CommonsDigester.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/utils/CommonsDigester.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/utils/CommonsDigester.java (revision ) @@ -27,7 +27,7 @@ import java.util.Locale; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.tika.io.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; Index: tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.parser.code; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -24,7 +25,6 @@ import java.util.Set; import org.apache.tika.TikaTest; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.mime.MediaType; @@ -63,7 +63,7 @@ assertTrue(textContent.length() > 0); assertTrue(textContent.indexOf("html") < 0); - textContent = getText(new ByteArrayInputStream("public class HelloWorld {}".getBytes(IOUtils.UTF_8)), sourceCodeParser, createMetadata("text/x-java-source")); + textContent = getText(new ByteArrayInputStream("public class HelloWorld {}".getBytes(UTF_8)), sourceCodeParser, createMetadata("text/x-java-source")); assertTrue(textContent.length() > 0); assertTrue(textContent.indexOf("html") < 0); } Index: tika-parsers/src/main/java/org/apache/tika/parser/mat/MatParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/mat/MatParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/mat/MatParser.java (revision ) @@ -24,7 +24,6 @@ import java.util.Map; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.AbstractParser; @@ -40,7 +39,9 @@ import com.jmatio.types.MLArray; import com.jmatio.types.MLStructure; +import static java.nio.charset.StandardCharsets.UTF_8; + public class MatParser extends AbstractParser { public static final String MATLAB_MIME_TYPE = @@ -87,7 +88,7 @@ } // Get endian indicator from header file - String endianBytes = new String(hdr.getEndianIndicator(), IOUtils.UTF_8); // Retrieve endian bytes and convert to string + String endianBytes = new String(hdr.getEndianIndicator(), UTF_8); // Retrieve endian bytes and convert to string String endianCode = String.valueOf(endianBytes.toCharArray()); // Convert bytes to characters to string metadata.set("endian", endianCode); \ No newline at end of file Index: tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageParser.java (revision ) @@ -38,11 +38,11 @@ import org.apache.commons.compress.archivers.zip.UnsupportedZipFeatureException; import org.apache.commons.compress.archivers.zip.UnsupportedZipFeatureException.Feature; import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.EncryptedDocumentException; import org.apache.tika.exception.TikaException; import org.apache.tika.extractor.EmbeddedDocumentExtractor; import org.apache.tika.extractor.ParsingEmbeddedDocumentExtractor; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.io.TemporaryResources; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; Index: tika-translate/src/main/java/org/apache/tika/language/translate/Lingo24Translator.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-translate/src/main/java/org/apache/tika/language/translate/Lingo24Translator.java (revision 1696252) +++ tika-translate/src/main/java/org/apache/tika/language/translate/Lingo24Translator.java (revision ) @@ -30,10 +30,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.language.LanguageIdentifier; import org.apache.tika.language.LanguageProfile; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * An implementation of a REST client for the * Premium MT API v1. @@ -78,7 +79,7 @@ .query("user_key", userKey).query("source", sourceLanguage) .query("target", targetLanguage).query("q", text).get(); BufferedReader reader = new BufferedReader(new InputStreamReader( - (InputStream) response.getEntity(), IOUtils.UTF_8)); + (InputStream) response.getEntity(), UTF_8)); String line = null; StringBuffer responseText = new StringBuffer(); while ((line = reader.readLine()) != null) { Index: tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.parser.microsoft.ooxml; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -33,7 +34,6 @@ import org.apache.tika.TikaTest; 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.Office; @@ -1069,13 +1069,13 @@ //grab stderr ByteArrayOutputStream errContent = new ByteArrayOutputStream(); - System.setErr(new PrintStream(errContent, true, IOUtils.UTF_8.name())); + System.setErr(new PrintStream(errContent, true, UTF_8.name())); parser.parse(input, handler, metadata, context); //return stderr System.setErr(origErr); - String err = errContent.toString(IOUtils.UTF_8.name()); + String err = errContent.toString(UTF_8.name()); assertTrue(err.length() == 0); input.close(); } Index: tika-core/src/test/java/org/apache/tika/io/TailStreamTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/test/java/org/apache/tika/io/TailStreamTest.java (revision 1696252) +++ tika-core/src/test/java/org/apache/tika/io/TailStreamTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.io; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -68,7 +69,7 @@ */ private static InputStream generateStream(int from, int length) { - return new ByteArrayInputStream(generateText(from, length).getBytes(IOUtils.UTF_8)); + return new ByteArrayInputStream(generateText(from, length).getBytes(UTF_8)); } /** @@ -123,7 +124,7 @@ TailStream stream = new TailStream(generateStream(0, 2 * count), count); readStream(stream); assertEquals("Wrong buffer", generateText(count, count), new String( - stream.getTail(), IOUtils.UTF_8)); + stream.getTail(), UTF_8)); } /** @@ -144,7 +145,7 @@ read = stream.read(buf); } assertEquals("Wrong buffer", generateText(count - tailSize, tailSize), - new String(stream.getTail(), IOUtils.UTF_8)); + new String(stream.getTail(), UTF_8)); stream.close(); } @@ -164,7 +165,7 @@ stream.reset(); readStream(stream); assertEquals("Wrong buffer", generateText(tailSize, tailSize), - new String(stream.getTail(), IOUtils.UTF_8)); + new String(stream.getTail(), UTF_8)); } /** @@ -180,7 +181,7 @@ byte[] buf = new byte[count]; stream.read(buf); assertEquals("Wrong buffer", generateText(count - tailSize, tailSize), - new String(stream.getTail(), IOUtils.UTF_8)); + new String(stream.getTail(), UTF_8)); stream.close(); } @@ -197,7 +198,7 @@ assertEquals("Wrong skip result", skipCount, stream.skip(skipCount)); assertEquals("Wrong buffer", generateText(skipCount - tailSize, tailSize), - new String(stream.getTail(), IOUtils.UTF_8)); + new String(stream.getTail(), UTF_8)); stream.close(); } @@ -211,7 +212,7 @@ TailStream stream = new TailStream(generateStream(0, count), 2 * count); assertEquals("Wrong skip result", count, stream.skip(2 * count)); assertEquals("Wrong buffer", generateText(0, count), - new String(stream.getTail(), IOUtils.UTF_8)); + new String(stream.getTail(), UTF_8)); stream.close(); } Index: tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3v1Handler.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3v1Handler.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3v1Handler.java (revision ) @@ -18,7 +18,6 @@ import java.io.IOException; import java.io.InputStream; -import java.io.UnsupportedEncodingException; import java.util.Arrays; import java.util.List; @@ -26,6 +25,8 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.ISO_8859_1; + /** * This is used to parse ID3 Version 1 Tag information from an MP3 file, * if available. @@ -177,10 +178,6 @@ } // Return the remaining substring - try { - return new String(buffer, start, end - start, "ISO-8859-1"); - } catch (UnsupportedEncodingException e) { - throw new TikaException("ISO-8859-1 encoding is not available", e); - } + return new String(buffer, start, end - start, ISO_8859_1); } } Index: tika-core/src/test/java/org/apache/tika/mime/ProbabilisticMimeDetectionTestWithTika.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/test/java/org/apache/tika/mime/ProbabilisticMimeDetectionTestWithTika.java (revision 1696252) +++ tika-core/src/test/java/org/apache/tika/mime/ProbabilisticMimeDetectionTestWithTika.java (revision ) @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +16,9 @@ */ package org.apache.tika.mime; +import static java.nio.charset.StandardCharsets.UTF_16BE; +import static java.nio.charset.StandardCharsets.UTF_16LE; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -25,7 +27,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.nio.charset.Charset; import org.apache.tika.Tika; import org.apache.tika.config.ServiceLoader; @@ -36,8 +37,7 @@ import org.junit.Test; public class ProbabilisticMimeDetectionTestWithTika { - private static final Charset UTF8 = Charset.forName("UTF-8"); - + private ProbabilisticMimeDetectionSelector proSelector; private MediaTypeRegistry registry; private Tika tika; @@ -98,14 +98,14 @@ @Test public void testByteOrderMark() throws Exception { assertEquals(MediaType.TEXT_PLAIN.toString(), tika.detect( - new ByteArrayInputStream("\ufefftest".getBytes("UTF-16LE")), + new ByteArrayInputStream("\ufefftest".getBytes(UTF_16LE)), new Metadata())); assertEquals(MediaType.TEXT_PLAIN.toString(), tika.detect( - new ByteArrayInputStream("\ufefftest".getBytes("UTF-16BE")), + new ByteArrayInputStream("\ufefftest".getBytes(UTF_16BE)), new Metadata())); assertEquals(MediaType.TEXT_PLAIN.toString(), tika.detect( - new ByteArrayInputStream("\ufefftest".getBytes(UTF8)), + new ByteArrayInputStream("\ufefftest".getBytes(UTF_8)), new Metadata())); } @@ -219,7 +219,7 @@ @Test public void testNotXML() throws IOException { assertEquals(MediaType.TEXT_PLAIN.toString(), tika.detect( - new ByteArrayInputStream("".getBytes(UTF8)), + new ByteArrayInputStream("".getBytes(UTF_8)), new Metadata())); } @@ -242,7 +242,7 @@ */ @Test public void testMimeMagicClashSamePriority() throws IOException { - byte[] helloWorld = "Hello, World!".getBytes(UTF8); + byte[] helloWorld = "Hello, World!".getBytes(UTF_8); MediaType helloType = MediaType.parse("hello/world-file"); MediaType helloXType = MediaType.parse("hello/x-world-hello"); Metadata metadata; Index: tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java (revision 1696252) +++ tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java (revision ) @@ -16,6 +16,9 @@ */ package org.apache.tika.mime; +import static java.nio.charset.StandardCharsets.UTF_16BE; +import static java.nio.charset.StandardCharsets.UTF_16LE; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -25,7 +28,6 @@ import java.net.URL; import org.apache.tika.config.TikaConfig; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.junit.Before; import org.junit.Test; @@ -82,13 +84,13 @@ @Test public void testByteOrderMark() throws Exception { assertEquals(MediaType.TEXT_PLAIN, mimeTypes.detect( - new ByteArrayInputStream("\ufefftest".getBytes("UTF-16LE")), + new ByteArrayInputStream("\ufefftest".getBytes(UTF_16LE)), new Metadata())); assertEquals(MediaType.TEXT_PLAIN, mimeTypes.detect( - new ByteArrayInputStream("\ufefftest".getBytes("UTF-16BE")), + new ByteArrayInputStream("\ufefftest".getBytes(UTF_16BE)), new Metadata())); assertEquals(MediaType.TEXT_PLAIN, mimeTypes.detect( - new ByteArrayInputStream("\ufefftest".getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream("\ufefftest".getBytes(UTF_8)), new Metadata())); } @@ -198,7 +200,7 @@ @Test public void testNotXML() throws IOException { assertEquals(MediaType.TEXT_PLAIN, mimeTypes.detect( - new ByteArrayInputStream("".getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream("".getBytes(UTF_8)), new Metadata())); } @@ -222,7 +224,7 @@ */ @Test public void testMimeMagicClashSamePriority() throws IOException { - byte[] helloWorld = "Hello, World!".getBytes(IOUtils.UTF_8); + byte[] helloWorld = "Hello, World!".getBytes(UTF_8); MediaType helloType = MediaType.parse("hello/world-file"); MediaType helloXType = MediaType.parse("hello/x-world-hello"); Metadata metadata; Index: tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java (revision ) @@ -29,8 +29,8 @@ import java.util.Iterator; import java.util.Set; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.Property; import org.apache.tika.metadata.TikaCoreProperties; Index: tika-server/src/main/java/org/apache/tika/server/writer/TextMessageBodyWriter.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-server/src/main/java/org/apache/tika/server/writer/TextMessageBodyWriter.java (revision 1696252) +++ tika-server/src/main/java/org/apache/tika/server/writer/TextMessageBodyWriter.java (revision ) @@ -31,9 +31,10 @@ 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 @@ 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)); Index: tika-parsers/src/main/java/org/apache/tika/parser/ctakes/CTAKESConfig.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/ctakes/CTAKESConfig.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/ctakes/CTAKESConfig.java (revision ) @@ -22,7 +22,7 @@ import java.io.Serializable; import java.util.Properties; -import org.apache.tika.io.NullOutputStream; +import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM; /** * Configuration for {@see CTAKESContentHandler}. @@ -51,7 +51,7 @@ private CTAKESSerializer serializerType = CTAKESSerializer.XMI; // OutputStream object used for CAS serialization - private OutputStream stream = NullOutputStream.NULL_OUTPUT_STREAM; + private OutputStream stream = NULL_OUTPUT_STREAM; // Enables CAS serialization private boolean serialize = false; \ No newline at end of file Index: tika-batch/src/main/java/org/apache/tika/batch/BatchProcess.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-batch/src/main/java/org/apache/tika/batch/BatchProcess.java (revision 1696252) +++ tika-batch/src/main/java/org/apache/tika/batch/BatchProcess.java (revision ) @@ -31,10 +31,10 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.apache.tika.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static java.nio.charset.StandardCharsets.UTF_8; /** * This is the main processor class for a single process. @@ -134,7 +134,7 @@ //System.err should be redirected to System.out PrintStream sysErr = System.err; try { - outputStreamWriter = new PrintStream(sysErr, true, IOUtils.UTF_8.toString()); + outputStreamWriter = new PrintStream(sysErr, true, UTF_8.toString()); } catch (IOException e) { throw new RuntimeException("Can't redirect streams"); } Index: tika-parsers/src/main/java/org/apache/tika/parser/hdf/HDFParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/hdf/HDFParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/hdf/HDFParser.java (revision ) @@ -24,8 +24,8 @@ import java.util.Collections; import java.util.Set; +import org.apache.commons.io.IOUtils; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; Index: tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFEncodedStringDecoder.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFEncodedStringDecoder.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFEncodedStringDecoder.java (revision ) @@ -24,6 +24,8 @@ import org.apache.pdfbox.cos.COSString; import org.apache.pdfbox.pdfparser.BaseParser; +import static java.nio.charset.StandardCharsets.ISO_8859_1; + /** * In fairly rare cases, a PDF's XMP will contain a string that * has incorrectly been encoded with PDFEncoding: an octal for non-ascii and @@ -77,7 +79,7 @@ */ String decode(String value) { try { - byte[] bytes = new String("(" + value + ")").getBytes("ISO-8859-1"); + byte[] bytes = new String("(" + value + ")").getBytes(ISO_8859_1); InputStream is = new ByteArrayInputStream(bytes); COSStringParser p = new COSStringParser(is); String parsed = p.myParseCOSString(); Index: tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java (revision ) @@ -17,6 +17,9 @@ package org.apache.tika.mime; // Junit imports +import static java.nio.charset.StandardCharsets.UTF_16BE; +import static java.nio.charset.StandardCharsets.UTF_16LE; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; @@ -570,17 +573,17 @@ @Test public void testXmlAndHtmlDetection() throws Exception { assertTypeByData("application/xml", "" - .getBytes("UTF-8")); + .getBytes(UTF_8)); assertTypeByData("application/xml", "\uFEFF" - .getBytes("UTF-16LE")); + .getBytes(UTF_16LE)); assertTypeByData("application/xml", "\uFEFF" - .getBytes("UTF-16BE")); + .getBytes(UTF_16BE)); assertTypeByData("application/xml", "" - .getBytes("UTF-8")); + .getBytes(UTF_8)); assertTypeByData("text/html", "HTML" - .getBytes("UTF-8")); + .getBytes(UTF_8)); assertTypeByData("text/html", "HTML" - .getBytes("UTF-8")); + .getBytes(UTF_8)); } @Test Index: tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchIntegrationTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchIntegrationTest.java (revision 1696252) +++ tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchIntegrationTest.java (revision ) @@ -17,6 +17,7 @@ package org.apache.tika.cli; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -31,7 +32,7 @@ import java.util.List; import org.apache.commons.io.FileUtils; -import org.apache.tika.io.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.serialization.JsonMetadataList; import org.apache.tika.parser.RecursiveParserWrapper; @@ -54,9 +55,9 @@ tempDir.delete(); tempDir.mkdir(); outBuffer = new ByteArrayOutputStream(); - PrintStream outWriter = new PrintStream(outBuffer, true, IOUtils.UTF_8.name()); + PrintStream outWriter = new PrintStream(outBuffer, true, UTF_8.name()); ByteArrayOutputStream errBuffer = new ByteArrayOutputStream(); - PrintStream errWriter = new PrintStream(errBuffer, true, IOUtils.UTF_8.name()); + PrintStream errWriter = new PrintStream(errBuffer, true, UTF_8.name()); out = System.out; err = System.err; System.setOut(outWriter); @@ -65,8 +66,8 @@ @After public void tearDown() throws Exception { - System.setOut(new PrintStream(out, true, IOUtils.UTF_8.name())); - System.setErr(new PrintStream(err, true, IOUtils.UTF_8.name())); + System.setOut(new PrintStream(out, true, UTF_8.name())); + System.setErr(new PrintStream(err, true, UTF_8.name())); FileUtils.deleteDirectory(tempDir); } @@ -104,7 +105,7 @@ }; TikaCLI.main(params); reader = new InputStreamReader( - new FileInputStream(new File(tempDir, "test_recursive_embedded.docx.json")), IOUtils.UTF_8); + new FileInputStream(new File(tempDir, "test_recursive_embedded.docx.json")), UTF_8); List metadataList = JsonMetadataList.fromJson(reader); assertEquals(12, metadataList.size()); assertTrue(metadataList.get(6).get(RecursiveParserWrapper.TIKA_CONTENT).contains("human events")); @@ -123,7 +124,7 @@ assertTrue("bad_xml.xml.xml", new File(tempDir, "bad_xml.xml.xml").isFile()); assertTrue("coffee.xls.xml", new File(tempDir, "coffee.xls.xml").exists()); - String sysOutString = new String(outBuffer.toByteArray(), IOUtils.UTF_8); + String sysOutString = new String(outBuffer.toByteArray(), UTF_8); assertTrue(sysOutString.contains("MY_CUSTOM_LOG_CONFIG")); } @@ -139,7 +140,7 @@ }; TikaCLI.main(params); reader = new InputStreamReader( - new FileInputStream(new File(tempDir, "test_recursive_embedded.docx.json")), IOUtils.UTF_8); + new FileInputStream(new File(tempDir, "test_recursive_embedded.docx.json")), UTF_8); List metadataList = JsonMetadataList.fromJson(reader); assertEquals(12, metadataList.size()); assertEquals("59f626e09a8c16ab6dbc2800c685f772", metadataList.get(0).get("X-TIKA:digest:MD5")); @@ -159,7 +160,7 @@ }; TikaCLI.main(params); reader = new InputStreamReader( - new FileInputStream(new File(tempDir, "test_recursive_embedded.docx.json")), IOUtils.UTF_8); + new FileInputStream(new File(tempDir, "test_recursive_embedded.docx.json")), UTF_8); List metadataList = JsonMetadataList.fromJson(reader); assertEquals(12, metadataList.size()); assertNotNull(metadataList.get(0).get("X-TIKA:digest:SHA512")); Index: tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java (revision 1696252) +++ tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java (revision ) @@ -63,6 +63,8 @@ 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 @@ 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 @@ 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(); } Index: tika-example/src/main/java/org/apache/tika/example/ExtractEmbeddedFiles.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-example/src/main/java/org/apache/tika/example/ExtractEmbeddedFiles.java (revision 1696252) +++ tika-example/src/main/java/org/apache/tika/example/ExtractEmbeddedFiles.java (revision ) @@ -20,12 +20,12 @@ import java.nio.file.Files; import java.nio.file.Path; +import org.apache.commons.io.FilenameUtils; import org.apache.tika.config.TikaConfig; import org.apache.tika.detect.Detector; import org.apache.tika.exception.TikaException; import org.apache.tika.extractor.EmbeddedDocumentExtractor; import org.apache.tika.extractor.ParsingEmbeddedDocumentExtractor; -import org.apache.tika.io.FilenameUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.mime.MimeTypeException; Index: tika-parsers/src/main/java/org/apache/tika/parser/strings/StringsParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/strings/StringsParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/strings/StringsParser.java (revision ) @@ -30,7 +30,6 @@ import java.util.concurrent.TimeoutException; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; @@ -41,6 +40,8 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Parser that uses the "strings" (or strings-alternative) command to find the * printable strings in a object, or other binary, file @@ -267,7 +268,7 @@ int totalBytes = 0; try { - reader = new BufferedReader(new InputStreamReader(stream, IOUtils.UTF_8)); + reader = new BufferedReader(new InputStreamReader(stream, UTF_8)); int n = 0; while ((n = reader.read(buffer)) != -1) { @@ -320,7 +321,7 @@ String fileOutput = null; try { - reader = new BufferedReader(new InputStreamReader(out, IOUtils.UTF_8)); + reader = new BufferedReader(new InputStreamReader(out, UTF_8)); fileOutput = reader.readLine(); } catch (IOException ioe) { Index: tika-core/src/test/java/org/apache/tika/mime/ProbabilisticMimeDetectionTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/test/java/org/apache/tika/mime/ProbabilisticMimeDetectionTest.java (revision 1696252) +++ tika-core/src/test/java/org/apache/tika/mime/ProbabilisticMimeDetectionTest.java (revision ) @@ -16,6 +16,9 @@ */ package org.apache.tika.mime; +import static java.nio.charset.StandardCharsets.UTF_16BE; +import static java.nio.charset.StandardCharsets.UTF_16LE; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -23,14 +26,13 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.nio.charset.Charset; import org.apache.tika.metadata.Metadata; import org.junit.Before; import org.junit.Test; public class ProbabilisticMimeDetectionTest { - private static final Charset UTF8 = Charset.forName("UTF-8"); + private ProbabilisticMimeDetectionSelector proDetector; private MediaTypeRegistry registry; @@ -76,14 +78,14 @@ @Test public void testByteOrderMark() throws Exception { assertEquals(MediaType.TEXT_PLAIN, proDetector.detect( - new ByteArrayInputStream("\ufefftest".getBytes("UTF-16LE")), + new ByteArrayInputStream("\ufefftest".getBytes(UTF_16LE)), new Metadata())); assertEquals(MediaType.TEXT_PLAIN, proDetector.detect( - new ByteArrayInputStream("\ufefftest".getBytes("UTF-16BE")), + new ByteArrayInputStream("\ufefftest".getBytes(UTF_16BE)), new Metadata())); assertEquals(MediaType.TEXT_PLAIN, proDetector.detect( - new ByteArrayInputStream("\ufefftest".getBytes(UTF8)), + new ByteArrayInputStream("\ufefftest".getBytes(UTF_8)), new Metadata())); } @@ -199,7 +201,7 @@ @Test public void testNotXML() throws IOException { assertEquals(MediaType.TEXT_PLAIN, proDetector.detect( - new ByteArrayInputStream("".getBytes(UTF8)), + new ByteArrayInputStream("".getBytes(UTF_8)), new Metadata())); } @@ -222,7 +224,7 @@ */ @Test public void testMimeMagicClashSamePriority() throws IOException { - byte[] helloWorld = "Hello, World!".getBytes(UTF8); + byte[] helloWorld = "Hello, World!".getBytes(UTF_8); MediaType helloType = MediaType.parse("hello/world-file"); MediaType helloXType = MediaType.parse("hello/x-world-hello"); Metadata metadata; Index: tika-example/src/main/java/org/apache/tika/example/MyFirstTika.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-example/src/main/java/org/apache/tika/example/MyFirstTika.java (revision 1696252) +++ tika-example/src/main/java/org/apache/tika/example/MyFirstTika.java (revision ) @@ -32,6 +32,8 @@ import org.apache.tika.sax.BodyContentHandler; import org.xml.sax.ContentHandler; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Demonstrates how to call the different components within Tika: its * {@link Detector} framework (aka MIME identification and repository), its @@ -91,7 +93,7 @@ + detector.detect(stream, metadata) + "]"); LanguageIdentifier lang = new LanguageIdentifier(new LanguageProfile( - FileUtils.readFileToString(new File(filename), "utf-8"))); + FileUtils.readFileToString(new File(filename), UTF_8))); System.out.println("The language of this content is: [" + lang.getLanguage() + "]"); Index: tika-core/src/main/java/org/apache/tika/detect/NNExampleModelDetector.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/main/java/org/apache/tika/detect/NNExampleModelDetector.java (revision 1696252) +++ tika-core/src/main/java/org/apache/tika/detect/NNExampleModelDetector.java (revision ) @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,13 +20,14 @@ import java.io.BufferedReader; import java.io.File; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; import org.apache.tika.mime.MediaType; +import static java.nio.charset.StandardCharsets.UTF_8; + public class NNExampleModelDetector extends TrainedModelDetector { private static final String EXAMPLE_NNMODEL_FILE = "tika-example.nnmodel"; @@ -43,14 +43,8 @@ @Override public void loadDefaultModels(InputStream modelStream) { - BufferedReader bReader = null; - try{ - bReader = new BufferedReader( - new InputStreamReader(modelStream, "UTF-8")); - } - catch(UnsupportedEncodingException e){ - e.printStackTrace(); - } + BufferedReader bReader = + new BufferedReader(new InputStreamReader(modelStream, UTF_8)); NNTrainedModelBuilder nnBuilder = new NNTrainedModelBuilder(); String line; Index: tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.parser.pkg; +import static java.nio.charset.StandardCharsets.US_ASCII; import static org.junit.Assert.assertEquals; import java.io.InputStream; @@ -96,7 +97,7 @@ assertEquals(null, tracker.modifiedAts.get(0)); // Tar file starts with the directory name - assertEquals("test-documents/", new String(tracker.lastSeenStart, 0, 15, "ASCII")); + assertEquals("test-documents/", new String(tracker.lastSeenStart, 0, 15, US_ASCII)); } @Test Index: tika-bundle/pom.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-bundle/pom.xml (revision 1696252) +++ tika-bundle/pom.xml (revision ) @@ -143,7 +143,7 @@ sis-storage, apache-mime4j-core, apache-mime4j-dom, jsr-275, jhighlight, java-libpst, jwnl, netcdf4, grib, cdm, httpservices, jcip-annotations, - jmatio, guava + jmatio true ${project.url} Index: tika-batch/src/main/java/org/apache/tika/batch/BatchProcessDriverCLI.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-batch/src/main/java/org/apache/tika/batch/BatchProcessDriverCLI.java (revision 1696252) +++ tika-batch/src/main/java/org/apache/tika/batch/BatchProcessDriverCLI.java (revision ) @@ -29,10 +29,12 @@ import java.util.List; import java.util.Locale; -import org.apache.tika.io.IOUtils; +import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static java.nio.charset.StandardCharsets.UTF_8; + public class BatchProcessDriverCLI { /** @@ -285,7 +287,7 @@ private BufferedReader reader; private InterruptWatcher(InputStream is) { - reader = new BufferedReader(new InputStreamReader(is, IOUtils.UTF_8)); + reader = new BufferedReader(new InputStreamReader(is, UTF_8)); } @Override @@ -310,7 +312,7 @@ private final Writer writer; private InterruptWriter(OutputStream os) { - this.writer = new OutputStreamWriter(os, IOUtils.UTF_8); + this.writer = new OutputStreamWriter(os, UTF_8); } @Override @@ -337,8 +339,7 @@ protected boolean running = true; private StreamGobbler(InputStream is) { - this.reader = new BufferedReader(new InputStreamReader(new BufferedInputStream(is), - IOUtils.UTF_8)); + this.reader = new BufferedReader(new InputStreamReader(new BufferedInputStream(is), UTF_8)); } @Override Index: tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java (revision 1696252) +++ tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java (revision ) @@ -18,6 +18,8 @@ */ +import static java.nio.charset.StandardCharsets.UTF_16LE; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -26,6 +28,7 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; +import java.nio.charset.Charset; import org.apache.tika.config.TikaConfig; import org.apache.tika.detect.CompositeDetector; @@ -61,9 +64,9 @@ @Test public void testDump() throws Exception { DumpTikaConfigExample ex = new DumpTikaConfigExample(); - for (String encoding : new String[]{ "UTF-8", "UTF-16LE"}) { - Writer writer = new OutputStreamWriter(new FileOutputStream(configFile), encoding); - ex.dump(TikaConfig.getDefaultConfig(), writer, encoding); + for (Charset charset : new Charset[]{UTF_8, UTF_16LE}) { + Writer writer = new OutputStreamWriter(new FileOutputStream(configFile), charset); + ex.dump(TikaConfig.getDefaultConfig(), writer, charset.name()); writer.flush(); writer.close(); Index: tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmItspHeader.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmItspHeader.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmItspHeader.java (revision ) @@ -16,15 +16,14 @@ */ package org.apache.tika.parser.chm.accessor; -import java.io.UnsupportedEncodingException; - import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.chm.assertion.ChmAssert; import org.apache.tika.parser.chm.core.ChmCommons; import org.apache.tika.parser.chm.core.ChmConstants; import org.apache.tika.parser.chm.exception.ChmParsingException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Directory header The directory starts with a header; its format is as * follows: 0000: char[4] 'ITSP' 0004: DWORD Version number 1 0008: DWORD Length @@ -69,16 +68,16 @@ private int currentPlace = 0; public ChmItspHeader() { - signature = ChmConstants.ITSP.getBytes(IOUtils.UTF_8); /* + signature = ChmConstants.ITSP.getBytes(UTF_8); /* - * 0 - * (ITSP - * ) - */ + * 0 + * (ITSP + * ) + */ } public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("[ signature:=" + new String(getSignature(), IOUtils.UTF_8) + sb.append("[ signature:=" + new String(getSignature(), UTF_8) + System.getProperty("line.separator")); sb.append("version:=\t" + getVersion() + System.getProperty("line.separator")); @@ -537,7 +536,7 @@ ChmConstants.BYTE_ARRAY_LENGHT)); /* Checks validity of the itsp header */ - if (!new String(chmItspHeader.getSignature(), IOUtils.UTF_8).equals(ChmConstants.ITSP)) + if (!new String(chmItspHeader.getSignature(), UTF_8).equals(ChmConstants.ITSP)) throw new ChmParsingException("seems not valid signature"); if (chmItspHeader.getVersion() != ChmConstants.CHM_VER_1) Index: tika-parsers/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/microsoft/JackcessParserTest.java (revision ) @@ -24,9 +24,9 @@ import java.io.InputStream; import java.util.List; +import org.apache.commons.io.IOUtils; import org.apache.tika.TikaTest; import org.apache.tika.exception.EncryptedDocumentException; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.OfficeOpenXMLExtended; import org.apache.tika.metadata.TikaCoreProperties; Index: tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java (revision ) @@ -16,10 +16,10 @@ */ package org.apache.tika.parser.chm; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.chm.accessor.ChmItsfHeader; import org.apache.tika.parser.chm.accessor.ChmItspHeader; import org.apache.tika.parser.chm.core.ChmCommons; @@ -137,7 +137,7 @@ @Test public void testGetSignature() { assertEquals(TestParameters.VP_ISTP_SIGNATURE, new String( - chmItspHeader.getSignature(), IOUtils.UTF_8)); + chmItspHeader.getSignature(), UTF_8)); } @Test Index: tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java (revision 1696252) +++ tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java (revision ) @@ -39,6 +39,8 @@ import org.apache.tika.parser.ParseContext; import org.apache.tika.parser.external.ExternalParser; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Embedder that uses an external program (like sed or exiftool) to embed text * content and metadata into a given document. @@ -413,7 +415,7 @@ if (process.exitValue() != 0) { throw new TikaException("There was an error executing the command line" + "\nExecutable Command:\n\n" + cmd + - "\nExecutable Error:\n\n" + stdErrOutputStream.toString(IOUtils.UTF_8.name())); + "\nExecutable Error:\n\n" + stdErrOutputStream.toString(UTF_8.name())); } } } Index: tika-core/src/test/java/org/apache/tika/io/TikaInputStreamTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/test/java/org/apache/tika/io/TikaInputStreamTest.java (revision 1696252) +++ tika-core/src/test/java/org/apache/tika/io/TikaInputStreamTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.io; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -62,7 +63,7 @@ @Test public void testStreamBased() throws IOException { InputStream input = - new ByteArrayInputStream("Hello, World!".getBytes(IOUtils.UTF_8)); + new ByteArrayInputStream("Hello, World!".getBytes(UTF_8)); InputStream stream = TikaInputStream.get(input); File file = TikaInputStream.get(stream).getFile(); @@ -89,7 +90,7 @@ File file = File.createTempFile("tika-", ".tmp"); OutputStream stream = new FileOutputStream(file); try { - stream.write(data.getBytes(IOUtils.UTF_8)); + stream.write(data.getBytes(UTF_8)); } finally { stream.close(); } @@ -108,7 +109,7 @@ private String readStream(InputStream stream) throws IOException { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); IOUtils.copy(stream, buffer); - return buffer.toString(IOUtils.UTF_8.name()); + return buffer.toString(UTF_8.name()); } @Test Index: tika-core/src/test/java/org/apache/tika/sax/BasicContentHandlerFactoryTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/test/java/org/apache/tika/sax/BasicContentHandlerFactoryTest.java (revision 1696252) +++ tika-core/src/test/java/org/apache/tika/sax/BasicContentHandlerFactoryTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.sax; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -27,7 +28,6 @@ import java.util.Set; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.ParseContext; @@ -44,7 +44,7 @@ */ public class BasicContentHandlerFactoryTest { - private static final String ENCODING = IOUtils.UTF_8.name(); + private static final String ENCODING = UTF_8.name(); //default max char len (at least in WriteOutContentHandler is 100k) private static final int OVER_DEFAULT = 120000; Index: tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java (revision ) @@ -23,8 +23,8 @@ import java.util.HashSet; import java.util.Set; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.mime.MediaType; Index: tika-parsers/pom.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/pom.xml (revision 1696252) +++ tika-parsers/pom.xml (revision ) @@ -328,11 +328,6 @@ httpservices ${netcdf-java.version} - - com.google.guava - guava - 11.0.2 - org.apache.commons Index: tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmPmgiHeader.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmPmgiHeader.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/chm/accessor/ChmPmgiHeader.java (revision ) @@ -19,12 +19,13 @@ import java.util.Arrays; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.chm.assertion.ChmAssert; import org.apache.tika.parser.chm.core.ChmCommons; import org.apache.tika.parser.chm.core.ChmConstants; import org.apache.tika.parser.chm.exception.ChmParsingException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Description Note: not always exists An index chunk has the following format: * 0000: char[4] 'PMGI' 0004: DWORD Length of quickref/free area at end of @@ -54,7 +55,7 @@ private int currentPlace = 0; public ChmPmgiHeader() { - signature = ChmConstants.CHM_PMGI_MARKER.getBytes(IOUtils.UTF_8); /* 0 (PMGI) */ + signature = ChmConstants.CHM_PMGI_MARKER.getBytes(UTF_8); /* 0 (PMGI) */ } private int getDataRemained() { @@ -81,7 +82,7 @@ ChmAssert.assertPositiveInt(count); this.setDataRemained(data.length); index = ChmCommons.indexOf(data, - ChmConstants.CHM_PMGI_MARKER.getBytes(IOUtils.UTF_8)); + ChmConstants.CHM_PMGI_MARKER.getBytes(UTF_8)); if (index >= 0) System.arraycopy(data, index, chmPmgiHeader.getSignature(), 0, count); @@ -149,7 +150,7 @@ */ public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("signature:=" + new String(getSignature(), IOUtils.UTF_8) + ", "); + sb.append("signature:=" + new String(getSignature(), UTF_8) + ", "); sb.append("free space:=" + getFreeSpace() + System.getProperty("line.separator")); return sb.toString(); @@ -167,7 +168,7 @@ /* check structure */ if (!Arrays.equals(chmPmgiHeader.getSignature(), - ChmConstants.CHM_PMGI_MARKER.getBytes(IOUtils.UTF_8))) + ChmConstants.CHM_PMGI_MARKER.getBytes(UTF_8))) throw new TikaException( "it does not seem to be valid a PMGI signature, check ChmItsp index_root if it was -1, means no PMGI, use PMGL insted"); Index: tika-core/src/test/java/org/apache/tika/language/LanguageProfilerBuilderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/test/java/org/apache/tika/language/LanguageProfilerBuilderTest.java (revision 1696252) +++ tika-core/src/test/java/org/apache/tika/language/LanguageProfilerBuilderTest.java (revision ) @@ -17,6 +17,7 @@ package org.apache.tika.language; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -30,7 +31,6 @@ import java.net.URISyntaxException; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.junit.After; import org.junit.Test; @@ -50,7 +50,7 @@ InputStream is = LanguageProfilerBuilderTest.class.getResourceAsStream(corpusName); try { - ngramProfile = LanguageProfilerBuilder.create(profileName, is , IOUtils.UTF_8.name()); + ngramProfile = LanguageProfilerBuilder.create(profileName, is , UTF_8.name()); } finally { is.close(); } @@ -82,7 +82,7 @@ + FILE_EXTENSION)); try { BufferedReader reader = new BufferedReader(new InputStreamReader( - stream, IOUtils.UTF_8)); + stream, UTF_8)); String line = reader.readLine(); while (line != null) { if (line.length() > 0 && !line.startsWith("#")) {// skips the Index: tika-parsers/src/main/java/org/apache/tika/parser/video/FLVParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/video/FLVParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/video/FLVParser.java (revision ) @@ -29,7 +29,6 @@ import java.util.Set; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; @@ -38,6 +37,8 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** *

* Parser for metadata contained in Flash Videos (.flv). Resources: @@ -131,7 +132,7 @@ int size = input.readUnsignedShort(); byte[] chars = new byte[size]; input.readFully(chars); - return new String(chars, IOUtils.UTF_8); + return new String(chars, UTF_8); } private Object readAMFObject(DataInputStream input) throws IOException { Index: tika-example/src/main/java/org/apache/tika/example/DumpTikaConfigExample.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-example/src/main/java/org/apache/tika/example/DumpTikaConfigExample.java (revision 1696252) +++ tika-example/src/main/java/org/apache/tika/example/DumpTikaConfigExample.java (revision ) @@ -41,7 +41,6 @@ import org.apache.tika.detect.DefaultDetector; import org.apache.tika.detect.Detector; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.language.translate.DefaultTranslator; import org.apache.tika.language.translate.Translator; import org.apache.tika.mime.MediaType; @@ -52,7 +51,9 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * This class shows how to dump a TikaConfig object to a configuration file. * This allows users to easily dump the default TikaConfig as a base from which @@ -190,7 +191,7 @@ */ public static void main(String[] args) throws Exception { - Charset encoding = IOUtils.UTF_8; + Charset encoding = UTF_8; Writer writer = null; if (args.length > 0) { writer = new OutputStreamWriter(new FileOutputStream(new File(args[0])), encoding); Index: tika-core/src/main/java/org/apache/tika/io/IOUtils.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/main/java/org/apache/tika/io/IOUtils.java (revision 1696252) +++ tika-core/src/main/java/org/apache/tika/io/IOUtils.java (revision ) @@ -30,10 +30,11 @@ import java.io.StringWriter; import java.io.Writer; import java.nio.channels.Channel; -import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * General IO stream manipulation utilities. *

@@ -77,9 +78,6 @@ */ public class IOUtils { - //TODO: switch to StandardCharsets when we move to Java 1.7 - public static final Charset UTF_8 = Charset.forName("UTF-8"); - /** * The default buffer size to use. */ @@ -258,7 +256,7 @@ */ @Deprecated public static byte[] toByteArray(String input) throws IOException { - return input.getBytes(IOUtils.UTF_8); + return input.getBytes(UTF_8); } // read char[] @@ -396,7 +394,7 @@ */ @Deprecated public static String toString(byte[] input) throws IOException { - return new String(input, IOUtils.UTF_8); + return new String(input, UTF_8); } /** @@ -418,7 +416,7 @@ throws IOException { // If no encoding is specified, default to UTF-8. if (encoding == null) { - return new String(input, IOUtils.UTF_8); + return new String(input, UTF_8); } else { return new String(input, encoding); } @@ -440,7 +438,7 @@ * @since Commons IO 1.1 */ public static List readLines(InputStream input) throws IOException { - InputStreamReader reader = new InputStreamReader(input, IOUtils.UTF_8); + InputStreamReader reader = new InputStreamReader(input, UTF_8); return readLines(reader); } @@ -534,7 +532,7 @@ * @since Commons IO 1.1 */ public static InputStream toInputStream(String input) { - byte[] bytes = input.getBytes(IOUtils.UTF_8); + byte[] bytes = input.getBytes(UTF_8); return new ByteArrayInputStream(bytes); } @@ -552,7 +550,7 @@ * @since Commons IO 1.1 */ public static InputStream toInputStream(String input, String encoding) throws IOException { - byte[] bytes = encoding != null ? input.getBytes(encoding) : input.getBytes(IOUtils.UTF_8); + byte[] bytes = encoding != null ? input.getBytes(encoding) : input.getBytes(UTF_8); return new ByteArrayInputStream(bytes); } @@ -590,7 +588,7 @@ */ public static void write(byte[] data, Writer output) throws IOException { if (data != null) { - output.write(new String(data, IOUtils.UTF_8)); + output.write(new String(data, UTF_8)); } } @@ -658,7 +656,7 @@ public static void write(char[] data, OutputStream output) throws IOException { if (data != null) { - output.write(new String(data).getBytes(IOUtils.UTF_8)); + output.write(new String(data).getBytes(UTF_8)); } } @@ -784,7 +782,7 @@ public static void write(String data, OutputStream output) throws IOException { if (data != null) { - output.write(data.getBytes(IOUtils.UTF_8)); + output.write(data.getBytes(UTF_8)); } } @@ -853,7 +851,7 @@ public static void write(StringBuffer data, OutputStream output) throws IOException { if (data != null) { - output.write(data.toString().getBytes(IOUtils.UTF_8)); + output.write(data.toString().getBytes(UTF_8)); } } @@ -959,7 +957,7 @@ */ public static void copy(InputStream input, Writer output) throws IOException { - InputStreamReader in = new InputStreamReader(input, IOUtils.UTF_8); + InputStreamReader in = new InputStreamReader(input, UTF_8); copy(in, output); } @@ -1066,7 +1064,7 @@ */ public static void copy(Reader input, OutputStream output) throws IOException { - OutputStreamWriter out = new OutputStreamWriter(output, IOUtils.UTF_8); + OutputStreamWriter out = new OutputStreamWriter(output, UTF_8); copy(input, out); // XXX Unless anyone is planning on rewriting OutputStreamWriter, we // have to flush here. Index: tika-core/src/main/java/org/apache/tika/language/LanguageIdentifier.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/main/java/org/apache/tika/language/LanguageIdentifier.java (revision 1696252) +++ tika-core/src/main/java/org/apache/tika/language/LanguageIdentifier.java (revision ) @@ -25,7 +25,7 @@ import java.util.Properties; import java.util.Set; -import org.apache.tika.io.IOUtils; +import static java.nio.charset.StandardCharsets.UTF_8; /** * Identifier of the language that best matches a given content profile. @@ -77,7 +77,7 @@ LanguageIdentifier.class.getResourceAsStream(language + PROFILE_SUFFIX); try { BufferedReader reader = - new BufferedReader(new InputStreamReader(stream, IOUtils.UTF_8)); + new BufferedReader(new InputStreamReader(stream, UTF_8)); String line = reader.readLine(); while (line != null) { if (line.length() > 0 && !line.startsWith("#")) { Index: tika-example/src/main/java/org/apache/tika/example/DirListParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-example/src/main/java/org/apache/tika/example/DirListParser.java (revision 1696252) +++ tika-example/src/main/java/org/apache/tika/example/DirListParser.java (revision ) @@ -32,6 +32,8 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Parses the output of /bin/ls and counts the number of files and the number of * executables using Tika. @@ -75,8 +77,7 @@ Metadata metadata, ParseContext context) throws IOException, SAXException, TikaException { - List lines = FileUtils.readLines( - TikaInputStream.get(is).getFile(), "utf-8"); + List lines = FileUtils.readLines(TikaInputStream.get(is).getFile(), UTF_8); for (String line : lines) { String[] fileToks = line.split("\\s+"); if (fileToks.length < 8) Index: tika-core/src/test/java/org/apache/tika/detect/MagicDetectorTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/test/java/org/apache/tika/detect/MagicDetectorTest.java (revision 1696252) +++ tika-core/src/test/java/org/apache/tika/detect/MagicDetectorTest.java (revision ) @@ -24,6 +24,9 @@ import org.apache.tika.mime.MediaType; import org.junit.Test; +import static java.nio.charset.StandardCharsets.US_ASCII; +import static java.nio.charset.StandardCharsets.UTF_16BE; +import static java.nio.charset.StandardCharsets.UTF_16LE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -35,7 +38,7 @@ @Test public void testDetectNull() throws Exception { MediaType html = new MediaType("text", "html"); - Detector detector = new MagicDetector(html, ""); @@ -58,7 +61,7 @@ public void testDetectOffsetRange() throws Exception { MediaType html = new MediaType("text", "html"); Detector detector = new MagicDetector( - html, ""); @@ -111,7 +114,7 @@ public void testDetectRegExPDF() throws Exception { MediaType pdf = new MediaType("application", "pdf"); Detector detector = new MagicDetector( - pdf, "(?s)\\A.{0,144}%PDF-".getBytes("ASCII"), null, true, 0, 0); + pdf, "(?s)\\A.{0,144}%PDF-".getBytes(US_ASCII), null, true, 0, 0); assertDetect(detector, pdf, "%PDF-1.0"); assertDetect( @@ -136,7 +139,7 @@ + "\".*\\x3ctitle\\x3e.*\\x3c/title\\x3e"; MediaType xhtml = new MediaType("application", "xhtml+xml"); Detector detector = new MagicDetector(xhtml, - pattern.getBytes("ASCII"), null, + pattern.getBytes(US_ASCII), null, true, 0, 8192); assertDetect(detector, xhtml, @@ -171,7 +174,7 @@ MediaType html = new MediaType("text", "html"); Detector detector = new MagicDetector( - html, pattern.getBytes("ASCII"), null, true, 0, 0); + html, pattern.getBytes(US_ASCII), null, true, 0, 0); assertDetect(detector, html, data); assertDetect(detector, html, data1); @@ -180,7 +183,7 @@ @Test public void testDetectStreamReadProblems() throws Exception { - byte[] data = "abcdefghijklmnopqrstuvwxyz0123456789".getBytes("ASCII"); + byte[] data = "abcdefghijklmnopqrstuvwxyz0123456789".getBytes(US_ASCII); MediaType testMT = new MediaType("application", "test"); Detector detector = new MagicDetector(testMT, data, null, false, 0, 0); // Deliberately prevent InputStream.read(...) from reading the entire @@ -197,28 +200,24 @@ // Check regular String matching detector = MagicDetector.parse(testMT, "string", "0:20", "abcd", null); - assertDetect(detector, testMT, data.getBytes("ASCII")); + assertDetect(detector, testMT, data.getBytes(US_ASCII)); detector = MagicDetector.parse(testMT, "string", "0:20", "cdEFGh", null); - assertDetect(detector, testMT, data.getBytes("ASCII")); + assertDetect(detector, testMT, data.getBytes(US_ASCII)); // Check Little Endian and Big Endian utf-16 strings detector = MagicDetector.parse(testMT, "unicodeLE", "0:20", "cdEFGh", null); - assertDetect(detector, testMT, data.getBytes("UTF-16LE")); + assertDetect(detector, testMT, data.getBytes(UTF_16LE)); detector = MagicDetector.parse(testMT, "unicodeBE", "0:20", "cdEFGh", null); - assertDetect(detector, testMT, data.getBytes("UTF-16BE")); + assertDetect(detector, testMT, data.getBytes(UTF_16BE)); // Check case ignoring String matching detector = MagicDetector.parse(testMT, "stringignorecase", "0:20", "BcDeFgHiJKlm", null); - assertDetect(detector, testMT, data.getBytes("ASCII")); + assertDetect(detector, testMT, data.getBytes(US_ASCII)); } private void assertDetect(Detector detector, MediaType type, String data) { - try { - byte[] bytes = data.getBytes("ASCII"); + byte[] bytes = data.getBytes(US_ASCII); - assertDetect(detector, type, bytes); + assertDetect(detector, type, bytes); - } catch (IOException e) { - fail("Unexpected exception from MagicDetector"); - } } private void assertDetect(Detector detector, MediaType type, byte[] bytes) { try { Index: tika-example/src/test/java/org/apache/tika/example/SimpleTypeDetectorTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-example/src/test/java/org/apache/tika/example/SimpleTypeDetectorTest.java (revision 1696252) +++ tika-example/src/test/java/org/apache/tika/example/SimpleTypeDetectorTest.java (revision ) @@ -14,12 +14,12 @@ package org.apache.tika.example; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import java.io.ByteArrayOutputStream; import java.io.PrintStream; -import com.google.common.base.Charsets; import org.junit.Test; @SuppressWarnings("deprecation") @@ -30,14 +30,14 @@ ByteArrayOutputStream buffer = new ByteArrayOutputStream(); PrintStream out = System.out; - System.setOut(new PrintStream(buffer, true, Charsets.UTF_8.name())); + System.setOut(new PrintStream(buffer, true, UTF_8.name())); SimpleTypeDetector.main(new String[] { "pom.xml" }); System.setOut(out); assertEquals("pom.xml: application/xml", - buffer.toString(Charsets.UTF_8.name()).trim()); + buffer.toString(UTF_8.name()).trim()); } } Index: tika-parsers/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java (revision ) @@ -17,6 +17,7 @@ package org.apache.tika.parser.geo.topic; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -25,6 +26,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; + import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.ParseContext; @@ -51,7 +53,7 @@ GeoParserConfig config = new GeoParserConfig(); context.set(GeoParserConfig.class, config); - InputStream s = new ByteArrayInputStream(text.getBytes("UTF-8")); + InputStream s = new ByteArrayInputStream(text.getBytes(UTF_8)); /* if it's not available no tests to run */ if (!((GeoParser) geoparser).isAvailable()) return; @@ -79,7 +81,7 @@ ParseContext context = new ParseContext(); GeoParserConfig config = new GeoParserConfig(); context.set(GeoParserConfig.class, config); - geoparser.parse(new ByteArrayInputStream(text.getBytes("UTF-8")), + geoparser.parse(new ByteArrayInputStream(text.getBytes(UTF_8)), new BodyContentHandler(), metadata, context); assertNull(metadata.get("Geographic_NAME")); assertNull(metadata.get("Geographic_LONGITUDE")); Index: tika-server/src/main/java/org/apache/tika/server/writer/JSONMessageBodyWriter.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-server/src/main/java/org/apache/tika/server/writer/JSONMessageBodyWriter.java (revision 1696252) +++ tika-server/src/main/java/org/apache/tika/server/writer/JSONMessageBodyWriter.java (revision ) @@ -32,10 +32,11 @@ 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 { @@ -53,7 +54,7 @@ MediaType mediaType, MultivaluedMap 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) { Index: tika-batch/src/main/java/org/apache/tika/batch/Interrupter.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-batch/src/main/java/org/apache/tika/batch/Interrupter.java (revision 1696252) +++ tika-batch/src/main/java/org/apache/tika/batch/Interrupter.java (revision ) @@ -22,11 +22,12 @@ import java.io.InputStreamReader; import java.util.concurrent.Callable; -import org.apache.tika.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Class that waits for input on System.in. If the user enters a keystroke on * System.in, this will send a signal to the FileResourceRunner to shutdown gracefully. @@ -39,7 +40,7 @@ private Logger logger = LoggerFactory.getLogger(Interrupter.class); public IFileProcessorFutureResult call(){ try{ - BufferedReader reader = new BufferedReader(new InputStreamReader(System.in, IOUtils.UTF_8)); + BufferedReader reader = new BufferedReader(new InputStreamReader(System.in, UTF_8)); while (true){ if (reader.ready()){ reader.readLine(); Index: tika-translate/src/main/java/org/apache/tika/language/translate/GoogleTranslator.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-translate/src/main/java/org/apache/tika/language/translate/GoogleTranslator.java (revision 1696252) +++ tika-translate/src/main/java/org/apache/tika/language/translate/GoogleTranslator.java (revision ) @@ -31,10 +31,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.language.LanguageIdentifier; import org.apache.tika.language.LanguageProfile; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * An implementation of a REST client to the Google Translate v2 @@ -86,7 +87,7 @@ .query("key", apiKey).query("source", sourceLanguage) .query("target", targetLanguage).query("q", text).get(); BufferedReader reader = new BufferedReader(new InputStreamReader( - (InputStream) response.getEntity(), IOUtils.UTF_8)); + (InputStream) response.getEntity(), UTF_8)); String line = null; StringBuffer responseText = new StringBuffer(); while ((line = reader.readLine()) != null) { Index: tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java (revision 1696252) +++ tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java (revision ) @@ -52,6 +52,9 @@ import java.util.Set; import java.util.TreeSet; +import org.apache.commons.io.FilenameUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.Level; @@ -72,9 +75,6 @@ import org.apache.tika.extractor.EmbeddedDocumentExtractor; import org.apache.tika.fork.ForkParser; import org.apache.tika.gui.TikaGUI; -import org.apache.tika.io.CloseShieldInputStream; -import org.apache.tika.io.FilenameUtils; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.language.LanguageProfilerBuilder; import org.apache.tika.language.ProfilingHandler; @@ -106,6 +106,8 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Simple command line interface for Apache Tika. */ @@ -855,7 +857,7 @@ for (File mf : dir.listFiles()) { if (mf.isFile()) { BufferedReader r = new BufferedReader(new InputStreamReader( - new FileInputStream(mf), IOUtils.UTF_8)); + new FileInputStream(mf), UTF_8)); String line; while ((line = r.readLine()) != null) { if (line.startsWith("!:mime") || @@ -969,7 +971,7 @@ } else if (System.getProperty("os.name") .toLowerCase(Locale.ROOT).startsWith("mac os x")) { // TIKA-324: Override the default encoding on Mac OS X - return new OutputStreamWriter(output, IOUtils.UTF_8); + return new OutputStreamWriter(output, UTF_8); } else { return new OutputStreamWriter(output, Charset.defaultCharset()); } Index: tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.parser.chm; +import static java.nio.charset.StandardCharsets.ISO_8859_1; import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; @@ -150,7 +151,7 @@ } //validate html - String html = new String(data, "ISO-8859-1"); + String html = new String(data, ISO_8859_1); if (! htmlPairP.matcher(html).find()) { System.err.println(lowName + " is invalid."); System.err.println(html); Index: tika-batch/src/main/java/org/apache/tika/batch/fs/strawman/StrawManTikaAppDriver.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-batch/src/main/java/org/apache/tika/batch/fs/strawman/StrawManTikaAppDriver.java (revision 1696252) +++ tika-batch/src/main/java/org/apache/tika/batch/fs/strawman/StrawManTikaAppDriver.java (revision ) @@ -34,7 +34,7 @@ import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.tika.io.IOUtils; +import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MarkerFactory; Index: tika-parsers/src/main/java/org/apache/tika/parser/jdbc/JDBCTableReader.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/jdbc/JDBCTableReader.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/jdbc/JDBCTableReader.java (revision ) @@ -31,12 +31,12 @@ import java.util.LinkedList; import java.util.List; +import org.apache.commons.io.FilenameUtils; +import org.apache.commons.io.IOExceptionWithCause; +import org.apache.commons.io.IOUtils; import org.apache.tika.config.TikaConfig; import org.apache.tika.detect.Detector; import org.apache.tika.extractor.EmbeddedDocumentExtractor; -import org.apache.tika.io.FilenameUtils; -import org.apache.tika.io.IOExceptionWithCause; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Database; import org.apache.tika.metadata.Metadata; @@ -52,6 +52,8 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * General base class to iterate through rows of a JDBC table */ @@ -185,7 +187,7 @@ //is there a more efficient way to go from a Reader to an InputStream? String s = clob.getSubString(0, readSize); EmbeddedDocumentExtractor ex = AbstractDBParser.getEmbeddedDocumentExtractor(context); - ex.parseEmbedded(new ByteArrayInputStream(s.getBytes("UTF-8")), handler, m, true); + ex.parseEmbedded(new ByteArrayInputStream(s.getBytes(UTF_8)), handler, m, true); } protected void handleBlob(String tableName, String columnName, int rowNum, ResultSet resultSet, int columnIndex, Index: tika-server/src/main/java/org/apache/tika/server/resource/LanguageResource.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-server/src/main/java/org/apache/tika/server/resource/LanguageResource.java (revision 1696252) +++ tika-server/src/main/java/org/apache/tika/server/resource/LanguageResource.java (revision ) @@ -25,13 +25,14 @@ 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 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)); Index: tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/XMPPacketScanner.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/XMPPacketScanner.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/XMPPacketScanner.java (revision ) @@ -22,8 +22,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.UnsupportedEncodingException; +import static java.nio.charset.StandardCharsets.US_ASCII; + /** * This class is a parser for XMP packets. By default, it tries to locate the first XMP packet * it finds and parses it. @@ -41,13 +42,9 @@ private static final byte[] PACKET_TRAILER; static { - try { - PACKET_HEADER = "".getBytes("US-ASCII"); - PACKET_TRAILER = "".getBytes(US_ASCII); + PACKET_TRAILER = "UTF-8 =================================================================== --- tika-batch/src/main/java/org/apache/tika/batch/fs/FSBatchProcessCLI.java (revision 1696252) +++ tika-batch/src/main/java/org/apache/tika/batch/fs/FSBatchProcessCLI.java (revision ) @@ -32,12 +32,12 @@ import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; +import org.apache.commons.io.IOUtils; import org.apache.tika.batch.BatchProcess; import org.apache.tika.batch.BatchProcessDriverCLI; import org.apache.tika.batch.ParallelFileProcessingResult; import org.apache.tika.batch.builders.BatchProcessBuilder; import org.apache.tika.batch.builders.CommandLineParserBuilder; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: tika-parsers/src/main/java/org/apache/tika/parser/xml/XMLParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/xml/XMLParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/xml/XMLParser.java (revision ) @@ -23,8 +23,8 @@ import java.util.HashSet; import java.util.Set; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; Index: tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.parser.mp3; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -25,7 +26,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import org.apache.tika.io.IOUtils; + import org.junit.After; import org.junit.Test; @@ -157,7 +158,7 @@ public void testSkipNoCurrentHeader() throws IOException { ByteArrayOutputStream bos = new ByteArrayOutputStream(); - bos.write("This is a test".getBytes(IOUtils.UTF_8)); + bos.write("This is a test".getBytes(UTF_8)); ByteArrayInputStream in = new ByteArrayInputStream(bos.toByteArray()); stream = new MpegStream(in); assertFalse("Wrong result", stream.skipFrame()); Index: tika-parsers/src/main/java/org/apache/tika/parser/mbox/OutlookPSTParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/mbox/OutlookPSTParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/mbox/OutlookPSTParser.java (revision ) @@ -17,6 +17,7 @@ package org.apache.tika.parser.mbox; import static java.lang.String.valueOf; +import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Collections.singleton; import java.io.ByteArrayInputStream; @@ -32,7 +33,6 @@ import org.apache.tika.exception.TikaException; import org.apache.tika.extractor.EmbeddedDocumentExtractor; import org.apache.tika.extractor.ParsingEmbeddedDocumentExtractor; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TemporaryResources; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; @@ -153,7 +153,7 @@ mailMetadata.set("priority", valueOf(pstMail.getPriority())); mailMetadata.set("flagged", valueOf(pstMail.isFlagged())); - byte[] mailContent = pstMail.getBody().getBytes(IOUtils.UTF_8); + byte[] mailContent = pstMail.getBody().getBytes(UTF_8); embeddedExtractor.parseEmbedded(new ByteArrayInputStream(mailContent), handler, mailMetadata, true); } Index: tika-parsers/src/main/java/org/apache/tika/parser/dif/DIFParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/dif/DIFParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/dif/DIFParser.java (revision ) @@ -23,13 +23,12 @@ import java.util.HashSet; import java.util.Set; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; import org.apache.tika.parser.ParseContext; -import org.apache.tika.parser.dif.DIFContentHandler; import org.apache.tika.sax.EmbeddedContentHandler; import org.apache.tika.sax.OfflineContentHandler; import org.apache.tika.sax.TaggedContentHandler; \ No newline at end of file Index: tika-server/src/main/java/org/apache/tika/server/writer/MetadataListMessageBodyWriter.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-server/src/main/java/org/apache/tika/server/writer/MetadataListMessageBodyWriter.java (revision 1696252) +++ tika-server/src/main/java/org/apache/tika/server/writer/MetadataListMessageBodyWriter.java (revision ) @@ -32,10 +32,11 @@ 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 { @@ -56,7 +57,7 @@ MediaType mediaType, MultivaluedMap 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) { Index: tika-core/src/test/java/org/apache/tika/language/LanguageIdentifierTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/test/java/org/apache/tika/language/LanguageIdentifierTest.java (revision 1696252) +++ tika-core/src/test/java/org/apache/tika/language/LanguageIdentifierTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.language; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -175,7 +176,7 @@ InputStream stream = LanguageIdentifierTest.class.getResourceAsStream(language + ".test"); try { - IOUtils.copy(new InputStreamReader(stream, IOUtils.UTF_8), writer); + IOUtils.copy(new InputStreamReader(stream, UTF_8), writer); } finally { stream.close(); } Index: tika-parsers/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java (revision ) @@ -13,6 +13,9 @@ */ package org.apache.tika.parser.strings; +import static java.nio.charset.StandardCharsets.ISO_8859_1; +import static java.nio.charset.StandardCharsets.UTF_8; +import static java.nio.charset.StandardCharsets.UTF_16; import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; @@ -34,11 +37,11 @@ String testStr = "These are Latin1 accented scripts: \u00C2 \u00C3 \u00C9 \u00DC \u00E2 \u00E3 \u00E9 \u00FC"; String smallStr = "ab"; - byte[] iso8859Bytes = testStr.getBytes("ISO-8859-1"); - byte[] utf8Bytes = testStr.getBytes("UTF-8"); - byte[] utf16Bytes = testStr.getBytes("UTF-16"); + byte[] iso8859Bytes = testStr.getBytes(ISO_8859_1); + byte[] utf8Bytes = testStr.getBytes(UTF_8); + byte[] utf16Bytes = testStr.getBytes(UTF_16); byte[] zeros = new byte[10]; - byte[] smallString = smallStr.getBytes("ISO-8859-1"); + byte[] smallString = smallStr.getBytes(ISO_8859_1); byte[] trashBytes = { 0x00, 0x01, 0x02, 0x03, 0x1E, 0x1F, (byte) 0xFF }; ByteArrayOutputStream baos = new ByteArrayOutputStream(); Index: tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java (revision ) @@ -26,6 +26,7 @@ import java.util.Set; import java.util.regex.Pattern; +import org.apache.commons.io.IOUtils; import org.apache.poi.poifs.filesystem.DirectoryEntry; import org.apache.poi.poifs.filesystem.DirectoryNode; import org.apache.poi.poifs.filesystem.DocumentInputStream; @@ -33,7 +34,6 @@ import org.apache.poi.poifs.filesystem.Entry; import org.apache.poi.poifs.filesystem.NPOIFSFileSystem; import org.apache.tika.detect.Detector; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; Index: tika-core/src/main/java/org/apache/tika/detect/TrainedModelDetector.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/main/java/org/apache/tika/detect/TrainedModelDetector.java (revision 1696252) +++ tika-core/src/main/java/org/apache/tika/detect/TrainedModelDetector.java (revision ) @@ -16,7 +16,6 @@ */ package org.apache.tika.detect; -import java.io.BufferedWriter; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -36,6 +35,8 @@ import org.apache.tika.mime.MediaType; import org.apache.tika.io.TemporaryResources; +import static java.nio.charset.StandardCharsets.UTF_8; + public abstract class TrainedModelDetector implements Detector { private final Map MODEL_MAP = new HashMap(); @@ -146,7 +147,7 @@ private synchronized void writeHisto(final float[] histogram) throws IOException { String histPath = new TemporaryResources().createTemporaryFile().getAbsolutePath(); - Writer writer = new OutputStreamWriter(new FileOutputStream(histPath),"UTF-8"); + Writer writer = new OutputStreamWriter(new FileOutputStream(histPath), UTF_8); int n = histogram.length;// excluding the last one for storing the // max value for (int i = 0; i < n; i++) { Index: tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/JempboxExtractor.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/JempboxExtractor.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/JempboxExtractor.java (revision ) @@ -27,15 +27,16 @@ import org.apache.jempbox.xmp.XMPMetadata; import org.apache.jempbox.xmp.XMPSchemaDublinCore; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; import org.xml.sax.InputSource; +import static java.nio.charset.StandardCharsets.UTF_8; + public class JempboxExtractor { // The XMP spec says it must be unicode, but for most file formats it specifies "must be encoded in UTF-8" - private static final String DEFAULT_XMP_CHARSET = IOUtils.UTF_8.name(); + private static final String DEFAULT_XMP_CHARSET = UTF_8.name(); private XMPPacketScanner scanner = new XMPPacketScanner(); private Metadata metadata; Index: tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java (revision 1696252) +++ tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.mime; +import static java.nio.charset.StandardCharsets.US_ASCII; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -225,7 +226,7 @@ // By contents - picks the x one as that sorts later m = new Metadata(); ByteArrayInputStream s = new ByteArrayInputStream( - "Hello, World!".getBytes("ASCII")); + "Hello, World!".getBytes(US_ASCII)); assertEquals(hxw.toString(), this.mimeTypes.detect(s, m).toString()); } catch (Exception e) { fail(e.getMessage()); Index: tika-parsers/src/test/java/org/apache/tika/parser/image/WebPParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/image/WebPParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/image/WebPParserTest.java (revision ) @@ -21,7 +21,7 @@ import java.io.InputStream; -import org.apache.tika.io.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.parser.ParseContext; Index: tika-batch/src/main/java/org/apache/tika/batch/fs/RecursiveParserWrapperFSConsumer.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-batch/src/main/java/org/apache/tika/batch/fs/RecursiveParserWrapperFSConsumer.java (revision 1696252) +++ tika-batch/src/main/java/org/apache/tika/batch/fs/RecursiveParserWrapperFSConsumer.java (revision ) @@ -25,11 +25,11 @@ import java.util.List; import java.util.concurrent.ArrayBlockingQueue; +import org.apache.commons.io.IOUtils; import org.apache.tika.batch.FileResource; import org.apache.tika.batch.OutputStreamFactory; import org.apache.tika.batch.ParserFactory; import org.apache.tika.config.TikaConfig; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.metadata.serialization.JsonMetadataList; Index: tika-batch/src/main/java/org/apache/tika/batch/fs/BasicTikaFSConsumer.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-batch/src/main/java/org/apache/tika/batch/fs/BasicTikaFSConsumer.java (revision 1696252) +++ tika-batch/src/main/java/org/apache/tika/batch/fs/BasicTikaFSConsumer.java (revision ) @@ -22,16 +22,18 @@ import java.io.UnsupportedEncodingException; import java.util.concurrent.ArrayBlockingQueue; +import org.apache.commons.io.IOUtils; import org.apache.tika.batch.FileResource; import org.apache.tika.batch.OutputStreamFactory; import org.apache.tika.batch.ParserFactory; import org.apache.tika.config.TikaConfig; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.ParseContext; import org.apache.tika.parser.Parser; import org.apache.tika.sax.ContentHandlerFactory; import org.xml.sax.ContentHandler; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Basic FileResourceConsumer that reads files from an input * directory and writes content to the output directory. @@ -47,7 +49,7 @@ private final ContentHandlerFactory contentHandlerFactory; private final OutputStreamFactory fsOSFactory; private final TikaConfig config; - private String outputEncoding = IOUtils.UTF_8.toString(); + private String outputEncoding = UTF_8.toString(); public BasicTikaFSConsumer(ArrayBlockingQueue queue, Index: tika-parsers/src/main/java/org/apache/tika/parser/jdbc/AbstractDBParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/jdbc/AbstractDBParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/jdbc/AbstractDBParser.java (revision ) @@ -24,10 +24,10 @@ import java.util.List; import java.util.Set; +import org.apache.commons.io.IOExceptionWithCause; import org.apache.tika.exception.TikaException; import org.apache.tika.extractor.EmbeddedDocumentExtractor; import org.apache.tika.extractor.ParsingEmbeddedDocumentExtractor; -import org.apache.tika.io.IOExceptionWithCause; import org.apache.tika.metadata.Database; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; Index: tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.tika.parser; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -33,7 +34,6 @@ import org.apache.tika.config.TikaConfig; import org.apache.tika.detect.Detector; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.metadata.XMPDM; @@ -390,7 +390,7 @@ public void testSpecificParserList() throws Exception { AutoDetectParser parser = new AutoDetectParser(new MyDetector(), new MyParser()); - InputStream is = new ByteArrayInputStream("test".getBytes(IOUtils.UTF_8)); + InputStream is = new ByteArrayInputStream("test".getBytes(UTF_8)); Metadata metadata = new Metadata(); parser.parse(is, new BodyContentHandler(), metadata, new ParseContext()); Index: tika-parsers/src/main/java/org/apache/tika/parser/mp3/LyricsHandler.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/mp3/LyricsHandler.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/mp3/LyricsHandler.java (revision ) @@ -20,10 +20,12 @@ import java.io.InputStream; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.US_ASCII; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * This is used to parse Lyrics3 tag information * from an MP3 file, if available. @@ -83,12 +85,12 @@ // size including the LYRICSBEGIN but excluding the // length+LYRICS200 at the end. int length = Integer.parseInt( - new String(tagData, lookat-6, 6, IOUtils.UTF_8) + new String(tagData, lookat-6, 6, UTF_8) ); String lyrics = new String( tagData, lookat-length+5, length-11, - "ASCII" + US_ASCII ); // Tags are a 3 letter code, 5 digit length, then data Index: tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java (revision 1696252) +++ tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java (revision ) @@ -47,10 +47,6 @@ import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import java.awt.event.WindowEvent; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; -import java.awt.event.WindowEvent; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -65,10 +61,10 @@ import java.util.Map; import java.util.Set; +import org.apache.commons.io.IOUtils; import org.apache.tika.config.TikaConfig; import org.apache.tika.exception.TikaException; import org.apache.tika.extractor.DocumentSelector; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.serialization.JsonMetadataList; @@ -91,6 +87,8 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Simple Swing GUI for Apache Tika. You can drag and drop files on top * of the window to have them parsed. @@ -481,11 +479,8 @@ URL url = e.getURL(); InputStream stream = url.openStream(); try { - StringWriter writer = new StringWriter(); - IOUtils.copy(stream, writer, IOUtils.UTF_8.name()); - JEditorPane editor = - new JEditorPane("text/plain", writer.toString()); + new JEditorPane("text/plain", IOUtils.toString(stream, UTF_8)); editor.setEditable(false); editor.setBackground(Color.WHITE); editor.setCaretPosition(0); Index: tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java (revision 1696252) +++ tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java (revision ) @@ -56,7 +56,6 @@ 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.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 @@ 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 @@ 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 @@ 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) { Index: tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java (revision ) @@ -16,6 +16,8 @@ */ package org.apache.tika.parser.txt; +import static java.nio.charset.StandardCharsets.ISO_8859_1; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.tika.TikaTest.assertContains; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -23,7 +25,6 @@ import java.io.ByteArrayInputStream; import java.io.StringWriter; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.parser.ParseContext; @@ -48,7 +49,7 @@ Metadata metadata = new Metadata(); StringWriter writer = new StringWriter(); parser.parse( - new ByteArrayInputStream(text.getBytes("ISO-8859-1")), + new ByteArrayInputStream(text.getBytes(ISO_8859_1)), new WriteOutContentHandler(writer), metadata, new ParseContext()); @@ -73,7 +74,7 @@ ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); parser.parse( - new ByteArrayInputStream(text.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(text.getBytes(UTF_8)), handler, metadata, new ParseContext()); assertEquals("text/plain; charset=UTF-8", metadata.get(Metadata.CONTENT_TYPE)); assertEquals("UTF-8", metadata.get(Metadata.CONTENT_ENCODING)); // deprecated @@ -159,14 +160,14 @@ Metadata metadata = new Metadata(); parser.parse( - new ByteArrayInputStream(test2.getBytes("ISO-8859-1")), + new ByteArrayInputStream(test2.getBytes(ISO_8859_1)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("text/plain; charset=ISO-8859-1", metadata.get(Metadata.CONTENT_TYPE)); assertEquals("ISO-8859-1", metadata.get(Metadata.CONTENT_ENCODING)); // deprecated metadata.set(Metadata.CONTENT_TYPE, "text/plain; charset=ISO-8859-15"); parser.parse( - new ByteArrayInputStream(test2.getBytes("ISO-8859-1")), + new ByteArrayInputStream(test2.getBytes(ISO_8859_1)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("text/plain; charset=ISO-8859-15", metadata.get(Metadata.CONTENT_TYPE)); assertEquals("ISO-8859-15", metadata.get(Metadata.CONTENT_ENCODING)); // deprecated @@ -185,7 +186,7 @@ Metadata metadata = new Metadata(); parser.parse( - new ByteArrayInputStream(test2.getBytes("ISO-8859-1")), + new ByteArrayInputStream(test2.getBytes(ISO_8859_1)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("text/plain; charset=ISO-8859-1", metadata.get(Metadata.CONTENT_TYPE)); assertEquals("ISO-8859-1", metadata.get(Metadata.CONTENT_ENCODING)); // deprecated @@ -193,7 +194,7 @@ metadata = new Metadata(); metadata.set(Metadata.CONTENT_TYPE, "text/html; charset=ISO-8859-15"); parser.parse( - new ByteArrayInputStream(test2.getBytes("ISO-8859-1")), + new ByteArrayInputStream(test2.getBytes(ISO_8859_1)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("text/plain; charset=ISO-8859-15", metadata.get(Metadata.CONTENT_TYPE)); assertEquals("ISO-8859-15", metadata.get(Metadata.CONTENT_ENCODING)); // deprecated @@ -224,7 +225,7 @@ metadata.set(TikaCoreProperties.LANGUAGE, "en"); parser.parse( - new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(test.getBytes(UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("en", metadata.get(TikaCoreProperties.LANGUAGE)); @@ -259,7 +260,7 @@ metadata = new Metadata(); writer = new StringWriter(); parser.parse( - new ByteArrayInputStream("hello world".getBytes("ISO-8859-1")), + new ByteArrayInputStream("hello world".getBytes(ISO_8859_1)), new WriteOutContentHandler(writer), metadata, new ParseContext()); @@ -278,7 +279,7 @@ Metadata metadata = new Metadata(); parser.parse( - new ByteArrayInputStream(text.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(text.getBytes(UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("text/plain; charset=ISO-8859-1", metadata.get(Metadata.CONTENT_TYPE)); @@ -286,7 +287,7 @@ // we get back (see TIKA-868) metadata.set(Metadata.CONTENT_TYPE, "application/binary; charset=UTF-8"); parser.parse( - new ByteArrayInputStream(text.getBytes(IOUtils.UTF_8)), + new ByteArrayInputStream(text.getBytes(UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("text/plain; charset=UTF-8", metadata.get(Metadata.CONTENT_TYPE)); } Index: tika-parsers/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java (revision ) @@ -23,8 +23,8 @@ import java.util.Set; import java.nio.charset.Charset; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.detect.AutoDetectReader; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; Index: tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java (revision ) @@ -45,7 +45,6 @@ import org.apache.poi.poifs.filesystem.NPOIFSFileSystem; import org.apache.poi.util.CodePageUtil; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; @@ -61,6 +60,8 @@ import org.apache.tika.sax.XHTMLContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Outlook Message Parser. */ @@ -341,7 +342,7 @@ Charset charset = null; try { charset = detector.detect(new ByteArrayInputStream( - html.getBytes(IOUtils.UTF_8)), EMPTY_METADATA); + html.getBytes(UTF_8)), EMPTY_METADATA); } catch (IOException e) { //swallow } Index: tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java (revision 1696252) +++ tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java (revision ) @@ -19,11 +19,12 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.Reader; -import org.apache.tika.io.IOUtils; + import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; import org.junit.Test; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; public class ParsingReaderTest { @@ -31,7 +32,7 @@ @Test public void testPlainText() throws Exception { String data = "test content"; - InputStream stream = new ByteArrayInputStream(data.getBytes(IOUtils.UTF_8)); + InputStream stream = new ByteArrayInputStream(data.getBytes(UTF_8)); Reader reader = new ParsingReader(stream, "test.txt"); assertEquals('t', reader.read()); assertEquals('e', reader.read()); @@ -54,7 +55,7 @@ @Test public void testXML() throws Exception { String data = "

test content

"; - InputStream stream = new ByteArrayInputStream(data.getBytes(IOUtils.UTF_8)); + InputStream stream = new ByteArrayInputStream(data.getBytes(UTF_8)); Reader reader = new ParsingReader(stream, "test.xml"); assertEquals(' ', (char) reader.read()); assertEquals('t', (char) reader.read()); Index: tika-core/src/main/java/org/apache/tika/detect/MagicDetector.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/main/java/org/apache/tika/detect/MagicDetector.java (revision 1696252) +++ tika-core/src/main/java/org/apache/tika/detect/MagicDetector.java (revision ) @@ -21,14 +21,15 @@ import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.CharBuffer; -import java.nio.charset.Charset; import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; +import static java.nio.charset.StandardCharsets.ISO_8859_1; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Content type detection based on magic bytes, i.e. type-specific patterns * near the beginning of the document input stream. @@ -41,8 +42,6 @@ */ public class MagicDetector implements Detector { - private static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1"); - public static MagicDetector parse( MediaType mediaType, String type, String offset, String value, String mask) { @@ -98,7 +97,7 @@ } else if (type.equals("stringignorecase")) { decoded = decodeString(value.toLowerCase(Locale.ROOT), type); } else if (type.equals("byte")) { - decoded = tmpVal.getBytes(IOUtils.UTF_8); + decoded = tmpVal.getBytes(UTF_8); } else if (type.equals("host16") || type.equals("little16")) { int i = Integer.parseInt(tmpVal, radix); decoded = new byte[] { (byte) (i & 0x00FF), (byte) (i >> 8) }; @@ -394,7 +393,7 @@ flags = Pattern.CASE_INSENSITIVE; } - Pattern p = Pattern.compile(new String(this.pattern, IOUtils.UTF_8), flags); + Pattern p = Pattern.compile(new String(this.pattern, UTF_8), flags); ByteBuffer bb = ByteBuffer.wrap(buffer); CharBuffer result = ISO_8859_1.decode(bb); Index: tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmExtractor.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmExtractor.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmExtractor.java (revision ) @@ -21,8 +21,9 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; + +import org.apache.commons.io.IOUtils; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet; import org.apache.tika.parser.chm.accessor.ChmItsfHeader; import org.apache.tika.parser.chm.accessor.ChmItspHeader; @@ -34,6 +35,8 @@ import org.apache.tika.parser.chm.lzx.ChmBlockInfo; import org.apache.tika.parser.chm.lzx.ChmLzxBlock; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Extracts text from chm file. Enumerates chm entries. */ @@ -172,7 +175,7 @@ int indexOfControlData = getChmDirList().getControlDataIndex(); int indexOfResetData = ChmCommons.indexOfResetTableBlock(getData(), - ChmConstants.LZXC.getBytes(IOUtils.UTF_8)); + ChmConstants.LZXC.getBytes(UTF_8)); byte[] dir_chunk = null; if (indexOfResetData > 0) dir_chunk = ChmCommons.copyOfRange( getData(), indexOfResetData, indexOfResetData Index: tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java (revision 1696252) +++ tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java (revision ) @@ -37,6 +37,8 @@ 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 @@ @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 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(); Index: tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java (revision ) @@ -27,8 +27,8 @@ import java.util.zip.ZipFile; import java.util.zip.ZipInputStream; +import org.apache.commons.io.IOUtils; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; @@ -41,6 +41,8 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * OpenOffice parser */ @@ -180,7 +182,7 @@ if (entry == null) return; if (entry.getName().equals("mimetype")) { - String type = IOUtils.toString(zip, IOUtils.UTF_8.name()); + String type = IOUtils.toString(zip, UTF_8); metadata.set(Metadata.CONTENT_TYPE, type); } else if (entry.getName().equals(META_NAME)) { meta.parse(zip, new DefaultHandler(), metadata, context); Index: tika-parsers/src/main/java/org/apache/tika/parser/geo/topic/NameEntityExtractor.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/geo/topic/NameEntityExtractor.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/geo/topic/NameEntityExtractor.java (revision ) @@ -35,6 +35,8 @@ import org.apache.commons.io.IOUtils; +import static java.nio.charset.StandardCharsets.UTF_8; + public class NameEntityExtractor { private String nerModelPath = null; ArrayList locationNameEntities; @@ -63,7 +65,7 @@ InputStream modelIn = new FileInputStream(nerModelPath); TokenNameFinderModel model = new TokenNameFinderModel(modelIn); NameFinderME nameFinder = new NameFinderME(model); - String[] in = IOUtils.toString(stream, "UTF-8").split(" "); + String[] in = IOUtils.toString(stream, UTF_8).split(" "); Span nameE[] = nameFinder.find(in); Index: tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java (revision 1696252) +++ tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java (revision ) @@ -30,12 +30,12 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.tika.TikaTest; import org.apache.tika.batch.BatchProcess; import org.apache.tika.batch.BatchProcessDriverCLI; import org.apache.tika.batch.ParallelFileProcessingResult; import org.apache.tika.batch.builders.BatchProcessBuilder; -import org.apache.tika.io.IOUtils; import org.junit.AfterClass; import org.junit.BeforeClass; Index: tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java (revision ) @@ -30,9 +30,9 @@ import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream; import org.apache.commons.compress.archivers.zip.ZipFile; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.detect.XmlRootExtractor; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; Index: tika-batch/src/test/java/org/apache/tika/batch/fs/HandlerBuilderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-batch/src/test/java/org/apache/tika/batch/fs/HandlerBuilderTest.java (revision 1696252) +++ tika-batch/src/test/java/org/apache/tika/batch/fs/HandlerBuilderTest.java (revision ) @@ -17,6 +17,7 @@ * limitations under the License. */ +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -26,7 +27,6 @@ import org.apache.commons.io.FileUtils; import org.apache.tika.batch.BatchProcess; import org.apache.tika.batch.ParallelFileProcessingResult; -import org.apache.tika.io.IOUtils; import org.junit.Test; public class HandlerBuilderTest extends FSBatchTestBase { @@ -42,7 +42,7 @@ BatchProcess runner = getNewBatchRunner("/tika-batch-config-test.xml", args); ParallelFileProcessingResult result = run(runner); File outputFile = new File(outputDir, "test0.xml.xml"); - String resultString = FileUtils.readFileToString(outputFile, IOUtils.UTF_8.toString()); + String resultString = FileUtils.readFileToString(outputFile, UTF_8); assertTrue(resultString.contains("")); assertTrue(resultString.contains("")); assertTrue(resultString.contains("This is tika-batch's first test file")); @@ -59,7 +59,7 @@ BatchProcess runner = getNewBatchRunner("/tika-batch-config-test.xml", args); ParallelFileProcessingResult result = run(runner); File outputFile = new File(outputDir, "test0.xml.html"); - String resultString = FileUtils.readFileToString(outputFile, IOUtils.UTF_8.toString()); + String resultString = FileUtils.readFileToString(outputFile, UTF_8); assertTrue(resultString.contains("")); assertFalse(resultString.contains("")); assertTrue(resultString.contains("This is tika-batch's first test file")); @@ -76,7 +76,7 @@ BatchProcess runner = getNewBatchRunner("/tika-batch-config-test.xml", args); ParallelFileProcessingResult result = run(runner); File outputFile = new File(outputDir, "test0.xml.txt"); - String resultString = FileUtils.readFileToString(outputFile, IOUtils.UTF_8.toString()); + String resultString = FileUtils.readFileToString(outputFile, UTF_8); assertFalse(resultString.contains("")); assertFalse(resultString.contains("")); assertTrue(resultString.contains("This is tika-batch's first test file")); @@ -94,7 +94,7 @@ ParallelFileProcessingResult result = run(runner); File outputFile = new File(outputDir, "test0.xml.xml"); - String resultString = FileUtils.readFileToString(outputFile, IOUtils.UTF_8.toString()); + String resultString = FileUtils.readFileToString(outputFile, UTF_8); //this is not ideal. How can we change handlers to writeout whatever //they've gotten so far, up to the writeLimit? assertTrue(resultString.equals("")); @@ -112,7 +112,7 @@ BatchProcess runner = getNewBatchRunner("/tika-batch-config-test.xml", args); ParallelFileProcessingResult result = run(runner); File outputFile = new File(outputDir, "test0.xml.json"); - String resultString = FileUtils.readFileToString(outputFile, IOUtils.UTF_8.toString()); + String resultString = FileUtils.readFileToString(outputFile, UTF_8); assertTrue(resultString.contains("\"author\":\"Nikolai Lobachevsky\"")); assertTrue(resultString.contains("tika-batch\\u0027s first test file")); } Index: tika-core/src/test/java/org/apache/tika/sax/BodyContentHandlerTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/test/java/org/apache/tika/sax/BodyContentHandlerTest.java (revision 1696252) +++ tika-core/src/test/java/org/apache/tika/sax/BodyContentHandlerTest.java (revision ) @@ -16,12 +16,12 @@ */ package org.apache.tika.sax; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; import java.io.ByteArrayOutputStream; import java.io.OutputStream; -import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.junit.Test; @@ -46,7 +46,7 @@ xhtml.element("p", "Test text"); xhtml.endDocument(); - assertEquals("Test text\n", buffer.toString(IOUtils.UTF_8.name())); + assertEquals("Test text\n", buffer.toString(UTF_8.name())); } } Index: tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java (revision 1696252) +++ tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java (revision ) @@ -22,10 +22,10 @@ import java.util.Collections; import java.util.Set; +import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.config.ServiceLoader; import org.apache.tika.detect.AutoDetectReader; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; Index: tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java (revision 1696252) +++ tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java (revision ) @@ -44,6 +44,8 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Parser that uses an external program (like catdoc or pdf2txt) to extract * text content and metadata from a given document. @@ -236,7 +238,7 @@ */ private void extractOutput(InputStream stream, XHTMLContentHandler xhtml) throws SAXException, IOException { - Reader reader = new InputStreamReader(stream, IOUtils.UTF_8); + Reader reader = new InputStreamReader(stream, UTF_8); try { xhtml.startDocument(); xhtml.startElement("p"); @@ -307,7 +309,7 @@ Thread t = new Thread() { public void run() { BufferedReader reader; - reader = new BufferedReader(new InputStreamReader(stream, IOUtils.UTF_8)); + reader = new BufferedReader(new InputStreamReader(stream, UTF_8)); try { String line; while ( (line = reader.readLine()) != null ) {