1 files changed, 3 insertions, 9 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/types/TensorFieldType.java b/container-search/src/main/java/com/yahoo/search/query/profile/types/TensorFieldType.java
index cd21f0b3a61..05befb24da0 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/types/TensorFieldType.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/types/TensorFieldType.java
@@ -1,8 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.query.profile.types;
 
-import com.yahoo.language.Language;
-import com.yahoo.language.process.Embedder;
 import com.yahoo.search.query.profile.QueryProfileRegistry;
 import com.yahoo.tensor.Tensor;
 import com.yahoo.tensor.TensorType;
@@ -44,21 +42,17 @@ public class TensorFieldType extends FieldType {
 
     @Override
     public Object convertFrom(Object o, ConversionContext context) {
-        return convertFrom(o, context.getEncoder(), context.getLanguage());
-    }
-
-    private Object convertFrom(Object o, Embedder embedder, Language language) {
         if (o instanceof Tensor) return o;
-        if (o instanceof String && ((String)o).startsWith("embed(")) return encode((String)o, embedder, language);
+        if (o instanceof String && ((String)o).startsWith("embed(")) return encode((String)o, context);
         if (o instanceof String) return Tensor.from(type, (String)o);
         return null;
     }
 
-    private Tensor encode(String s, Embedder embedder, Language language) {
+    private Tensor encode(String s, ConversionContext context) {
         if ( ! s.endsWith(")"))
             throw new IllegalArgumentException("Expected any string enclosed in embed(), but the argument does not end by ')'");
         String text = s.substring("embed(".length(), s.length() - 1);
-        return embedder.embed(text, language, type);
+        return context.embedder().embed(text, context.language(), context.destination(), type);
     }
 
     public static TensorFieldType fromTypeString(String s) {