You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2016/08/24 18:34:25 UTC
tika git commit: TIKA-2007 upgrade jackson,
needed to update CachedTranslator (diff btwn trunk and 2.x)
Repository: tika
Updated Branches:
refs/heads/2.x db513d6ad -> 87b6d5d7d
TIKA-2007 upgrade jackson, needed to update CachedTranslator (diff btwn trunk and 2.x)
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/87b6d5d7
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/87b6d5d7
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/87b6d5d7
Branch: refs/heads/2.x
Commit: 87b6d5d7d29642da2ca5f329d9474e6887b66289
Parents: db513d6
Author: tballison <ta...@mitre.org>
Authored: Wed Aug 24 14:34:16 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Wed Aug 24 14:34:16 2016 -0400
----------------------------------------------------------------------
.../language/translate/CachedTranslator.java | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/87b6d5d7/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 a5691bc..f2011be 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
@@ -71,8 +71,10 @@ public class CachedTranslator extends AbstractTranslator {
@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);
@@ -114,9 +116,12 @@ public class CachedTranslator extends AbstractTranslator {
* @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();
+ }
}
/**
@@ -129,8 +134,8 @@ public class CachedTranslator extends AbstractTranslator {
* @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;
}
/**