Merge pull request #21761 from vespa-engine/lesters/multiple-embedders

Lesters/multiple embedders

4 files changed, 15 insertions, 13 deletions

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 49ae00d0663..256c628a1cb 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
@@ -415,14 +415,14 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
         return wasConfiguredToDoAttributing;
     }
 
-    /** Parse an indexing expression which will use the simple linguistics implementatino suitable for testing */
+    /** Parse an indexing expression which will use the simple linguistics implementation suitable for testing */
     public void parseIndexingScript(String script) {
-        parseIndexingScript(script, new SimpleLinguistics(), Embedder.throwsOnUse);
+        parseIndexingScript(script, new SimpleLinguistics(), Embedder.throwsOnUse.asMap());
     }
 
-    public void parseIndexingScript(String script, Linguistics linguistics, Embedder embedder) {
+    public void parseIndexingScript(String script, Linguistics linguistics, Map<String, Embedder> embedders) {
         try {
-            ScriptParserContext config = new ScriptParserContext(linguistics, embedder);
+            ScriptParserContext config = new ScriptParserContext(linguistics, embedders);
             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 a5f5f961ab5..cdd3cc386a4 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
@@ -13,6 +13,8 @@ import com.yahoo.vespa.indexinglanguage.expressions.StatementExpression;
 import com.yahoo.vespa.indexinglanguage.linguistics.AnnotatorConfig;
 import com.yahoo.yolean.Exceptions;
 
+import java.util.Map;
+
 /**
  * @author Einar M R Rosenvinge
  */
@@ -32,13 +34,13 @@ public class IndexingOperation implements FieldOperation {
 
     /** Creates an indexing operation which will use the simple linguistics implementation suitable for testing */
     public static IndexingOperation fromStream(SimpleCharStream input, boolean multiLine) throws ParseException {
-        return fromStream(input, multiLine, new SimpleLinguistics(), Embedder.throwsOnUse);
+        return fromStream(input, multiLine, new SimpleLinguistics(), Embedder.throwsOnUse.asMap());
     }
 
     public static IndexingOperation fromStream(SimpleCharStream input, boolean multiLine,
-                                               Linguistics linguistics, Embedder embedder)
+                                               Linguistics linguistics, Map<String, Embedder> embedders)
             throws ParseException {
-        ScriptParserContext config = new ScriptParserContext(linguistics, embedder);
+        ScriptParserContext config = new ScriptParserContext(linguistics, embedders);
         config.setAnnotatorConfig(new AnnotatorConfig());
         config.setInputStream(input);
         ScriptExpression exp;
diff --git a/config-model/src/main/javacc/IntermediateParser.jj b/config-model/src/main/javacc/IntermediateParser.jj
index ba955f071b2..8a4798d6f74 100644
--- a/config-model/src/main/javacc/IntermediateParser.jj
+++ b/config-model/src/main/javacc/IntermediateParser.jj
@@ -81,7 +81,7 @@ public class IntermediateParser {
      */
     @SuppressWarnings("deprecation")
     private IndexingOperation newIndexingOperation(boolean multiline) throws ParseException {
-        return newIndexingOperation(multiline, new SimpleLinguistics(), Embedder.throwsOnUse);
+        return newIndexingOperation(multiline, new SimpleLinguistics(), Embedder.throwsOnUse.asMap());
     }
 
     /**
@@ -90,13 +90,13 @@ public class IntermediateParser {
      * @param multiline Whether or not to allow multi-line expressions.
      * @param linguistics What to use for tokenizing.
      */
-    private IndexingOperation newIndexingOperation(boolean multiline, Linguistics linguistics, Embedder embedder) throws ParseException {
+    private IndexingOperation newIndexingOperation(boolean multiline, Linguistics linguistics, Map<String, Embedder> embedders) throws ParseException {
         SimpleCharStream input = (SimpleCharStream)token_source.input_stream;
         if (token.next != null) {
             input.backup(token.next.image.length());
         }
         try {
-            return IndexingOperation.fromStream(input, multiline, linguistics, embedder);
+            return IndexingOperation.fromStream(input, multiline, linguistics, embedders);
         } finally {
             token.next = null;
             jj_ntk = -1;
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj
index ab0cdefc355..aeffe6e5c39 100644
--- a/config-model/src/main/javacc/SDParser.jj
+++ b/config-model/src/main/javacc/SDParser.jj
@@ -112,7 +112,7 @@ public class SDParser {
      */
     @SuppressWarnings("deprecation")
     private IndexingOperation newIndexingOperation(boolean multiline) throws ParseException {
-        return newIndexingOperation(multiline, new SimpleLinguistics(), Embedder.throwsOnUse);
+        return newIndexingOperation(multiline, new SimpleLinguistics(), Embedder.throwsOnUse.asMap());
     }
 
     /**
@@ -121,13 +121,13 @@ public class SDParser {
      * @param multiline Whether or not to allow multi-line expressions.
      * @param linguistics What to use for tokenizing.
      */
-    private IndexingOperation newIndexingOperation(boolean multiline, Linguistics linguistics, Embedder embedder) throws ParseException {
+    private IndexingOperation newIndexingOperation(boolean multiline, Linguistics linguistics, Map<String, Embedder> embedders) throws ParseException {
         SimpleCharStream input = (SimpleCharStream)token_source.input_stream;
         if (token.next != null) {
             input.backup(token.next.image.length());
         }
         try {
-            return IndexingOperation.fromStream(input, multiline, linguistics, embedder);
+            return IndexingOperation.fromStream(input, multiline, linguistics, embedders);
         } finally {
             token.next = null;
             jj_ntk = -1;