diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-11-01 11:12:17 +0100 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:25 +0100 |
| commit | 45c66eac03e6d258209f897b2f5da17212a58f41 (patch) | |
| tree | c83a3bb1ec9246e818403d33c14d9fbef23b270b /indexinglanguage | |
| parent | 953684a791ac6bb080ecd1c16e77fb57c3fcb85a (diff) | |
Make SimpleLinguistics simple again
- Remove SimpleLinguistics config and optional use of Optimaize
- Add Optimaize to OpennlpLinguistics; on by default and config to disable
Diffstat (limited to 'indexinglanguage')
3 files changed, 3 insertions, 3 deletions
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java index fddbd211e27..50dd7611bb0 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java @@ -179,7 +179,7 @@ public abstract class Expression extends Selectable { /** Creates an expression with simple lingustics for testing */ @SuppressWarnings("deprecation") public static Expression fromString(String expression) throws ParseException { - return fromString(expression, new SimpleLinguistics(false)); + return fromString(expression, new SimpleLinguistics()); } public static Expression fromString(String expression, Linguistics linguistics) throws ParseException { diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java index 7addca75d2f..320c47103aa 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java @@ -91,7 +91,7 @@ public final class ScriptExpression extends ExpressionList<StatementExpression> /** Creates an expression with simple lingustics for testing */ @SuppressWarnings("deprecation") public static ScriptExpression fromString(String expression) throws ParseException { - return fromString(expression, new SimpleLinguistics(false)); + return fromString(expression, new SimpleLinguistics()); } public static ScriptExpression fromString(String expression, Linguistics linguistics) throws ParseException { diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java index 16d069d84ec..cf1e808946d 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java @@ -92,7 +92,7 @@ public final class StatementExpression extends ExpressionList<Expression> { /** Creates an expression with simple lingustics for testing */ @SuppressWarnings("deprecation") public static StatementExpression fromString(String expression) throws ParseException { - return fromString(expression, new SimpleLinguistics(false)); + return fromString(expression, new SimpleLinguistics()); } public static StatementExpression fromString(String expression, Linguistics linguistics) throws ParseException { |