Remove on Vespa 8

3 files changed, 8 insertions, 51 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/federation/CommonFields.java b/container-search/src/main/java/com/yahoo/search/federation/CommonFields.java
deleted file mode 100644
index 5c9b1da8c3d..00000000000
--- a/container-search/src/main/java/com/yahoo/search/federation/CommonFields.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.search.federation;
-/**
- * A set of string constants for common hit field names.
- *
- * @author laboisse
- * @deprecated do not use
- */
-@Deprecated // TODO: Remove on Vespa 8
-public class CommonFields {
-
-	public static final String TITLE = "title";
-	public static final String URL = "url";
-	public static final String DESCRIPTION = "description";
-	public static final String DATE = "date";
-	public static final String SIZE = "size";
-	public static final String DISP_URL = "dispurl";
-	public static final String BASE_URL = "baseurl";
-	public static final String MIME_TYPE = "mimetype";
-	public static final String RELEVANCY = "relevancy";
-	public static final String THUMBNAIL_URL = "thumbnailUrl";
-	public static final String THUMBNAIL_WIDTH = "thumbnailWidth";
-	public static final String THUMBNAIL_HEIGHT = "thumbnailHeight";
-
-}
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 84246b1eb25..b870b32da77 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
@@ -135,4 +135,8 @@ public class CompiledQueryProfileRegistry extends ComponentRegistry<CompiledQuer
         return registry;
     }
 
+    public static CompiledQueryProfileRegistry fromConfig(QueryProfilesConfig config) {
+        return QueryProfileConfigurer.createFromConfig(config).compile();
+    }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileConfigurer.java b/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileConfigurer.java
index c3bd4f7b962..31278af9579 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileConfigurer.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileConfigurer.java
@@ -3,7 +3,7 @@ package com.yahoo.search.query.profile.config;
 
 import com.yahoo.component.ComponentId;
 import com.yahoo.component.ComponentSpecification;
-import com.yahoo.config.subscription.ConfigSubscriber;
+import com.yahoo.config.subscription.ConfigGetter;
 import com.yahoo.search.query.profile.DimensionValues;
 import com.yahoo.search.query.profile.QueryProfile;
 import com.yahoo.search.query.profile.QueryProfileRegistry;
@@ -19,27 +19,10 @@ import java.util.Set;
 /**
  * @author bratseth
  */
-@SuppressWarnings("removal") // TODO Vespa 8: remove
-public class QueryProfileConfigurer implements ConfigSubscriber.SingleSubscriber<QueryProfilesConfig> {
+public class QueryProfileConfigurer {
 
-    private final ConfigSubscriber subscriber = new ConfigSubscriber();
-
-    private volatile QueryProfileRegistry currentRegistry;
-
-    public QueryProfileConfigurer(String configId) {
-        subscriber.subscribe(this, QueryProfilesConfig.class, configId);
-    }
-
-    /** Returns the registry created by the last occurring call to configure */
-    public QueryProfileRegistry getCurrentRegistry() { return currentRegistry; }
-
-    private void setCurrentRegistry(QueryProfileRegistry registry) {
-        this.currentRegistry=registry;
-    }
-
-    public void configure(QueryProfilesConfig config) {
-        QueryProfileRegistry registry = createFromConfig(config);
-        setCurrentRegistry(registry);
+    public static QueryProfileRegistry createFromConfigId(String configId) {
+        return createFromConfig(ConfigGetter.getConfig(QueryProfilesConfig.class, configId));
     }
 
     public static QueryProfileRegistry createFromConfig(QueryProfilesConfig config) {
@@ -69,11 +52,6 @@ public class QueryProfileConfigurer implements ConfigSubscriber.SingleSubscriber
         return registry;
     }
 
-    /** Stop subscribing from this configurer */
-    public void shutdown() {
-        subscriber.close();
-    }
-
     private static void createProfile(QueryProfilesConfig.Queryprofile config, QueryProfileRegistry registry) {
         QueryProfile profile = new QueryProfile(new ComponentId(config.id()), config.id(), registry);
         try {