From 03cca9c42b32d8d4ba24b348f8466de42bb05cd7 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Sun, 19 Sep 2021 22:03:39 +0200 Subject: Add 'encode' expression --- .../main/java/com/yahoo/searchdefinition/document/SDField.java | 7 ++++--- .../yahoo/searchdefinition/fieldoperation/IndexingOperation.java | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'config-model/src/main/java/com/yahoo') diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java index ac92207820c..9c89517f72d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java @@ -9,6 +9,7 @@ import com.yahoo.document.MapDataType; import com.yahoo.document.StructDataType; import com.yahoo.document.TensorDataType; import com.yahoo.language.Linguistics; +import com.yahoo.language.process.Encoder; import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.searchdefinition.Index; import com.yahoo.searchdefinition.Search; @@ -425,12 +426,12 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer, /** Parse an indexing expression which will use the simple linguistics implementatino suitable for testing */ public void parseIndexingScript(String script) { - parseIndexingScript(script, new SimpleLinguistics()); + parseIndexingScript(script, new SimpleLinguistics(), Encoder.throwsOnUse); } - public void parseIndexingScript(String script, Linguistics linguistics) { + public void parseIndexingScript(String script, Linguistics linguistics, Encoder encoder) { try { - ScriptParserContext config = new ScriptParserContext(linguistics); + ScriptParserContext config = new ScriptParserContext(linguistics, encoder); config.setInputStream(new IndexingInput(script)); setIndexingScript(ScriptExpression.newInstance(config)); } catch (ParseException e) { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java index dece0064fcc..4332d8baea8 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java @@ -2,6 +2,7 @@ package com.yahoo.searchdefinition.fieldoperation; import com.yahoo.language.Linguistics; +import com.yahoo.language.process.Encoder; import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.searchdefinition.document.SDField; import com.yahoo.searchdefinition.parser.ParseException; @@ -27,14 +28,14 @@ public class IndexingOperation implements FieldOperation { } /** Creates an indexing operation which will use the simple linguistics implementation suitable for testing */ - @SuppressWarnings("deprecation") public static IndexingOperation fromStream(SimpleCharStream input, boolean multiLine) throws ParseException { - return fromStream(input, multiLine, new SimpleLinguistics()); + return fromStream(input, multiLine, new SimpleLinguistics(), Encoder.throwsOnUse); } - public static IndexingOperation fromStream(SimpleCharStream input, boolean multiLine, Linguistics linguistics) + public static IndexingOperation fromStream(SimpleCharStream input, boolean multiLine, + Linguistics linguistics, Encoder encoder) throws ParseException { - ScriptParserContext config = new ScriptParserContext(linguistics); + ScriptParserContext config = new ScriptParserContext(linguistics, encoder); config.setAnnotatorConfig(new AnnotatorConfig()); config.setInputStream(input); ScriptExpression exp; -- cgit v1.2.3