Repository: tika Updated Branches: refs/heads/master 28b9a6667 -> 08e38bb64
TIKA-1869 update Jackson to latest version 2.7.1 Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/13d772ab Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/13d772ab Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/13d772ab Branch: refs/heads/master Commit: 13d772ab6317c6151b4b4e6111b80af2bd30cd7b Parents: 28b9a66 Author: John Patrick <[email protected]> Authored: Wed Feb 24 13:19:53 2016 +0000 Committer: John Patrick <[email protected]> Committed: Wed Feb 24 13:19:53 2016 +0000 ---------------------------------------------------------------------- tika-translate/pom.xml | 2 +- .../language/translate/CachedTranslator.java | 25 ++++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/13d772ab/tika-translate/pom.xml ---------------------------------------------------------------------- diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml index 187b5c5..7d7d879 100644 --- a/tika-translate/pom.xml +++ b/tika-translate/pom.xml @@ -54,7 +54,7 @@ <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.4.0</version> + <version>2.7.1</version> </dependency> <!-- Test dependencies --> http://git-wip-us.apache.org/repos/asf/tika/blob/13d772ab/tika-translate/src/main/java/org/apache/tika/language/translate/CachedTranslator.java ---------------------------------------------------------------------- diff --git a/tika-translate/src/main/java/org/apache/tika/language/translate/CachedTranslator.java b/tika-translate/src/main/java/org/apache/tika/language/translate/CachedTranslator.java index 5a771a1..e561f0b 100644 --- a/tika-translate/src/main/java/org/apache/tika/language/translate/CachedTranslator.java +++ b/tika-translate/src/main/java/org/apache/tika/language/translate/CachedTranslator.java @@ -17,14 +17,14 @@ package org.apache.tika.language.translate; -import com.fasterxml.jackson.databind.util.LRUMap; +import java.io.IOException; +import java.util.HashMap; import org.apache.tika.exception.TikaException; import org.apache.tika.language.LanguageIdentifier; import org.apache.tika.language.LanguageProfile; -import java.io.IOException; -import java.util.HashMap; +import com.fasterxml.jackson.databind.util.LRUMap; /** * CachedTranslator. Saves a map of previous translations in order to prevent repetitive translation requests. @@ -72,8 +72,10 @@ public class CachedTranslator implements Translator { @Override public String translate(String text, String sourceLanguage, String targetLanguage) throws TikaException, IOException { - if (translator == null) return text; - HashMap<String, String> translationCache = getTranslationCache(sourceLanguage, targetLanguage); + if (translator == null) { + return text; + } + LRUMap<String, String> translationCache = getTranslationCache(sourceLanguage, targetLanguage); String translatedText = translationCache.get(text); if (translatedText == null) { translatedText = translator.translate(text, sourceLanguage, targetLanguage); @@ -116,9 +118,12 @@ public class CachedTranslator implements Translator { * @since Tika 1.6 */ public int getNumTranslationsFor(String sourceLanguage, String targetLanguage) { - HashMap<String, String> translationCache = cache.get(buildCacheKeyString(sourceLanguage, targetLanguage)); - if (translationCache == null) return 0; - else return translationCache.size(); + LRUMap<String, String> translationCache = cache.get(buildCacheKeyString(sourceLanguage, targetLanguage)); + if (translationCache == null) { + return 0; + } else { + return translationCache.size(); + } } /** @@ -131,8 +136,8 @@ public class CachedTranslator implements Translator { * @return true if the cache contains a translation of the text, false otherwise. */ public boolean contains(String text, String sourceLanguage, String targetLanguage) { - HashMap<String, String> translationCache = getTranslationCache(sourceLanguage, targetLanguage); - return translationCache.containsKey(text); + LRUMap<String, String> translationCache = getTranslationCache(sourceLanguage, targetLanguage); + return translationCache.get(text) != null; } /**
