Use Set.of

1 files changed, 74 insertions, 77 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/PlatformBundles.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/PlatformBundles.java
index bb21830e59f..dc2437c1834 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/PlatformBundles.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/PlatformBundles.java
@@ -2,12 +2,9 @@
 package com.yahoo.vespa.model.container.xml;
 
 import com.yahoo.vespa.defaults.Defaults;
-import org.tensorflow.op.Op;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -43,80 +40,80 @@ public class PlatformBundles {
 
     // This is a hack to allow users to declare components from the search-and-docproc bundle without naming the bundle.
     static {
-        searchAndDocprocComponents = new HashSet<>();
-
-        searchAndDocprocComponents.add("com.yahoo.docproc.AbstractConcreteDocumentFactory");
-        searchAndDocprocComponents.add("com.yahoo.docproc.DocumentProcessor");
-        searchAndDocprocComponents.add("com.yahoo.docproc.SimpleDocumentProcessor");
-        searchAndDocprocComponents.add("com.yahoo.docproc.util.JoinerDocumentProcessor");
-        searchAndDocprocComponents.add("com.yahoo.docproc.util.SplitterDocumentProcessor");
-        searchAndDocprocComponents.add("com.yahoo.example.TimingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.language.simple.SimpleLinguistics");
-        searchAndDocprocComponents.add("com.yahoo.prelude.cluster.ClusterSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.fastsearch.FastSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.fastsearch.VespaBackEndSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.querytransform.CJKSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.querytransform.CollapsePhraseSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.querytransform.LiteralBoostSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.querytransform.NoRankingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.querytransform.NonPhrasingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.querytransform.NormalizingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.querytransform.PhrasingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.querytransform.RecallSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.querytransform.StemmingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.searcher.BlendingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.searcher.FieldCollapsingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.searcher.FillSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.searcher.JSONDebugSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.searcher.JuniperSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.searcher.MultipleResultsSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.searcher.PosSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.searcher.QuotingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.searcher.ValidateSortingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.semantics.SemanticSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.statistics.StatisticsSearcher");
-        searchAndDocprocComponents.add("com.yahoo.prelude.templates.SearchRendererAdaptor");
-        searchAndDocprocComponents.add("com.yahoo.search.Searcher");
-        searchAndDocprocComponents.add("com.yahoo.search.cluster.ClusterSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.cluster.PingableSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.federation.FederationSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.federation.ForwardingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.federation.http.ConfiguredHTTPClientSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.federation.http.ConfiguredHTTPProviderSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.federation.http.HTTPClientSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.federation.http.HTTPProviderSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.federation.http.HTTPSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.federation.news.NewsSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.federation.vespa.VespaSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.grouping.GroupingQueryParser");
-        searchAndDocprocComponents.add("com.yahoo.search.grouping.GroupingValidator");
-        searchAndDocprocComponents.add("com.yahoo.search.grouping.vespa.GroupingExecutor");
-        searchAndDocprocComponents.add("com.yahoo.search.handler.SearchWithRendererHandler");
-        searchAndDocprocComponents.add("com.yahoo.search.pagetemplates.PageTemplate");
-        searchAndDocprocComponents.add("com.yahoo.search.pagetemplates.PageTemplateSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.pagetemplates.engine.Resolver");
-        searchAndDocprocComponents.add("com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver");
-        searchAndDocprocComponents.add("com.yahoo.search.pagetemplates.engine.resolvers.RandomResolver");
-        searchAndDocprocComponents.add("com.yahoo.search.pagetemplates.model.Renderer");
-        searchAndDocprocComponents.add("com.yahoo.search.query.rewrite.QueryRewriteSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.query.rewrite.SearchChainDispatcherSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.query.rewrite.rewriters.GenericExpansionRewriter");
-        searchAndDocprocComponents.add("com.yahoo.search.query.rewrite.rewriters.MisspellRewriter");
-        searchAndDocprocComponents.add("com.yahoo.search.query.rewrite.rewriters.NameRewriter");
-        searchAndDocprocComponents.add("com.yahoo.search.querytransform.AllLowercasingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.querytransform.DefaultPositionSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.querytransform.LowercasingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.querytransform.NGramSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.querytransform.VespaLowercasingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.rendering.Renderer");
-        searchAndDocprocComponents.add("com.yahoo.search.rendering.SectionedRenderer");
-        searchAndDocprocComponents.add("com.yahoo.search.searchchain.ForkingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.searchchain.example.ExampleSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.searchers.CacheControlSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.statistics.PeakQpsSearcher");
-        searchAndDocprocComponents.add("com.yahoo.search.statistics.TimingSearcher");
-        searchAndDocprocComponents.add("com.yahoo.vespa.streamingvisitors.MetricsSearcher");
-        searchAndDocprocComponents.add("com.yahoo.vespa.streamingvisitors.VdsStreamingSearcher");
+        searchAndDocprocComponents = Set.of(
+                "com.yahoo.docproc.AbstractConcreteDocumentFactory",
+                "com.yahoo.docproc.DocumentProcessor",
+                "com.yahoo.docproc.SimpleDocumentProcessor",
+                "com.yahoo.docproc.util.JoinerDocumentProcessor",
+                "com.yahoo.docproc.util.SplitterDocumentProcessor",
+                "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.statistics.PeakQpsSearcher",
+                "com.yahoo.search.statistics.TimingSearcher",
+                "com.yahoo.vespa.streamingvisitors.MetricsSearcher",
+                "com.yahoo.vespa.streamingvisitors.VdsStreamingSearcher"
+        );
     }
 
 }