diff options
7 files changed, 12 insertions, 12 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java index 11206fbb1c1..c7e3412facc 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java @@ -267,9 +267,8 @@ public abstract class AbstractParser implements CustomParser { * @return The normalized string. */ protected String normalize(String input) { - if (input == null || input.length() == 0) { - return input; - } + if (input == null || input.length() == 0) return input; + return environment.getLinguistics().getNormalizer().normalize(input); } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java index 1617b715c68..74e06bc7050 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java @@ -11,7 +11,7 @@ import com.yahoo.vespa.indexinglanguage.linguistics.AnnotatorConfig; import com.yahoo.vespa.indexinglanguage.linguistics.LinguisticsAnnotator; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen */ public class TokenizeExpression extends Expression { diff --git a/linguistics/src/main/java/com/yahoo/language/process/Normalizer.java b/linguistics/src/main/java/com/yahoo/language/process/Normalizer.java index f4e1ccc9feb..e426b2b6d54 100644 --- a/linguistics/src/main/java/com/yahoo/language/process/Normalizer.java +++ b/linguistics/src/main/java/com/yahoo/language/process/Normalizer.java @@ -4,7 +4,7 @@ package com.yahoo.language.process; /** * <p>This interface provides NFKC normalization of Strings through the underlying linguistics library.</p> * - * @author <a href="mailto:mathiasm@yahoo-inc.com">Mathias M\u00F8lster Lidal</a> + * @author Mathias Mølster Lidal */ public interface Normalizer { @@ -15,5 +15,6 @@ public interface Normalizer { * @return The normalized String. * @throws ProcessingException If underlying library throws an Exception. */ - public String normalize(String input); + String normalize(String input); + } diff --git a/linguistics/src/main/java/com/yahoo/language/process/Segmenter.java b/linguistics/src/main/java/com/yahoo/language/process/Segmenter.java index 73764e06ef6..11c00f2163b 100644 --- a/linguistics/src/main/java/com/yahoo/language/process/Segmenter.java +++ b/linguistics/src/main/java/com/yahoo/language/process/Segmenter.java @@ -6,11 +6,11 @@ import com.yahoo.language.Language; import java.util.List; /** - * <p>Interface providing segmentation, i.e. splitting of CJK character blocks into separate tokens. This is primarily a + * Interface providing segmentation, i.e. splitting of CJK character blocks into separate tokens. This is primarily a * convenience feature for users who don't need full tokenization (or who use a separate tokenizer and only need CJK - * processing).</p> + * processing). * - * @author <a href="mailto:mathiasm@yahoo-inc.com">Mathias Mølster Lidal</a> + * @author Mathias Mølster Lidal */ public interface Segmenter { diff --git a/linguistics/src/main/java/com/yahoo/language/process/SegmenterImpl.java b/linguistics/src/main/java/com/yahoo/language/process/SegmenterImpl.java index 146d65cb7e2..f0db2436037 100644 --- a/linguistics/src/main/java/com/yahoo/language/process/SegmenterImpl.java +++ b/linguistics/src/main/java/com/yahoo/language/process/SegmenterImpl.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ public class SegmenterImpl implements Segmenter { diff --git a/linguistics/src/main/java/com/yahoo/language/simple/SimpleNormalizer.java b/linguistics/src/main/java/com/yahoo/language/simple/SimpleNormalizer.java index bfc6f813452..e7459604bee 100644 --- a/linguistics/src/main/java/com/yahoo/language/simple/SimpleNormalizer.java +++ b/linguistics/src/main/java/com/yahoo/language/simple/SimpleNormalizer.java @@ -4,7 +4,7 @@ package com.yahoo.language.simple; import com.yahoo.language.process.Normalizer; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen */ public class SimpleNormalizer implements Normalizer { diff --git a/linguistics/src/main/java/com/yahoo/language/simple/SimpleTokenizer.java b/linguistics/src/main/java/com/yahoo/language/simple/SimpleTokenizer.java index 48a12c54e86..a8cd782889c 100644 --- a/linguistics/src/main/java/com/yahoo/language/simple/SimpleTokenizer.java +++ b/linguistics/src/main/java/com/yahoo/language/simple/SimpleTokenizer.java @@ -16,7 +16,7 @@ import java.util.List; * * <p>This is not multithread safe.</p> * - * @author <a href="mailto:mathiasm@yahoo-inc.com">Mathias Mølster Lidal</a> + * @author Mathias Mølster Lidal * @author bratseth */ public class SimpleTokenizer implements Tokenizer { |