From a2e1cf846fcb2057af35d348b0924d2e73523f56 Mon Sep 17 00:00:00 2001 From: Matthew Tovbin Date: Mon, 8 May 2017 14:40:36 -0700 Subject: [PATCH 1/2] Downgrade guava to 14.0.1 (to match Spark 2.x depencency) --- pom.xml | 6 +++--- .../com/optimaize/langdetect/i18n/LdLocale.java | 16 +++++++++++++++- .../optimaize/langdetect/text/package-info.java | 2 +- .../langdetect/ngram/NgramExtractorTest.java | 2 +- .../langdetect/ngram/OldNgramExtractorTest.java | 2 +- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index d30f4ed..973c2df 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.optimaize.languagedetector language-detector language-detector - 0.7-SNAPSHOT + 0.7.1 jar https://github.com/optimaize/language-detector @@ -228,7 +228,7 @@ com.google.guava guava - 19.0 + 14.0.1 org.slf4j @@ -278,4 +278,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/optimaize/langdetect/i18n/LdLocale.java b/src/main/java/com/optimaize/langdetect/i18n/LdLocale.java index c084f7b..697ac44 100644 --- a/src/main/java/com/optimaize/langdetect/i18n/LdLocale.java +++ b/src/main/java/com/optimaize/langdetect/i18n/LdLocale.java @@ -17,9 +17,13 @@ package com.optimaize.langdetect.i18n; import com.google.common.base.Optional; +import com.google.common.base.Preconditions; import com.google.common.base.Splitter; import org.jetbrains.annotations.NotNull; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; import java.util.List; /** @@ -90,7 +94,7 @@ public static LdLocale fromString(@NotNull String string) { Optional script = null; Optional region = null; - List strings = Splitter.on('-').splitToList(string); + List strings = splitToList('-', string); for (int i=0; i splitToList(char separator, String string) { + Preconditions.checkNotNull(string); + Iterable iterator = Splitter.on(separator).split(string); + ArrayList result = new ArrayList(); + for (String s: iterator) { + result.add(s); + } + return Collections.unmodifiableList(result); + } + private static boolean looksLikeScriptCode(String string) { return string.length() == 4 && string.matches("[A-Z][a-z]{3}"); } diff --git a/src/main/java/com/optimaize/langdetect/text/package-info.java b/src/main/java/com/optimaize/langdetect/text/package-info.java index 09c0bbb..6e2c376 100644 --- a/src/main/java/com/optimaize/langdetect/text/package-info.java +++ b/src/main/java/com/optimaize/langdetect/text/package-info.java @@ -16,7 +16,7 @@ /** * Provides functionality for concatenating and cleaning text that is used as - * a) learning text to produce {@link com.optimaize.langdetect.LanguageProfile}s + * a) learning text to produce {@link com.optimaize.langdetect.profiles.LanguageProfile}s * b) for the text for which the language is to be guessed. * * @author Fabian Kessler diff --git a/src/test/java/com/optimaize/langdetect/ngram/NgramExtractorTest.java b/src/test/java/com/optimaize/langdetect/ngram/NgramExtractorTest.java index e7a8ee0..04b8ada 100644 --- a/src/test/java/com/optimaize/langdetect/ngram/NgramExtractorTest.java +++ b/src/test/java/com/optimaize/langdetect/ngram/NgramExtractorTest.java @@ -79,7 +79,7 @@ public void extractGrams_8() { public void stressTestAlgo2() { NgramExtractor ngramExtractor = NgramExtractor.gramLengths(1, 2, 3); String text = "Foo bar hello world and so on nana nunu dada dudu asdf asdf akewf köjvnawer aisdfj awejfr iajdsöfj ewi adjsköfjwei ajsdökfj ief asd"; - Stopwatch stopwatch = Stopwatch.createStarted(); + Stopwatch stopwatch = (new Stopwatch()).start(); for (int i=0; i<100000; i++) { ngramExtractor.extractGrams(text); } diff --git a/src/test/java/com/optimaize/langdetect/ngram/OldNgramExtractorTest.java b/src/test/java/com/optimaize/langdetect/ngram/OldNgramExtractorTest.java index 4183299..4d22778 100644 --- a/src/test/java/com/optimaize/langdetect/ngram/OldNgramExtractorTest.java +++ b/src/test/java/com/optimaize/langdetect/ngram/OldNgramExtractorTest.java @@ -49,7 +49,7 @@ public void testExtractNGrams2() { @Test public void stressTestAlgo1() { String text = "Foo bar hello world and so on nana nunu dada dudu asdf asdf akewf köjvnawer aisdfj awejfr iajdsöfj ewi adjsköfjwei ajsdökfj ief asd"; - Stopwatch stopwatch = Stopwatch.createStarted(); + Stopwatch stopwatch = (new Stopwatch()).start(); for (int i=0; i<100000; i++) { OldNgramExtractor.extractNGrams(text, null); //2.745s } From f9330048f8668f662897f8f2fc6dd5af0b404597 Mon Sep 17 00:00:00 2001 From: Matthew Tovbin Date: Mon, 8 May 2017 16:56:43 -0700 Subject: [PATCH 2/2] Revert back the version --- pom.xml | 2 +- src/main/java/com/optimaize/langdetect/i18n/LdLocale.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 973c2df..ebce41c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.optimaize.languagedetector language-detector language-detector - 0.7.1 + 0.7-SNAPSHOT jar https://github.com/optimaize/language-detector diff --git a/src/main/java/com/optimaize/langdetect/i18n/LdLocale.java b/src/main/java/com/optimaize/langdetect/i18n/LdLocale.java index 697ac44..4e4cf40 100644 --- a/src/main/java/com/optimaize/langdetect/i18n/LdLocale.java +++ b/src/main/java/com/optimaize/langdetect/i18n/LdLocale.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.List; /**