diff options
author | Jon Bratseth <bratseth@oath.com> | 2021-09-28 21:51:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-28 21:51:45 +0200 |
commit | 12a415efca5749433fd22424592ddc18f04160f6 (patch) | |
tree | 9324cb3aa2aabfa4fb8f0dc5fc0f7639869db7b1 /config-model/src/main/javacc/SDParser.jj | |
parent | b57543dc1a1e3d32bcd03afb7af972490d691bf1 (diff) | |
parent | e7e659e9d26401c8c36300d4760d4e34acd26d0a (diff) |
Merge pull request #19337 from vespa-engine/bratseth/encoder-to-embedderv7.474.25
encode -> embed
Diffstat (limited to 'config-model/src/main/javacc/SDParser.jj')
-rw-r--r-- | config-model/src/main/javacc/SDParser.jj | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj index 7df77588fe8..6fd2f09f445 100644 --- a/config-model/src/main/javacc/SDParser.jj +++ b/config-model/src/main/javacc/SDParser.jj @@ -58,7 +58,7 @@ import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.application.api.FileRegistry; import com.yahoo.config.model.api.ModelContext; import com.yahoo.language.Linguistics; -import com.yahoo.language.process.Encoder; +import com.yahoo.language.process.Embedder; import com.yahoo.language.simple.SimpleLinguistics; import com.yahoo.search.query.ranking.Diversity; import java.util.Map; @@ -112,7 +112,7 @@ public class SDParser { */ @SuppressWarnings("deprecation") private IndexingOperation newIndexingOperation(boolean multiline) throws ParseException { - return newIndexingOperation(multiline, new SimpleLinguistics(), Encoder.throwsOnUse); + return newIndexingOperation(multiline, new SimpleLinguistics(), Embedder.throwsOnUse); } /** @@ -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, Encoder encoder) throws ParseException { + private IndexingOperation newIndexingOperation(boolean multiline, Linguistics linguistics, Embedder embedder) 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, encoder); + return IndexingOperation.fromStream(input, multiline, linguistics, embedder); } finally { token.next = null; jj_ntk = -1; |