Revert "Use class names instead of strings"

1 files changed, 69 insertions, 58 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java b/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
index 0f09036b544..34662f2a8bb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
@@ -86,64 +86,75 @@ public class PlatformBundles {
 
     // This is a hack to allow users to declare components from the search-and-docproc bundle without naming the bundle.
     private static final Set<String> searchAndDocprocComponents = Set.of(
-            com.yahoo.docproc.AbstractConcreteDocumentFactory.class.getName(),
-            com.yahoo.docproc.DocumentProcessor.class.getName(),
-            com.yahoo.docproc.SimpleDocumentProcessor.class.getName(),
-            com.yahoo.language.simple.SimpleLinguistics.class.getName(),
-            com.yahoo.prelude.cluster.ClusterSearcher.class.getName(),
-            com.yahoo.prelude.fastsearch.FastSearcher.class.getName(),
-            com.yahoo.prelude.fastsearch.VespaBackEndSearcher.class.getName(),
-            com.yahoo.prelude.querytransform.CJKSearcher.class.getName(),
-            com.yahoo.prelude.querytransform.CollapsePhraseSearcher.class.getName(),
-            com.yahoo.prelude.querytransform.LiteralBoostSearcher.class.getName(),
-            com.yahoo.prelude.querytransform.NoRankingSearcher.class.getName(),
-            com.yahoo.prelude.querytransform.NonPhrasingSearcher.class.getName(),
-            com.yahoo.prelude.querytransform.NormalizingSearcher.class.getName(),
-            com.yahoo.prelude.querytransform.PhrasingSearcher.class.getName(),
-            com.yahoo.prelude.querytransform.RecallSearcher.class.getName(),
-            com.yahoo.prelude.querytransform.StemmingSearcher.class.getName(),
-            com.yahoo.prelude.searcher.BlendingSearcher.class.getName(),
-            com.yahoo.prelude.searcher.FieldCollapsingSearcher.class.getName(),
-            com.yahoo.prelude.searcher.FillSearcher.class.getName(),
-            com.yahoo.prelude.searcher.JSONDebugSearcher.class.getName(),
-            com.yahoo.prelude.searcher.JuniperSearcher.class.getName(),
-            com.yahoo.prelude.searcher.MultipleResultsSearcher.class.getName(),
-            com.yahoo.prelude.searcher.PosSearcher.class.getName(),
-            com.yahoo.prelude.searcher.QuotingSearcher.class.getName(),
-            com.yahoo.prelude.searcher.ValidateSortingSearcher.class.getName(),
-            com.yahoo.prelude.semantics.SemanticSearcher.class.getName(),
-            com.yahoo.prelude.statistics.StatisticsSearcher.class.getName(),
-            com.yahoo.search.Searcher.class.getName(),
-            com.yahoo.search.cluster.ClusterSearcher.class.getName(),
-            com.yahoo.search.cluster.PingableSearcher.class.getName(),
-            com.yahoo.search.federation.FederationSearcher.class.getName(),
-            com.yahoo.search.federation.ForwardingSearcher.class.getName(),
-            com.yahoo.search.grouping.GroupingQueryParser.class.getName(),
-            com.yahoo.search.grouping.GroupingValidator.class.getName(),
-            com.yahoo.search.grouping.vespa.GroupingExecutor.class.getName(),
-            com.yahoo.search.pagetemplates.PageTemplate.class.getName(),
-            com.yahoo.search.pagetemplates.PageTemplateSearcher.class.getName(),
-            com.yahoo.search.pagetemplates.engine.Resolver.class.getName(),
-            com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver.class.getName(),
-            com.yahoo.search.pagetemplates.engine.resolvers.RandomResolver.class.getName(),
-            com.yahoo.search.pagetemplates.model.Renderer.class.getName(),
-            com.yahoo.search.query.rewrite.QueryRewriteSearcher.class.getName(),
-            com.yahoo.search.query.rewrite.SearchChainDispatcherSearcher.class.getName(),
-            com.yahoo.search.query.rewrite.rewriters.GenericExpansionRewriter.class.getName(),
-            com.yahoo.search.query.rewrite.rewriters.MisspellRewriter.class.getName(),
-            com.yahoo.search.query.rewrite.rewriters.NameRewriter.class.getName(),
-            com.yahoo.search.querytransform.AllLowercasingSearcher.class.getName(),
-            com.yahoo.search.querytransform.DefaultPositionSearcher.class.getName(),
-            com.yahoo.search.querytransform.LowercasingSearcher.class.getName(),
-            com.yahoo.search.querytransform.NGramSearcher.class.getName(),
-            com.yahoo.search.querytransform.VespaLowercasingSearcher.class.getName(),
-            com.yahoo.search.rendering.Renderer.class.getName(),
-            com.yahoo.search.rendering.SectionedRenderer.class.getName(),
-            com.yahoo.search.searchchain.ForkingSearcher.class.getName(),
-            com.yahoo.search.searchers.CacheControlSearcher.class.getName(),
-            com.yahoo.search.searchers.RateLimitingSearcher.class.getName(),
-            com.yahoo.vespa.streamingvisitors.MetricsSearcher.class.getName(),
-            com.yahoo.vespa.streamingvisitors.StreamingSearcher.class.getName()
+            "com.yahoo.docproc.AbstractConcreteDocumentFactory",
+            "com.yahoo.docproc.DocumentProcessor",
+            "com.yahoo.docproc.SimpleDocumentProcessor",
+            "com.yahoo.example.TimingSearcher",
+            "com.yahoo.language.simple.SimpleLinguistics",
+            "com.yahoo.prelude.cluster.ClusterSearcher",
+            "com.yahoo.prelude.fastsearch.FastSearcher",
+            "com.yahoo.prelude.fastsearch.VespaBackEndSearcher",
+            "com.yahoo.prelude.querytransform.CJKSearcher",
+            "com.yahoo.prelude.querytransform.CollapsePhraseSearcher",
+            "com.yahoo.prelude.querytransform.LiteralBoostSearcher",
+            "com.yahoo.prelude.querytransform.NoRankingSearcher",
+            "com.yahoo.prelude.querytransform.NonPhrasingSearcher",
+            "com.yahoo.prelude.querytransform.NormalizingSearcher",
+            "com.yahoo.prelude.querytransform.PhrasingSearcher",
+            "com.yahoo.prelude.querytransform.RecallSearcher",
+            "com.yahoo.prelude.querytransform.StemmingSearcher",
+            "com.yahoo.prelude.searcher.BlendingSearcher",
+            "com.yahoo.prelude.searcher.FieldCollapsingSearcher",
+            "com.yahoo.prelude.searcher.FillSearcher",
+            "com.yahoo.prelude.searcher.JSONDebugSearcher",
+            "com.yahoo.prelude.searcher.JuniperSearcher",
+            "com.yahoo.prelude.searcher.MultipleResultsSearcher",
+            "com.yahoo.prelude.searcher.PosSearcher",
+            "com.yahoo.prelude.searcher.QuotingSearcher",
+            "com.yahoo.prelude.searcher.ValidateSortingSearcher",
+            "com.yahoo.prelude.semantics.SemanticSearcher",
+            "com.yahoo.prelude.statistics.StatisticsSearcher",
+            "com.yahoo.prelude.templates.SearchRendererAdaptor",
+            "com.yahoo.search.Searcher",
+            "com.yahoo.search.cluster.ClusterSearcher",
+            "com.yahoo.search.cluster.PingableSearcher",
+            "com.yahoo.search.federation.FederationSearcher",
+            "com.yahoo.search.federation.ForwardingSearcher",
+            "com.yahoo.search.federation.http.ConfiguredHTTPClientSearcher",
+            "com.yahoo.search.federation.http.ConfiguredHTTPProviderSearcher",
+            "com.yahoo.search.federation.http.HTTPClientSearcher",
+            "com.yahoo.search.federation.http.HTTPProviderSearcher",
+            "com.yahoo.search.federation.http.HTTPSearcher",
+            "com.yahoo.search.federation.news.NewsSearcher",
+            "com.yahoo.search.federation.vespa.VespaSearcher",
+            "com.yahoo.search.grouping.GroupingQueryParser",
+            "com.yahoo.search.grouping.GroupingValidator",
+            "com.yahoo.search.grouping.vespa.GroupingExecutor",
+            "com.yahoo.search.handler.SearchWithRendererHandler",
+            "com.yahoo.search.pagetemplates.PageTemplate",
+            "com.yahoo.search.pagetemplates.PageTemplateSearcher",
+            "com.yahoo.search.pagetemplates.engine.Resolver",
+            "com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver",
+            "com.yahoo.search.pagetemplates.engine.resolvers.RandomResolver",
+            "com.yahoo.search.pagetemplates.model.Renderer",
+            "com.yahoo.search.query.rewrite.QueryRewriteSearcher",
+            "com.yahoo.search.query.rewrite.SearchChainDispatcherSearcher",
+            "com.yahoo.search.query.rewrite.rewriters.GenericExpansionRewriter",
+            "com.yahoo.search.query.rewrite.rewriters.MisspellRewriter",
+            "com.yahoo.search.query.rewrite.rewriters.NameRewriter",
+            "com.yahoo.search.querytransform.AllLowercasingSearcher",
+            "com.yahoo.search.querytransform.DefaultPositionSearcher",
+            "com.yahoo.search.querytransform.LowercasingSearcher",
+            "com.yahoo.search.querytransform.NGramSearcher",
+            "com.yahoo.search.querytransform.VespaLowercasingSearcher",
+            "com.yahoo.search.rendering.Renderer",
+            "com.yahoo.search.rendering.SectionedRenderer",
+            "com.yahoo.search.searchchain.ForkingSearcher",
+            "com.yahoo.search.searchchain.example.ExampleSearcher",
+            "com.yahoo.search.searchers.CacheControlSearcher",
+            "com.yahoo.search.searchers.RateLimitingSearcher",
+            "com.yahoo.vespa.streamingvisitors.MetricsSearcher",
+            "com.yahoo.vespa.streamingvisitors.VdsStreamingSearcher"
     );
 
 }