From e7e659e9d26401c8c36300d4760d4e34acd26d0a Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@gmail.com>
Date: Tue, 28 Sep 2021 21:19:41 +0200
Subject: encode -> embed

---
 .../testutil/HandlersConfigurerTestWrapper.java    |  4 +--
 .../language/provider/DefaultEmbedderProvider.java | 26 ++++++++++++++++++
 .../language/provider/DefaultEncoderProvider.java  | 31 ----------------------
 3 files changed, 28 insertions(+), 33 deletions(-)
 create mode 100644 container-core/src/main/java/com/yahoo/language/provider/DefaultEmbedderProvider.java
 delete mode 100644 container-core/src/main/java/com/yahoo/language/provider/DefaultEncoderProvider.java

(limited to 'container-core/src/main/java/com')

diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
index 0c4709e4a2c..e6231f11ae5 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
@@ -17,7 +17,7 @@ import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.test.MockMetric;
 import com.yahoo.language.Linguistics;
-import com.yahoo.language.process.Encoder;
+import com.yahoo.language.process.Embedder;
 import com.yahoo.language.simple.SimpleLinguistics;
 
 import java.io.File;
@@ -141,7 +141,7 @@ public class HandlersConfigurerTestWrapper {
             protected void configure() {
                 // Needed by e.g. SearchHandler
                 bind(Linguistics.class).to(SimpleLinguistics.class).in(Scopes.SINGLETON);
-                bind(Encoder.class).to(Encoder.FailingEncoder.class).in(Scopes.SINGLETON);
+                bind(Embedder.class).to(Embedder.FailingEmbedder.class).in(Scopes.SINGLETON);
                 bind(ContainerThreadPool.class).to(SimpleContainerThreadpool.class);
                 bind(Metric.class).to(MockMetric.class);
             }
diff --git a/container-core/src/main/java/com/yahoo/language/provider/DefaultEmbedderProvider.java b/container-core/src/main/java/com/yahoo/language/provider/DefaultEmbedderProvider.java
new file mode 100644
index 00000000000..ef371106b7d
--- /dev/null
+++ b/container-core/src/main/java/com/yahoo/language/provider/DefaultEmbedderProvider.java
@@ -0,0 +1,26 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.language.provider;
+
+import com.google.inject.Inject;
+import com.yahoo.container.di.componentgraph.Provider;
+import com.yahoo.language.process.Embedder;
+
+/**
+ * Provides the default embedder implementation if no embedder component has been explicitly configured
+ * (dependency injection will fallback to providers if no components of the requested type is found).
+ *
+ * @author bratseth
+ */
+@SuppressWarnings("unused") // Injected
+public class DefaultEmbedderProvider implements Provider<Embedder> {
+
+    @Inject
+    public DefaultEmbedderProvider() { }
+
+    @Override
+    public Embedder get() { return Embedder.throwsOnUse; }
+
+    @Override
+    public void deconstruct() {}
+
+}
diff --git a/container-core/src/main/java/com/yahoo/language/provider/DefaultEncoderProvider.java b/container-core/src/main/java/com/yahoo/language/provider/DefaultEncoderProvider.java
deleted file mode 100644
index f8550d04d1c..00000000000
--- a/container-core/src/main/java/com/yahoo/language/provider/DefaultEncoderProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.language.provider;
-
-import com.google.inject.Inject;
-import com.yahoo.container.di.componentgraph.Provider;
-import com.yahoo.language.Language;
-import com.yahoo.language.process.Encoder;
-import com.yahoo.tensor.Tensor;
-import com.yahoo.tensor.TensorType;
-
-import java.util.List;
-
-/**
- * Provides the default encoder implementation if no encoder component has been explicitly configured
- * (dependency injection will fallback to providers if no components of the requested type is found).
- *
- * @author bratseth
- */
-@SuppressWarnings("unused") // Injected
-public class DefaultEncoderProvider implements Provider<Encoder> {
-
-    @Inject
-    public DefaultEncoderProvider() { }
-
-    @Override
-    public Encoder get() { return Encoder.throwsOnUse; }
-
-    @Override
-    public void deconstruct() {}
-
-}
-- 
cgit v1.2.3