Merge pull request #30499 from vespa-engine/balder/provide-configid-per-document-type

- Set the complete list of the config where it contains the complete …

6 files changed, 12 insertions, 12 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
index b0456b941f4..3822fa575d6 100644
--- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
@@ -150,7 +150,7 @@ public class ClusterSearcher extends Searcher {
                                                searchClusterConfig.searchdef());
         ClusterParams clusterParams = makeClusterParams(searchclusterIndex);
         StreamingSearcher searcher = new StreamingSearcher(access);
-        searcher.setSearchClusterName(searchClusterConfig.rankprofiles().configid());
+        searcher.setSearchClusterName(searchClusterConfig.rankprofiles_configid());
         searcher.setDocumentType(searchClusterConfig.searchdef(0));
         searcher.setStorageClusterRouteSpec(searchClusterConfig.storagecluster().routespec());
         searcher.init(serverId, docSumParams, clusterParams, documentdbInfoConfig, schemaInfo);
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/NonPhrasingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/NonPhrasingSearcher.java
index 59111b1b018..654f2e271ec 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/NonPhrasingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/NonPhrasingSearcher.java
@@ -44,7 +44,7 @@ public class NonPhrasingSearcher extends Searcher {
     }
 
     private void setupAutomatonFile(String phraseAutomatonFile) {
-        if (phraseAutomatonFile == null || phraseAutomatonFile.trim().equals("")) {
+        if (phraseAutomatonFile == null || phraseAutomatonFile.trim().isEmpty()) {
             //no file, just use dummy matcher
             phraseMatcher = PhraseMatcher.getNullMatcher();
         } else {
diff --git a/container-search/src/main/java/com/yahoo/search/ranking/GlobalPhaseSetup.java b/container-search/src/main/java/com/yahoo/search/ranking/GlobalPhaseSetup.java
index c7c516bf2d3..7b9c5563997 100644
--- a/container-search/src/main/java/com/yahoo/search/ranking/GlobalPhaseSetup.java
+++ b/container-search/src/main/java/com/yahoo/search/ranking/GlobalPhaseSetup.java
@@ -7,7 +7,13 @@ import com.yahoo.tensor.Tensor;
 import com.yahoo.tensor.TensorType;
 import com.yahoo.vespa.config.search.RankProfilesConfig;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.function.Supplier;
 
 class GlobalPhaseSetup {
@@ -122,7 +128,7 @@ class GlobalPhaseSetup {
                 } else if (availableMatchFeatures.contains(input)) {
                     String mfName = renamedFeatures.getOrDefault(input, input);
                     fromMF.add(new MatchFeatureInput(input, mfName));
-                } else if (renamedFeatures.values().contains(input)) {
+                } else if (renamedFeatures.containsValue(input)) {
                     fromMF.add(new MatchFeatureInput(input, input));
                 } else {
                     throw new IllegalArgumentException("Bad config, missing global-phase input: " + input);
@@ -145,7 +151,7 @@ class GlobalPhaseSetup {
         String toRename = null;
         for (var prop : rp.fef().property()) {
             if (prop.name().equals("vespa.globalphase.rerankcount")) {
-                rerankCount = Integer.valueOf(prop.value());
+                rerankCount = Integer.parseInt(prop.value());
             }
             if (prop.name().equals("vespa.rank.globalphase")) {
                 functionEvaluatorSource = () -> model.evaluatorOf("globalphase");
@@ -177,7 +183,7 @@ class GlobalPhaseSetup {
             for (var input : mainResolver.usedNormalizers) {
                 var cfg = availableNormalizers.get(input);
                 String normInput = cfg.input();
-                if (matchFeatures.contains(normInput) || renameFeatures.values().contains(normInput)) {
+                if (matchFeatures.contains(normInput) || renameFeatures.containsValue(normInput)) {
                     Supplier<Evaluator> normSource = () -> new DummyEvaluator(normInput);
                     normalizers.add(makeNormalizerSetup(cfg, matchFeatures, renameFeatures, normSource, List.of(normInput), rerankCount));
                 } else {
diff --git a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java
index b576260b85d..d28c2db2b9e 100644
--- a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java
+++ b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java
@@ -3,7 +3,6 @@ package com.yahoo.search.schema;
 
 import com.yahoo.container.QrSearchersConfig;
 import com.yahoo.search.config.SchemaInfoConfig;
-import com.yahoo.tensor.TensorType;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/container-search/src/test/java/com/yahoo/search/schema/SchemaInfoTester.java b/container-search/src/test/java/com/yahoo/search/schema/SchemaInfoTester.java
index 553f71d91b2..3e98b911fc8 100644
--- a/container-search/src/test/java/com/yahoo/search/schema/SchemaInfoTester.java
+++ b/container-search/src/test/java/com/yahoo/search/schema/SchemaInfoTester.java
@@ -3,12 +3,8 @@ package com.yahoo.search.schema;
 
 import com.yahoo.container.QrSearchersConfig;
 import com.yahoo.search.Query;
-import com.yahoo.search.config.IndexInfoConfig;
 import com.yahoo.search.config.SchemaInfoConfig;
-import com.yahoo.search.schema.RankProfile;
 import com.yahoo.search.schema.RankProfile.InputType;
-import com.yahoo.search.schema.Schema;
-import com.yahoo.search.schema.SchemaInfo;
 import com.yahoo.tensor.TensorType;
 
 import java.util.ArrayList;
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java
index 2a246739100..8d8e24922b1 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java
@@ -28,7 +28,6 @@ import com.yahoo.vespa.streamingvisitors.tracing.TraceExporter;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;