Make members final and use Map/List.of() to simplify logic sprinkled around.

1 files changed, 3 insertions, 2 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java b/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java
index bc78579ea77..d61da0ebedf 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java
@@ -52,9 +52,10 @@ public class GroupingValidator extends Searcher {
     public GroupingValidator(QrSearchersConfig qrsConfig, ClusterConfig clusterConfig,
                              AttributesConfig attributesConfig) {
         int clusterId = clusterConfig.clusterId();
-        QrSearchersConfig.Searchcluster.Indexingmode.Enum indexingMode = qrsConfig.searchcluster(clusterId).indexingmode();
+        var searchCluster = qrsConfig.searchcluster(clusterId);
+        QrSearchersConfig.Searchcluster.Indexingmode.Enum indexingMode = searchCluster.indexingmode();
         enabled = (indexingMode != QrSearchersConfig.Searchcluster.Indexingmode.STREAMING);
-        clusterName = enabled ? qrsConfig.searchcluster(clusterId).name() : null;
+        clusterName = enabled ? searchCluster.name() : null;
         for (AttributesConfig.Attribute attr : attributesConfig.attribute()) {
             attributes.put(attr.name(), attr);
         }