Revert "Gjoranv/create registry from config"

3 files changed, 8 insertions, 8 deletions

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