Merge pull request #6977 from vespa-engine/gjoranv/remove-linguistics-binding

Remove guice binding for Linguistics.

2 files changed, 17 insertions, 3 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
index 55d7de90f33..7f6e7f08e3d 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
@@ -148,7 +148,6 @@ public class HandlersConfigurerDi {
             protected void configure() {
                 bind(com.yahoo.container.Container.class).toInstance(vespaContainer);
                 bind(com.yahoo.statistics.Statistics.class).toInstance(Statistics.nullImplementation);
-                bind(Linguistics.class).toInstance(new SimpleLinguistics());
                 bind(com.yahoo.container.protect.FreezeDetector.class).toInstance(
                         new com.yahoo.container.protect.FreezeDetector(
                                 new DiagnosticsConfig(new DiagnosticsConfig.Builder().disabled(true))));
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 42780f75a6c..ad99218b860 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
@@ -1,7 +1,10 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.core.config.testutil;
 
+import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Scopes;
 import com.yahoo.component.AbstractComponent;
 import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.config.subscription.ConfigSourceSet;
@@ -10,6 +13,8 @@ import com.yahoo.container.di.CloudSubscriberFactory;
 import com.yahoo.container.di.ComponentDeconstructor;
 import com.yahoo.container.core.config.HandlersConfigurerDi;
 import com.yahoo.jdisc.handler.RequestHandler;
+import com.yahoo.language.Linguistics;
+import com.yahoo.language.simple.SimpleLinguistics;
 import com.yahoo.osgi.MockOsgi;
 
 import java.io.File;
@@ -92,7 +97,7 @@ public class HandlersConfigurerTestWrapper {
                 container,
                 configId,
                 testDeconstructor,
-                Guice.createInjector(),
+                guiceInjector(),
                 mockOsgi);
         this.container = container;
     }
@@ -111,7 +116,7 @@ public class HandlersConfigurerTestWrapper {
 
     public void reloadConfig() {
         configurer.reloadConfig(++lastGeneration);
-        configurer.getNewComponentGraph(Guice.createInjector(), false);
+        configurer.getNewComponentGraph(guiceInjector(), false);
     }
 
     public void shutdown() {
@@ -125,4 +130,14 @@ public class HandlersConfigurerTestWrapper {
         return container.getRequestHandlerRegistry();
     }
 
+    private static Injector guiceInjector() {
+        return Guice.createInjector(new AbstractModule() {
+            @Override
+            protected void configure() {
+                // Needed by e.g. SearchHandler
+                bind(Linguistics.class).to(SimpleLinguistics.class).in(Scopes.SINGLETON);
+            }
+        });
+    }
+
 }