Author: nick Date: Thu Aug 20 09:59:52 2015 New Revision: 1696747 URL: http://svn.apache.org/r1696747 Log: TIKA-1710 patch from Yaniv Kunda - Use java.nio.charset.StandardCharsets
Modified: tika/trunk/tika-translate/src/main/java/org/apache/tika/language/translate/GoogleTranslator.java tika/trunk/tika-translate/src/main/java/org/apache/tika/language/translate/Lingo24Translator.java 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=1696747&r1=1696746&r2=1696747&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 Thu Aug 20 09:59:52 2015 @@ -31,10 +31,11 @@ import com.fasterxml.jackson.databind.Js 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 <a * href="https://www.googleapis.com/language/translate/v2">Google Translate v2 @@ -86,7 +87,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(), IOUtils.UTF_8)); + (InputStream) response.getEntity(), 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=1696747&r1=1696746&r2=1696747&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 Thu Aug 20 09:59:52 2015 @@ -30,10 +30,11 @@ import com.fasterxml.jackson.databind.Js 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 * <a href="https://developer.lingo24.com/premium-machine-translation-api">Premium MT API v1</a>. @@ -78,7 +79,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(), IOUtils.UTF_8)); + (InputStream) response.getEntity(), UTF_8)); String line = null; StringBuffer responseText = new StringBuffer(); while ((line = reader.readLine()) != null) {