Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mbox/OutlookPSTParser.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mbox/OutlookPSTParser.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mbox/OutlookPSTParser.java (original) +++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mbox/OutlookPSTParser.java Fri Jan 23 19:55:51 2015 @@ -25,9 +25,14 @@ import java.io.IOException; import java.io.InputStream; import java.util.Set; +import com.pff.PSTAttachment; +import com.pff.PSTFile; +import com.pff.PSTFolder; +import com.pff.PSTMessage; 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; @@ -40,11 +45,6 @@ import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; -import com.pff.PSTAttachment; -import com.pff.PSTFile; -import com.pff.PSTFolder; -import com.pff.PSTMessage; - /** * @author Tran Nam Quang * @author hong-thai.nguyen @@ -149,7 +149,7 @@ public class OutlookPSTParser extends Ab mailMetadata.set("priority", valueOf(pstMail.getPriority())); mailMetadata.set("flagged", valueOf(pstMail.isFlagged())); - byte[] mailContent = pstMail.getBody().getBytes("UTF-8"); + byte[] mailContent = pstMail.getBody().getBytes(IOUtils.UTF_8); embeddedExtractor.parseEmbedded(new ByteArrayInputStream(mailContent), handler, mailMetadata, true); }
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/WordExtractor.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/WordExtractor.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/WordExtractor.java (original) +++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/WordExtractor.java Fri Jan 23 19:55:51 2015 @@ -47,6 +47,7 @@ import org.apache.poi.poifs.filesystem.D 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; @@ -234,7 +235,7 @@ public class WordExtractor extends Abstr CharacterRun cr = p.getCharacterRun(j); // FIELD_BEGIN_MARK: - if (cr.text().getBytes("UTF-8")[0] == 0x13) { + if (cr.text().getBytes(IOUtils.UTF_8)[0] == 0x13) { Field field = document.getFields().getFieldByStartOffset(docPart, cr.getStartOffset()); // 58 is an embedded document // 56 is a document link Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp3/LyricsHandler.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp3/LyricsHandler.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp3/LyricsHandler.java (original) +++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp3/LyricsHandler.java Fri Jan 23 19:55:51 2015 @@ -20,6 +20,7 @@ import java.io.IOException; 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; @@ -82,7 +83,7 @@ public class LyricsHandler { // size including the LYRICSBEGIN but excluding the // length+LYRICS200 at the end. int length = Integer.parseInt( - new String(tagData, lookat-6, 6, "UTF-8") + new String(tagData, lookat-6, 6, IOUtils.UTF_8) ); String lyrics = new String( Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java (original) +++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java Fri Jan 23 19:55:51 2015 @@ -20,6 +20,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.Serializable; +import java.util.Locale; import java.util.Properties; /** @@ -211,7 +212,8 @@ public class TesseractOCRConfig implemen try { return Integer.parseInt(p); } catch (Throwable ex) { - throw new RuntimeException(String.format("Cannot parse TesseractOCRConfig variable %s, invalid integer value", property), ex); + throw new RuntimeException(String.format(Locale.ROOT, "Cannot parse TesseractOCRConfig variable %s, invalid integer value", + property), ex); } } Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java (original) +++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java Fri Jan 23 19:55:51 2015 @@ -16,6 +16,8 @@ */ package org.apache.tika.parser.ocr; +import javax.imageio.ImageIO; + import java.awt.Image; import java.awt.image.BufferedImage; import java.io.File; @@ -38,8 +40,6 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.imageio.ImageIO; - import org.apache.tika.exception.TikaException; import org.apache.tika.io.IOUtils; import org.apache.tika.io.TemporaryResources; @@ -282,7 +282,7 @@ public class TesseractOCRParser extends */ private void extractOutput(InputStream stream, XHTMLContentHandler xhtml) throws SAXException, IOException { - Reader reader = new InputStreamReader(stream, "UTF-8"); + Reader reader = new InputStreamReader(stream, IOUtils.UTF_8); xhtml.startDocument(); xhtml.startElement("div"); try { @@ -306,7 +306,7 @@ public class TesseractOCRParser extends private void logStream(final String logType, final InputStream stream, final File file) { new Thread() { public void run() { - Reader reader = new InputStreamReader(stream); + Reader reader = new InputStreamReader(stream, IOUtils.UTF_8); StringBuilder out = new StringBuilder(); char[] buffer = new char[1024]; try { Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java (original) +++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java Fri Jan 23 19:55:51 2015 @@ -178,7 +178,7 @@ public class OpenDocumentParser extends if (entry == null) return; if (entry.getName().equals("mimetype")) { - String type = IOUtils.toString(zip, "UTF-8"); + String type = IOUtils.toString(zip, IOUtils.UTF_8.name()); metadata.set(Metadata.CONTENT_TYPE, type); } else if (entry.getName().equals(META_NAME)) { meta.parse(zip, new DefaultHandler(), metadata, context); Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetector.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetector.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetector.java (original) +++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetector.java Fri Jan 23 19:55:51 2015 @@ -181,7 +181,7 @@ public class ZipContainerDetector implem if (mimetype != null) { InputStream stream = zip.getInputStream(mimetype); try { - return MediaType.parse(IOUtils.toString(stream, "UTF-8")); + return MediaType.parse(IOUtils.toString(stream, IOUtils.UTF_8.name())); } finally { stream.close(); } Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/video/FLVParser.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/video/FLVParser.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/video/FLVParser.java (original) +++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/video/FLVParser.java Fri Jan 23 19:55:51 2015 @@ -29,6 +29,7 @@ import java.util.Map.Entry; 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; @@ -130,7 +131,7 @@ public class FLVParser extends AbstractP int size = input.readUnsignedShort(); byte[] chars = new byte[size]; input.readFully(chars); - return new String(chars, "UTF-8"); + return new String(chars, IOUtils.UTF_8); } private Object readAMFObject(DataInputStream input) throws IOException { Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/embedder/ExternalEmbedderTest.java Fri Jan 23 19:55:51 2015 @@ -37,9 +37,8 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import org.apache.tika.embedder.Embedder; -import org.apache.tika.embedder.ExternalEmbedder; 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,7 +59,7 @@ public class ExternalEmbedderTest { 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 = "UTF-8"; + protected static final String DEFAULT_CHARSET = IOUtils.UTF_8.name(); private static final String COMMAND_METADATA_ARGUMENT_DESCRIPTION = "dc:description"; private static final String TEST_TXT_PATH = "/test-documents/testTXT.txt"; Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java Fri Jan 23 19:55:51 2015 @@ -33,6 +33,7 @@ import java.util.zip.ZipOutputStream; 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; @@ -389,7 +390,7 @@ public class AutoDetectParserTest { public void testSpecificParserList() throws Exception { AutoDetectParser parser = new AutoDetectParser(new MyDetector(), new MyParser()); - InputStream is = new ByteArrayInputStream("test".getBytes("UTF-8")); + InputStream is = new ByteArrayInputStream("test".getBytes(IOUtils.UTF_8)); Metadata metadata = new Metadata(); parser.parse(is, new BodyContentHandler(), metadata, new ParseContext()); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java Fri Jan 23 19:55:51 2015 @@ -16,22 +16,22 @@ */ package org.apache.tika.parser; -import static org.junit.Assert.assertEquals; - 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 org.junit.Assert.assertEquals; + public class ParsingReaderTest { @Test public void testPlainText() throws Exception { String data = "test content"; - InputStream stream = new ByteArrayInputStream(data.getBytes("UTF-8")); + InputStream stream = new ByteArrayInputStream(data.getBytes(IOUtils.UTF_8)); Reader reader = new ParsingReader(stream, "test.txt"); assertEquals('t', reader.read()); assertEquals('e', reader.read()); @@ -54,7 +54,7 @@ public class ParsingReaderTest { @Test public void testXML() throws Exception { String data = "<p>test <span>content</span></p>"; - InputStream stream = new ByteArrayInputStream(data.getBytes("UTF-8")); + InputStream stream = new ByteArrayInputStream(data.getBytes(IOUtils.UTF_8)); Reader reader = new ParsingReader(stream, "test.xml"); assertEquals(' ', (char) reader.read()); assertEquals('t', (char) reader.read()); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java Fri Jan 23 19:55:51 2015 @@ -18,6 +18,7 @@ package org.apache.tika.parser.chm; 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; @@ -67,7 +68,7 @@ public class TestChmBlockInfo { int indexOfControlData = chmDirListCont.getControlDataIndex(); int indexOfResetTable = ChmCommons.indexOfResetTableBlock(data, - ChmConstants.LZXC.getBytes("UTF-8")); + ChmConstants.LZXC.getBytes(IOUtils.UTF_8)); byte[] dir_chunk = null; if (indexOfResetTable > 0) { // dir_chunk = Arrays.copyOfRange( data, indexOfResetTable, Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java Fri Jan 23 19:55:51 2015 @@ -16,16 +16,7 @@ */ package org.apache.tika.parser.chm; -import org.apache.tika.exception.TikaException; -import org.apache.tika.metadata.Metadata; -import org.apache.tika.parser.ParseContext; -import org.apache.tika.parser.Parser; -import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet; -import org.apache.tika.parser.chm.accessor.DirectoryListingEntry; -import org.apache.tika.parser.chm.core.ChmExtractor; -import org.apache.tika.sax.BodyContentHandler; -import org.junit.Test; -import org.xml.sax.SAXException; +import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.File; @@ -36,12 +27,22 @@ import java.net.URL; import java.util.Arrays; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.regex.Pattern; -import static org.junit.Assert.assertTrue; +import org.apache.tika.exception.TikaException; +import org.apache.tika.metadata.Metadata; +import org.apache.tika.parser.ParseContext; +import org.apache.tika.parser.Parser; +import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet; +import org.apache.tika.parser.chm.accessor.DirectoryListingEntry; +import org.apache.tika.parser.chm.core.ChmExtractor; +import org.apache.tika.sax.BodyContentHandler; +import org.junit.Test; +import org.xml.sax.SAXException; public class TestChmExtraction { @@ -130,7 +131,7 @@ public class TestChmExtraction { throw new TikaException("Warning: File name contains a non ascii char : " + directoryListingEntry.getName()); } - final String lowName = directoryListingEntry.getName().toLowerCase(); + final String lowName = directoryListingEntry.getName().toLowerCase(Locale.ROOT); //check duplicate entry name which is seen before. if (names.contains(lowName)) { @@ -149,7 +150,7 @@ public class TestChmExtraction { } //validate html - String html = new String(data); + String html = new String(data, "ISO-8859-1"); if (! htmlPairP.matcher(html).find()) { System.err.println(lowName + " is invalid."); System.err.println(html); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java Fri Jan 23 19:55:51 2015 @@ -19,6 +19,7 @@ package org.apache.tika.parser.chm; 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; @@ -27,8 +28,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.io.UnsupportedEncodingException; - /** * Tests all public methods of the ChmItspHeader * @@ -136,9 +135,9 @@ public class TestChmItspHeader { } @Test - public void testGetSignature() throws UnsupportedEncodingException { + public void testGetSignature() { assertEquals(TestParameters.VP_ISTP_SIGNATURE, new String( - chmItspHeader.getSignature(), "UTF-8")); + chmItspHeader.getSignature(), IOUtils.UTF_8)); } @Test Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java Fri Jan 23 19:55:51 2015 @@ -21,6 +21,7 @@ import static org.junit.Assert.assertNot 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; @@ -64,7 +65,7 @@ public class TestChmLzxState { ChmConstants.CONTROL_DATA); int indexOfResetTable = ChmCommons.indexOfResetTableBlock(data, - ChmConstants.LZXC.getBytes("UTF-8")); + ChmConstants.LZXC.getBytes(IOUtils.UTF_8)); byte[] dir_chunk = null; if (indexOfResetTable > 0) { // dir_chunk = Arrays.copyOfRange( data, indexOfResetTable, Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java Fri Jan 23 19:55:51 2015 @@ -20,6 +20,7 @@ import static org.junit.Assert.assertEqu 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; @@ -29,8 +30,6 @@ import org.apache.tika.parser.chm.core.C import org.junit.Before; import org.junit.Test; -import java.io.UnsupportedEncodingException; - /** * Tests all public methods of ChmLzxcControlData block */ @@ -62,7 +61,7 @@ public class TestChmLzxcControlData { int indexOfControlData = chmDirListCont.getControlDataIndex(); int indexOfResetTable = ChmCommons.indexOfResetTableBlock(data, - ChmConstants.LZXC.getBytes("UTF-8")); + ChmConstants.LZXC.getBytes(IOUtils.UTF_8)); byte[] dir_chunk = null; if (indexOfResetTable > 0) { // dir_chunk = Arrays.copyOfRange( data, indexOfResetTable, @@ -129,16 +128,16 @@ public class TestChmLzxcControlData { } @Test - public void testGetSignature() throws UnsupportedEncodingException { + public void testGetSignature() { assertEquals( - TestParameters.VP_CONTROL_DATA_SIGNATURE.getBytes("UTF-8").length, + TestParameters.VP_CONTROL_DATA_SIGNATURE.getBytes(IOUtils.UTF_8).length, chmLzxcControlData.getSignature().length); } @Test - public void testGetSignaure() throws UnsupportedEncodingException { + public void testGetSignaure() { assertEquals( - TestParameters.VP_CONTROL_DATA_SIGNATURE.getBytes("UTF-8").length, + TestParameters.VP_CONTROL_DATA_SIGNATURE.getBytes(IOUtils.UTF_8).length, chmLzxcControlData.getSignature().length); } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java Fri Jan 23 19:55:51 2015 @@ -20,6 +20,7 @@ package org.apache.tika.parser.chm; 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; @@ -59,7 +60,7 @@ public class TestChmLzxcResetTable { int indexOfControlData = chmDirListCont.getControlDataIndex(); int indexOfResetTable = ChmCommons.indexOfResetTableBlock(data, - ChmConstants.LZXC.getBytes("UTF-8")); + ChmConstants.LZXC.getBytes(IOUtils.UTF_8)); byte[] dir_chunk = null; if (indexOfResetTable > 0) { // dir_chunk = Arrays.copyOfRange( data, indexOfResetTable, Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java Fri Jan 23 19:55:51 2015 @@ -19,14 +19,13 @@ package org.apache.tika.parser.chm; 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; import org.junit.Before; import org.junit.Test; -import java.io.UnsupportedEncodingException; - public class TestPmglHeader { ChmPmglHeader chmPmglHeader = null; @@ -46,9 +45,9 @@ public class TestPmglHeader { } @Test - public void testChmPmglHeaderGet() throws UnsupportedEncodingException { + public void testChmPmglHeaderGet() { assertEquals(TestParameters.VP_PMGL_SIGNATURE, new String( - chmPmglHeader.getSignature(), "UTF-8")); + chmPmglHeader.getSignature(), IOUtils.UTF_8)); } @Test Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java Fri Jan 23 19:55:51 2015 @@ -24,6 +24,7 @@ import java.io.ByteArrayInputStream; 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; @@ -62,7 +63,7 @@ public class SourceCodeParserTest extend assertTrue(textContent.length() > 0); assertTrue(textContent.indexOf("html") < 0); - textContent = getText(new ByteArrayInputStream("public class HelloWorld {}".getBytes("UTF-8")), sourceCodeParser, createMetadata("text/x-java-source")); + textContent = getText(new ByteArrayInputStream("public class HelloWorld {}".getBytes(IOUtils.UTF_8)), sourceCodeParser, createMetadata("text/x-java-source")); assertTrue(textContent.length() > 0); assertTrue(textContent.indexOf("html") < 0); } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java Fri Jan 23 19:55:51 2015 @@ -22,6 +22,11 @@ import static org.junit.Assert.assertFal import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.sax.SAXTransformerFactory; +import javax.xml.transform.sax.TransformerHandler; +import javax.xml.transform.stream.StreamResult; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -30,14 +35,9 @@ import java.io.Writer; import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; - -import javax.xml.transform.OutputKeys; -import javax.xml.transform.sax.SAXTransformerFactory; -import javax.xml.transform.sax.TransformerHandler; -import javax.xml.transform.stream.StreamResult; - 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; @@ -161,7 +161,7 @@ public class HtmlParserTest { public void testCharactersDirectlyUnderBodyElement() throws Exception { String test = "<html><body>test</body></html>"; String content = new Tika().parseToString( - new ByteArrayInputStream(test.getBytes("UTF-8"))); + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8))); assertEquals("test", content); } @@ -218,7 +218,7 @@ public class HtmlParserTest { + "<body><a href=\"" + relative + "\">test</a></body></html>"; final List<String> links = new ArrayList<String>(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), new DefaultHandler() { @Override public void startElement( @@ -243,7 +243,7 @@ public class HtmlParserTest { String test = "<html><body><table><tr><td>a</td><td>b</td></table></body></html>"; String content = new Tika().parseToString( - new ByteArrayInputStream(test.getBytes("UTF-8"))); + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8))); assertContains("a", content); assertContains("b", content); assertFalse(content.contains("ab")); @@ -294,7 +294,7 @@ public class HtmlParserTest { "<html><head><title>\u017d</title></head><body></body></html>"; Metadata metadata = new Metadata(); new HtmlParser().parse ( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("\u017d", metadata.get(TikaCoreProperties.TITLE)); } @@ -311,7 +311,7 @@ public class HtmlParserTest { Metadata metadata = new Metadata(); new HtmlParser().parse ( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("UTF-8", metadata.get(Metadata.CONTENT_ENCODING)); @@ -353,7 +353,7 @@ public class HtmlParserTest { Metadata metadata = new Metadata(); metadata.add(Metadata.CONTENT_LANGUAGE, "en"); new HtmlParser().parse ( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("en", metadata.get(Metadata.CONTENT_LANGUAGE)); @@ -401,7 +401,7 @@ public class HtmlParserTest { Metadata metadata = new Metadata(); new HtmlParser().parse ( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("UTF-8", metadata.get(Metadata.CONTENT_ENCODING)); @@ -463,7 +463,7 @@ public class HtmlParserTest { StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), makeHtmlTransformer(sw), new Metadata(), new ParseContext()); String result = sw.toString(); @@ -500,7 +500,7 @@ public class HtmlParserTest { StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), makeHtmlTransformer(sw), new Metadata(), new ParseContext()); String result = sw.toString(); @@ -521,7 +521,7 @@ public class HtmlParserTest { StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), makeHtmlTransformer(sw), new Metadata(), new ParseContext()); String result = sw.toString(); @@ -543,7 +543,7 @@ public class HtmlParserTest { StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), makeHtmlTransformer(sw), new Metadata(), new ParseContext()); String result = sw.toString(); @@ -566,7 +566,7 @@ public class HtmlParserTest { StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), makeHtmlTransformer(sw), new Metadata(), new ParseContext()); String result = sw.toString(); @@ -589,7 +589,7 @@ public class HtmlParserTest { StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), makeHtmlTransformer(sw), new Metadata(), new ParseContext()); String result = sw.toString(); @@ -615,7 +615,7 @@ public class HtmlParserTest { StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), makeHtmlTransformer(sw), metadata, new ParseContext()); String result = sw.toString(); @@ -637,7 +637,7 @@ public class HtmlParserTest { StringWriter sw1 = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test1.getBytes("UTF-8")), + new ByteArrayInputStream(test1.getBytes(IOUtils.UTF_8)), makeHtmlTransformer(sw1), new Metadata(), new ParseContext()); String result = sw1.toString(); @@ -658,7 +658,7 @@ public class HtmlParserTest { StringWriter sw2 = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test2.getBytes("UTF-8")), + new ByteArrayInputStream(test2.getBytes(IOUtils.UTF_8)), makeHtmlTransformer(sw2), new Metadata(), new ParseContext()); result = sw2.toString(); @@ -710,7 +710,7 @@ public class HtmlParserTest { StringWriter sw = new StringWriter(); new HtmlParser().parse( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), makeHtmlTransformer(sw), new Metadata(), new ParseContext()); String result = sw.toString(); @@ -792,7 +792,7 @@ public class HtmlParserTest { StringWriter sw = new StringWriter(); new HtmlParser().parse ( - new ByteArrayInputStream(html.getBytes("UTF-8")), + new ByteArrayInputStream(html.getBytes(IOUtils.UTF_8)), makeHtmlTransformer(sw), metadata, parseContext); String result = sw.toString(); @@ -813,7 +813,7 @@ public class HtmlParserTest { BodyContentHandler handler = new BodyContentHandler(); new HtmlParser().parse( - new ByteArrayInputStream(html.getBytes("UTF-8")), + new ByteArrayInputStream(html.getBytes(IOUtils.UTF_8)), handler, new Metadata(), new ParseContext()); // Make sure we get <tab>, "one", newline, newline @@ -1010,7 +1010,7 @@ public class HtmlParserTest { Metadata metadata = new Metadata(); new HtmlParser().parse ( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); //Expecting first title to be set in meta data and second one to be ignored. Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java Fri Jan 23 19:55:51 2015 @@ -20,6 +20,7 @@ import javax.xml.transform.OutputKeys; import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; + import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.PrintStream; @@ -27,9 +28,9 @@ import java.io.StringWriter; import java.util.HashMap; import java.util.Locale; import java.util.Map; - 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; @@ -1035,13 +1036,13 @@ public class OOXMLParserTest extends Tik //grab stderr ByteArrayOutputStream errContent = new ByteArrayOutputStream(); - System.setErr(new PrintStream(errContent, true, "UTF-8")); + System.setErr(new PrintStream(errContent, true, IOUtils.UTF_8.name())); parser.parse(input, handler, metadata, context); //return stderr System.setErr(origErr); - String err = errContent.toString("UTF-8"); + String err = errContent.toString(IOUtils.UTF_8.name()); assertTrue(err.length() == 0); input.close(); } Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp3/MpegStreamTest.java Fri Jan 23 19:55:51 2015 @@ -25,7 +25,7 @@ import java.io.ByteArrayInputStream; 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 +157,7 @@ public class MpegStreamTest public void testSkipNoCurrentHeader() throws IOException { ByteArrayOutputStream bos = new ByteArrayOutputStream(); - bos.write("This is a test".getBytes("UTF-8")); + bos.write("This is a test".getBytes(IOUtils.UTF_8)); ByteArrayInputStream in = new ByteArrayInputStream(bos.toByteArray()); stream = new MpegStream(in); assertFalse("Wrong result", stream.skipFrame()); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java Fri Jan 23 19:55:51 2015 @@ -124,7 +124,7 @@ public class Seven7ParserTest extends Ab assertTrue("Modified at " + mod, mod.startsWith("20")); } } - + @Test public void testPasswordProtected() throws Exception { Parser parser = new AutoDetectParser(); Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java (original) +++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java Fri Jan 23 19:55:51 2015 @@ -23,6 +23,7 @@ import static org.junit.Assert.assertNul 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; @@ -72,7 +73,7 @@ public class TXTParserTest { ContentHandler handler = new BodyContentHandler(); Metadata metadata = new Metadata(); parser.parse( - new ByteArrayInputStream(text.getBytes("UTF-8")), + new ByteArrayInputStream(text.getBytes(IOUtils.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 @@ -223,7 +224,7 @@ public class TXTParserTest { metadata.set(TikaCoreProperties.LANGUAGE, "en"); parser.parse( - new ByteArrayInputStream(test.getBytes("UTF-8")), + new ByteArrayInputStream(test.getBytes(IOUtils.UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("en", metadata.get(TikaCoreProperties.LANGUAGE)); @@ -277,7 +278,7 @@ public class TXTParserTest { Metadata metadata = new Metadata(); parser.parse( - new ByteArrayInputStream(text.getBytes("UTF-8")), + new ByteArrayInputStream(text.getBytes(IOUtils.UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("text/plain; charset=ISO-8859-1", metadata.get(Metadata.CONTENT_TYPE)); @@ -285,7 +286,7 @@ public class TXTParserTest { // we get back (see TIKA-868) metadata.set(Metadata.CONTENT_TYPE, "application/binary; charset=UTF-8"); parser.parse( - new ByteArrayInputStream(text.getBytes("UTF-8")), + new ByteArrayInputStream(text.getBytes(IOUtils.UTF_8)), new BodyContentHandler(), metadata, new ParseContext()); assertEquals("text/plain; charset=UTF-8", metadata.get(Metadata.CONTENT_TYPE)); } Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/CSVMessageBodyWriter.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/CSVMessageBodyWriter.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-server/src/main/java/org/apache/tika/server/CSVMessageBodyWriter.java (original) +++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/CSVMessageBodyWriter.java Fri Jan 23 19:55:51 2015 @@ -17,8 +17,6 @@ package org.apache.tika.server; -import org.apache.tika.metadata.Metadata; - import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; @@ -35,6 +33,8 @@ import java.util.ArrayList; import java.util.Arrays; import au.com.bytecode.opencsv.CSVWriter; +import org.apache.tika.io.IOUtils; +import org.apache.tika.metadata.Metadata; @Provider @Produces("text/csv") @@ -54,7 +54,7 @@ public class CSVMessageBodyWriter implem MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException { - CSVWriter writer = new CSVWriter(new OutputStreamWriter(entityStream, "UTF-8")); + CSVWriter writer = new CSVWriter(new OutputStreamWriter(entityStream, IOUtils.UTF_8)); for (String name : metadata.names()) { String[] values = metadata.getValues(name); Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/HTMLHelper.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/HTMLHelper.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-server/src/main/java/org/apache/tika/server/HTMLHelper.java (original) +++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/HTMLHelper.java Fri Jan 23 19:55:51 2015 @@ -40,7 +40,7 @@ public class HTMLHelper { throw new IllegalArgumentException("Template Not Found - " + PATH); } try { - String html = IOUtils.toString(htmlStr, "UTF-8"); + String html = IOUtils.toString(htmlStr, IOUtils.UTF_8.name()); int bodyAt = html.indexOf(BODY_VAR); PRE_BODY = html.substring(0, bodyAt); POST_BODY = html.substring(bodyAt + BODY_VAR.length()); Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/JSONMessageBodyWriter.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/JSONMessageBodyWriter.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-server/src/main/java/org/apache/tika/server/JSONMessageBodyWriter.java (original) +++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/JSONMessageBodyWriter.java Fri Jan 23 19:55:51 2015 @@ -17,10 +17,6 @@ package org.apache.tika.server; -import org.apache.tika.exception.TikaException; -import org.apache.tika.metadata.Metadata; -import org.apache.tika.metadata.serialization.JsonMetadata; - import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; @@ -35,6 +31,11 @@ import java.io.Writer; import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import org.apache.tika.exception.TikaException; +import org.apache.tika.io.IOUtils; +import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.serialization.JsonMetadata; + @Provider @Produces(MediaType.APPLICATION_JSON) public class JSONMessageBodyWriter implements MessageBodyWriter<Metadata> { @@ -52,7 +53,7 @@ public class JSONMessageBodyWriter imple MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException { try { - Writer writer = new OutputStreamWriter(entityStream, "UTF-8"); + Writer writer = new OutputStreamWriter(entityStream, IOUtils.UTF_8); JsonMetadata.toJson(metadata, writer); writer.flush(); } catch (TikaException e) { Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/MetadataListMessageBodyWriter.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/MetadataListMessageBodyWriter.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-server/src/main/java/org/apache/tika/server/MetadataListMessageBodyWriter.java (original) +++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/MetadataListMessageBodyWriter.java Fri Jan 23 19:55:51 2015 @@ -17,15 +17,13 @@ package org.apache.tika.server; -import org.apache.tika.exception.TikaException; -import org.apache.tika.metadata.serialization.JsonMetadataList; - import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; + import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -33,6 +31,10 @@ import java.io.Writer; import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import org.apache.tika.exception.TikaException; +import org.apache.tika.io.IOUtils; +import org.apache.tika.metadata.serialization.JsonMetadataList; + @Provider @Produces(MediaType.APPLICATION_JSON) public class MetadataListMessageBodyWriter implements MessageBodyWriter<MetadataList> { @@ -53,7 +55,7 @@ public class MetadataListMessageBodyWrit MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException { try { - Writer writer = new OutputStreamWriter(entityStream, "UTF-8"); + Writer writer = new OutputStreamWriter(entityStream, IOUtils.UTF_8); JsonMetadataList.toJson(list.getMetadata(), writer); writer.flush(); } catch (TikaException e) { Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/TextMessageBodyWriter.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/TextMessageBodyWriter.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-server/src/main/java/org/apache/tika/server/TextMessageBodyWriter.java (original) +++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/TextMessageBodyWriter.java Fri Jan 23 19:55:51 2015 @@ -17,23 +17,22 @@ package org.apache.tika.server; -import au.com.bytecode.opencsv.CSVWriter; -import org.apache.tika.metadata.Metadata; - import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; + import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Arrays; + +import org.apache.tika.io.IOUtils; +import org.apache.tika.metadata.Metadata; /** * Returns simple text string for a particular metadata value. @@ -63,7 +62,7 @@ public class TextMessageBodyWriter imple if (metadata.names().length != 1) { throw new WebApplicationException("Metadata object must only have one entry!"); } - Writer writer = new OutputStreamWriter(entityStream, "UTF-8"); + Writer writer = new OutputStreamWriter(entityStream, IOUtils.UTF_8); for (String name : metadata.names()) { writer.write(metadata.get(name)); Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java (original) +++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java Fri Jan 23 19:55:51 2015 @@ -57,6 +57,7 @@ import org.apache.tika.config.TikaConfig import org.apache.tika.detect.Detector; import org.apache.tika.exception.EncryptedDocumentException; 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; @@ -179,7 +180,8 @@ public class TikaResource { field.setBoolean(object, Boolean.parseBoolean(httpHeaders.getFirst(key))); } } catch (Throwable ex) { - throw new WebApplicationException(String.format("%s is an invalid %s header", key, X_TIKA_OCR_HEADER_PREFIX)); + throw new WebApplicationException(String.format(Locale.ROOT, + "%s is an invalid %s header", key, X_TIKA_OCR_HEADER_PREFIX)); } } @@ -256,7 +258,7 @@ public static void fillMetadata(AutoDete return new StreamingOutput() { public void write(OutputStream outputStream) throws IOException, WebApplicationException { - Writer writer = new OutputStreamWriter(outputStream, "UTF-8"); + Writer writer = new OutputStreamWriter(outputStream, IOUtils.UTF_8); BodyContentHandler body = new BodyContentHandler(new RichTextContentHandler(writer)); @@ -346,7 +348,7 @@ public static void fillMetadata(AutoDete return new StreamingOutput() { public void write(OutputStream outputStream) throws IOException, WebApplicationException { - Writer writer = new OutputStreamWriter(outputStream, "UTF-8"); + Writer writer = new OutputStreamWriter(outputStream, IOUtils.UTF_8); ContentHandler content; try { @@ -354,7 +356,7 @@ public static void fillMetadata(AutoDete TransformerHandler handler = factory.newTransformerHandler( ); handler.getTransformer().setOutputProperty(OutputKeys.METHOD, format); handler.getTransformer().setOutputProperty(OutputKeys.INDENT, "yes"); - handler.getTransformer().setOutputProperty(OutputKeys.ENCODING, "UTF-8"); + handler.getTransformer().setOutputProperty(OutputKeys.ENCODING, IOUtils.UTF_8.name()); handler.setResult(new StreamResult(writer)); content = new ExpandedTitleContentHandler( handler ); } Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java (original) +++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java Fri Jan 23 19:55:51 2015 @@ -17,6 +17,15 @@ package org.apache.tika.server; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriInfo; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -29,15 +38,6 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; - import au.com.bytecode.opencsv.CSVWriter; import org.apache.commons.lang.mutable.MutableInt; import org.apache.commons.logging.Log; @@ -116,7 +116,7 @@ public class UnpackerResource { ByteArrayOutputStream text = new ByteArrayOutputStream(); if (saveAll) { - ch = new BodyContentHandler(new RichTextContentHandler(new OutputStreamWriter(text, "UTF-8"))); + ch = new BodyContentHandler(new RichTextContentHandler(new OutputStreamWriter(text, org.apache.tika.io.IOUtils.UTF_8))); } else { ch = new DefaultHandler(); } @@ -155,7 +155,7 @@ public class UnpackerResource { } public static void metadataToCsv(Metadata metadata, OutputStream outputStream) throws IOException { - CSVWriter writer = new CSVWriter(new OutputStreamWriter(outputStream, "UTF-8")); + CSVWriter writer = new CSVWriter(new OutputStreamWriter(outputStream, org.apache.tika.io.IOUtils.UTF_8)); for (String name : metadata.names()) { String[] values = metadata.getValues(name); Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/XMPMessageBodyWriter.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/XMPMessageBodyWriter.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-server/src/main/java/org/apache/tika/server/XMPMessageBodyWriter.java (original) +++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/XMPMessageBodyWriter.java Fri Jan 23 19:55:51 2015 @@ -17,16 +17,13 @@ package org.apache.tika.server; -import org.apache.tika.exception.TikaException; -import org.apache.tika.metadata.Metadata; -import org.apache.tika.xmp.XMPMetadata; - import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; + import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -34,6 +31,11 @@ import java.io.Writer; import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import org.apache.tika.exception.TikaException; +import org.apache.tika.io.IOUtils; +import org.apache.tika.metadata.Metadata; +import org.apache.tika.xmp.XMPMetadata; + @Provider @Produces("application/rdf+xml") public class XMPMessageBodyWriter implements MessageBodyWriter<Metadata> { @@ -53,7 +55,7 @@ public class XMPMessageBodyWriter implem MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException { try { - Writer writer = new OutputStreamWriter(entityStream, "UTF-8"); + Writer writer = new OutputStreamWriter(entityStream, IOUtils.UTF_8); XMPMetadata xmp = new XMPMetadata(metadata); writer.write(xmp.toString()); writer.flush(); Modified: tika/trunk/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java (original) +++ tika/trunk/tika-server/src/test/java/org/apache/tika/server/CXFTestBase.java Fri Jan 23 19:55:51 2015 @@ -17,8 +17,8 @@ package org.apache.tika.server; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; import java.io.File; @@ -126,7 +126,7 @@ public abstract class CXFTestBase { zip.close(); tempFile.delete(); - return bos.toString("UTF-8"); + return bos.toString(IOUtils.UTF_8.name()); } protected Map<String, String> readArchiveFromStream(ArchiveInputStream zip) throws IOException { Modified: tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java (original) +++ tika/trunk/tika-server/src/test/java/org/apache/tika/server/MetadataResourceTest.java Fri Jan 23 19:55:51 2015 @@ -17,24 +17,20 @@ package org.apache.tika.server; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import au.com.bytecode.opencsv.CSVReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; -import java.io.StringWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.client.WebClient; @@ -44,7 +40,8 @@ import org.apache.tika.metadata.serializ import org.junit.Assert; import org.junit.Test; -import au.com.bytecode.opencsv.CSVReader; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; public class MetadataResourceTest extends CXFTestBase { private static final String META_PATH = "/meta"; @@ -75,7 +72,7 @@ public class MetadataResourceTest extend .put(ClassLoader .getSystemResourceAsStream(TikaResourceTest.TEST_DOC)); - Reader reader = new InputStreamReader((InputStream) response.getEntity(), "UTF-8"); + Reader reader = new InputStreamReader((InputStream) response.getEntity(), org.apache.tika.io.IOUtils.UTF_8); CSVReader csvReader = new CSVReader(reader); @@ -125,7 +122,7 @@ public class MetadataResourceTest extend assertEquals(200, response.getStatus()); // Check results - Reader reader = new InputStreamReader((InputStream) response.getEntity(), "UTF-8"); + Reader reader = new InputStreamReader((InputStream) response.getEntity(), org.apache.tika.io.IOUtils.UTF_8); CSVReader csvReader = new CSVReader(reader); Map<String, String> metadata = new HashMap<String, String>(); @@ -149,7 +146,7 @@ public class MetadataResourceTest extend .put(ClassLoader .getSystemResourceAsStream(TikaResourceTest.TEST_DOC)); - Reader reader = new InputStreamReader((InputStream) response.getEntity(), "UTF-8"); + Reader reader = new InputStreamReader((InputStream) response.getEntity(), org.apache.tika.io.IOUtils.UTF_8); Metadata metadata = JsonMetadata.fromJson(reader); assertNotNull(metadata.get("Author")); @@ -207,7 +204,8 @@ public class MetadataResourceTest extend Response response = WebClient.create(endPoint + META_PATH + "/Author").type("application/msword") .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())); + Metadata metadata = JsonMetadata.fromJson(new InputStreamReader( + (InputStream)response.getEntity(), org.apache.tika.io.IOUtils.UTF_8)); assertEquals("Maxim Valyanskiy", metadata.get("Author")); assertEquals(1, metadata.names().length); } Modified: tika/trunk/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java (original) +++ tika/trunk/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java Fri Jan 23 19:55:51 2015 @@ -17,19 +17,20 @@ package org.apache.tika.server; -import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; -import org.apache.cxf.jaxrs.client.WebClient; -import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; -import org.apache.tika.metadata.Metadata; -import org.apache.tika.metadata.serialization.JsonMetadataList; -import org.junit.Test; - import javax.ws.rs.core.Response; + import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.util.ArrayList; import java.util.List; +import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; +import org.apache.cxf.jaxrs.client.WebClient; +import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; +import org.apache.tika.io.IOUtils; +import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.serialization.JsonMetadataList; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -60,7 +61,7 @@ public class RecursiveMetadataResourceTe .put(ClassLoader .getSystemResourceAsStream(TEST_RECURSIVE_DOC)); - Reader reader = new InputStreamReader((InputStream) response.getEntity(), "UTF-8"); + Reader reader = new InputStreamReader((InputStream) response.getEntity(), IOUtils.UTF_8); List<Metadata> metadataList = JsonMetadataList.fromJson(reader); assertEquals(11, metadataList.size()); @@ -92,7 +93,7 @@ public class RecursiveMetadataResourceTe assertEquals(200, response.getStatus()); // Check results - Reader reader = new InputStreamReader((InputStream) response.getEntity(), "UTF-8"); + Reader reader = new InputStreamReader((InputStream) response.getEntity(), IOUtils.UTF_8); List<Metadata> metadataList = JsonMetadataList.fromJson(reader); assertNotNull(metadataList.get(0).get("Author")); assertEquals("pavel", metadataList.get(0).get("Author")); Modified: tika/trunk/tika-translate/src/main/java/org/apache/tika/language/translate/GoogleTranslator.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-translate/src/main/java/org/apache/tika/language/translate/GoogleTranslator.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-translate/src/main/java/org/apache/tika/language/translate/GoogleTranslator.java (original) +++ tika/trunk/tika-translate/src/main/java/org/apache/tika/language/translate/GoogleTranslator.java Fri Jan 23 19:55:51 2015 @@ -17,22 +17,22 @@ package org.apache.tika.language.translate; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; import java.util.Properties; import java.util.logging.Logger; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.cxf.jaxrs.client.WebClient; +import org.apache.tika.io.IOUtils; import org.apache.tika.language.LanguageIdentifier; import org.apache.tika.language.LanguageProfile; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * An implementation of a REST client to the <a * href="https://www.googleapis.com/language/translate/v2";>Google Translate v2 @@ -85,7 +85,7 @@ public class GoogleTranslator implements .query("key", apiKey).query("source", sourceLanguage) .query("target", targetLanguage).query("q", text).get(); BufferedReader reader = new BufferedReader(new InputStreamReader( - (InputStream) response.getEntity(), "UTF-8")); + (InputStream) response.getEntity(), IOUtils.UTF_8)); String line = null; StringBuffer responseText = new StringBuffer(); while ((line = reader.readLine()) != null) { Modified: tika/trunk/tika-translate/src/main/java/org/apache/tika/language/translate/Lingo24Translator.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-translate/src/main/java/org/apache/tika/language/translate/Lingo24Translator.java?rev=1654351&r1=1654350&r2=1654351&view=diff ============================================================================== --- tika/trunk/tika-translate/src/main/java/org/apache/tika/language/translate/Lingo24Translator.java (original) +++ tika/trunk/tika-translate/src/main/java/org/apache/tika/language/translate/Lingo24Translator.java Fri Jan 23 19:55:51 2015 @@ -17,20 +17,22 @@ package org.apache.tika.language.translate; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.cxf.jaxrs.client.WebClient; -import org.apache.tika.exception.TikaException; -import org.apache.tika.language.LanguageIdentifier; -import org.apache.tika.language.LanguageProfile; - import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; import java.util.Properties; +import com.fasterxml.jackson.databind.JsonNode; +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; + /** * An implementation of a REST client for the * <a href="https://developer.lingo24.com/premium-machine-translation-api";>Premium MT API v1</a>. @@ -76,7 +78,7 @@ public class Lingo24Translator implement .query("user_key", userKey).query("source", sourceLanguage) .query("target", targetLanguage).query("q", text).get(); BufferedReader reader = new BufferedReader(new InputStreamReader( - (InputStream) response.getEntity(), "UTF-8")); + (InputStream) response.getEntity(), IOUtils.UTF_8)); String line = null; StringBuffer responseText = new StringBuffer(); while ((line = reader.readLine()) != null) {
