Revert "Gjoranv/create registry from config"

11 files changed, 15 insertions, 85 deletions

diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index 2b4424654a2..51fee99a743 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -4191,7 +4191,6 @@
       "public"
     ],
     "methods": [
-      "public void <init>(com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry, com.yahoo.container.core.ContainerHttpConfig, com.yahoo.search.searchchain.ExecutionFactory)",
       "public void <init>(com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.config.QueryProfilesConfig, com.yahoo.container.core.ContainerHttpConfig, com.yahoo.search.searchchain.ExecutionFactory)",
       "public void <init>(com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry, com.yahoo.search.searchchain.ExecutionFactory, java.util.Optional)",
       "public void <init>(com.yahoo.container.core.ChainsConfig, com.yahoo.search.config.IndexInfoConfig, com.yahoo.container.QrSearchersConfig, com.yahoo.vespa.configdefinition.SpecialtokensConfig, com.yahoo.statistics.Statistics, com.yahoo.language.Linguistics, com.yahoo.jdisc.Metric, com.yahoo.component.provider.ComponentRegistry, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.config.QueryProfilesConfig, com.yahoo.component.provider.ComponentRegistry, com.yahoo.container.core.ContainerHttpConfig)",
@@ -6064,9 +6063,8 @@
     ],
     "methods": [
       "public void <init>()",
-      "public void <init>(com.yahoo.search.query.profile.config.QueryProfilesConfig)",
       "public void <init>(com.yahoo.search.query.profile.types.QueryProfileTypeRegistry)",
-      "public final void register(com.yahoo.search.query.profile.compiled.CompiledQueryProfile)",
+      "public void register(com.yahoo.search.query.profile.compiled.CompiledQueryProfile)",
       "public com.yahoo.search.query.profile.types.QueryProfileTypeRegistry getTypeRegistry()",
       "public com.yahoo.search.query.profile.compiled.CompiledQueryProfile findQueryProfile(java.lang.String)"
     ],
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index c658d404adb..c8386f3c75c 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -121,28 +121,6 @@ public class SearchHandler extends LoggingRequestHandler {
                          Metric metric,
                          Executor executor,
                          AccessLog accessLog,
-                         CompiledQueryProfileRegistry queryProfileRegistry,
-                         ContainerHttpConfig containerHttpConfig,
-                         ExecutionFactory executionFactory) {
-        this(statistics,
-             metric,
-             executor,
-             accessLog,
-             queryProfileRegistry,
-             executionFactory,
-             containerHttpConfig.numQueriesToTraceOnDebugAfterConstruction(),
-             containerHttpConfig.hostResponseHeaderKey().equals("") ?
-                     Optional.empty() : Optional.of(containerHttpConfig.hostResponseHeaderKey()));
-    }
-
-    /**
-     * @deprecated Use the @Inject annotated constructor instead.
-     */
-    @Deprecated // Vespa 8
-    public SearchHandler(Statistics statistics,
-                         Metric metric,
-                         Executor executor,
-                         AccessLog accessLog,
                          QueryProfilesConfig queryProfileConfig,
                          ContainerHttpConfig containerHttpConfig,
                          ExecutionFactory executionFactory) {
@@ -154,7 +132,7 @@ public class SearchHandler extends LoggingRequestHandler {
              executionFactory,
              containerHttpConfig.numQueriesToTraceOnDebugAfterConstruction(),
              containerHttpConfig.hostResponseHeaderKey().equals("") ?
-                     Optional.empty() : Optional.of( containerHttpConfig.hostResponseHeaderKey()));
+             Optional.empty() : Optional.of( containerHttpConfig.hostResponseHeaderKey()));
     }
 
     public SearchHandler(Statistics statistics,
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/CompiledQueryProfileRegistry.java b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/CompiledQueryProfileRegistry.java
index 744c6eb6933..7ab05d0cd1e 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/CompiledQueryProfileRegistry.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/CompiledQueryProfileRegistry.java
@@ -1,14 +1,9 @@
 // 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.compiled;
 
-import com.google.inject.Inject;
 import com.yahoo.component.ComponentSpecification;
 import com.yahoo.component.provider.ComponentRegistry;
-import com.yahoo.search.query.profile.QueryProfile;
-import com.yahoo.search.query.profile.QueryProfileCompiler;
-import com.yahoo.search.query.profile.QueryProfileRegistry;
-import com.yahoo.search.query.profile.config.QueryProfileConfigurer;
-import com.yahoo.search.query.profile.config.QueryProfilesConfig;
+import com.yahoo.search.query.profile.types.QueryProfileType;
 import com.yahoo.search.query.profile.types.QueryProfileTypeRegistry;
 
 /**
@@ -23,15 +18,6 @@ public class CompiledQueryProfileRegistry extends ComponentRegistry<CompiledQuer
     
     private final QueryProfileTypeRegistry typeRegistry;
 
-    @Inject
-    public CompiledQueryProfileRegistry(QueryProfilesConfig config) {
-        QueryProfileRegistry registry = QueryProfileConfigurer.createFromConfig(config);
-        typeRegistry = registry.getTypeRegistry();
-        for (QueryProfile inputProfile : registry.allComponents()) {
-            register(QueryProfileCompiler.compile(inputProfile, this));
-        }
-    }
-
     /** Creates a compiled query profile registry with no types */
     public CompiledQueryProfileRegistry() {
         this(QueryProfileTypeRegistry.emptyFrozen());
@@ -42,7 +28,7 @@ public class CompiledQueryProfileRegistry extends ComponentRegistry<CompiledQuer
     }
 
     /** Registers a type by its id */
-    public final void register(CompiledQueryProfile profile) {
+    public void register(CompiledQueryProfile profile) {
         super.register(profile.getId(), profile);
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/handler/test/config/handlers.cfg b/container-search/src/test/java/com/yahoo/search/handler/test/config/handlers.cfg
index 915da8dc037..96843d78aae 100644
--- a/container-search/src/test/java/com/yahoo/search/handler/test/config/handlers.cfg
+++ b/container-search/src/test/java/com/yahoo/search/handler/test/config/handlers.cfg
@@ -1,4 +1,4 @@
-handler[8]
+handler[7]
 handler[0].id com.yahoo.search.handler.SearchHandler
 handler[1].id com.yahoo.search.handler.test.SearchHandlerTestCase$NullReturningHandler
 handler[2].id com.yahoo.search.handler.test.SearchHandlerTestCase$NullReturningAsyncHandler
@@ -6,4 +6,3 @@ handler[3].id com.yahoo.search.handler.test.SearchHandlerTestCase$ThrowingHandle
 handler[4].id com.yahoo.search.handler.test.SearchHandlerTestCase$ThrowingAsyncHandler
 handler[5].id com.yahoo.search.handler.test.SearchHandlerTestCase$ForwardingHandler
 handler[6].id com.yahoo.search.handler.test.SearchHandlerTestCase$ForwardingAsyncHandler
-handler[7].id com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/compiled/CompiledQueryProfileRegistryTest.java b/container-search/src/test/java/com/yahoo/search/query/profile/compiled/CompiledQueryProfileRegistryTest.java
deleted file mode 100644
index 39d4fec2716..00000000000
--- a/container-search/src/test/java/com/yahoo/search/query/profile/compiled/CompiledQueryProfileRegistryTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.yahoo.search.query.profile.compiled;
-
-import com.yahoo.search.query.profile.config.QueryProfilesConfig;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author gjoranv
- */
-public class CompiledQueryProfileRegistryTest {
-
-    @Test
-    public void registry_can_be_created_from_config() {
-        var config = new QueryProfilesConfig.Builder()
-                .queryprofile(new QueryProfilesConfig.Queryprofile.Builder()
-                                      .id("profile1")
-                                      .property(new QueryProfilesConfig.Queryprofile.Property.Builder()
-                                                        .name("hits")
-                                                        .value("5")))
-                .build();
-
-        var registry = new CompiledQueryProfileRegistry(config);
-        var profile1 = registry.findQueryProfile("profile1");
-        assertEquals("5", profile1.get("hits"));
-    }
-
-}
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileConfigurationTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileConfigurationTestCase.java
index a1fba8e07f1..819cd3cdfd4 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileConfigurationTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileConfigurationTestCase.java
@@ -1,25 +1,27 @@
 // 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.config.test;
 
+import com.yahoo.config.subscription.ConfigInstanceUtil;
+import com.yahoo.io.IOUtils;
 import com.yahoo.search.Query;
 import com.yahoo.search.query.profile.QueryProfile;
-import com.yahoo.search.query.profile.QueryProfileProperties;
 import com.yahoo.search.query.profile.compiled.CompiledQueryProfile;
+import com.yahoo.search.query.profile.QueryProfileProperties;
 import com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry;
 import com.yahoo.search.query.profile.config.QueryProfileConfigurer;
 import com.yahoo.search.query.profile.config.QueryProfilesConfig;
-import com.yahoo.search.query.profile.config.QueryProfilesConfig.Queryprofile;
 import com.yahoo.search.test.QueryTestCase;
+import com.yahoo.vespa.config.ConfigPayload;
+import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+import java.io.File;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-
 /**
  * @author bratseth
  */
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/typed/components.cfg b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/typed/components.cfg
index 04dcbb22d5d..a047ae1cb73 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/typed/components.cfg
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/typed/components.cfg
@@ -10,4 +10,3 @@ components[3].classId com.yahoo.search.query.profile.config.test.QueryProfileInt
 components[4].id com.yahoo.search.handler.SearchHandler
 components[5].id com.yahoo.container.core.config.HandlersConfigurerDi$RegistriesHack
 components[6].id com.yahoo.search.searchchain.ExecutionFactory
-components[7].id com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/untyped/components.cfg b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/untyped/components.cfg
index b5bc450ec17..ef9d4490a77 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/untyped/components.cfg
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/untyped/components.cfg
@@ -10,4 +10,3 @@ components[3].classId com.yahoo.search.query.profile.config.test.QueryProfileInt
 components[4].id com.yahoo.search.handler.SearchHandler
 components[5].id com.yahoo.container.core.config.HandlersConfigurerDi$RegistriesHack
 components[6].id com.yahoo.search.searchchain.ExecutionFactory
-components[7].id com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/dependencyConfig/handlers.cfg b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/dependencyConfig/handlers.cfg
index 53811bdf536..ad20005e7ad 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/dependencyConfig/handlers.cfg
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/dependencyConfig/handlers.cfg
@@ -1,3 +1,2 @@
-handler[2]
+handler[1]
 handler[0].id com.yahoo.search.handler.SearchHandler
-handler[1].id com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/handlers.cfg b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/handlers.cfg
index 53811bdf536..ad20005e7ad 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/handlers.cfg
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/handlers.cfg
@@ -1,3 +1,2 @@
-handler[2]
+handler[1]
 handler[0].id com.yahoo.search.handler.SearchHandler
-handler[1].id com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/testInstances/components.cfg b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/testInstances/components.cfg
index e1d5c418c6a..8a985f92d10 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/testInstances/components.cfg
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/testInstances/components.cfg
@@ -22,4 +22,3 @@ components[8].classId com.yahoo.search.searchchain.config.test.twosearchers.Mult
 components[8].bundle twosearchers
 components[9].id com.yahoo.search.handler.SearchHandler
 components[10].id com.yahoo.container.handler.config.HandlersConfigurerDi$RegistriesHack
-components[11].id com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry