Cleanup and throw IllegalArgumentException on invalid path

2 files changed, 9 insertions, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/Node.java b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/Node.java
index d9c0198a472..73a3c3742cc 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/Node.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/Node.java
@@ -55,7 +55,11 @@ public class Node {
 
     public String hostname() { return hostname; }
 
-    /** Returns the id of the group this node belongs to */
+    /**
+     * Returns the index of the group this node belongs to.
+     * This is a 0-base continuous integer id, not necessarily the same as the group id assigned by the
+     * application/node repo.
+     */
     public int group() { return group; }
 
     public void setWorking(boolean working) {
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java
index f5ce987c64c..906268c5904 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java
@@ -8,16 +8,20 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 public class SearchGroupsImpl implements SearchGroups {
+
     private final Map<Integer, Group> groups;
     private final double minActivedocsPercentage;
+
     public SearchGroupsImpl(Map<Integer, Group> groups, double minActivedocsPercentage) {
         this.groups = Map.copyOf(groups);
         this.minActivedocsPercentage = minActivedocsPercentage;
     }
+
     @Override public Group get(int id) { return groups.get(id); }
     @Override public Set<Integer> keys() { return groups.keySet();}
     @Override public Collection<Group> groups() { return groups.values(); }
     @Override public int size() { return groups.size(); }
+
     @Override
     public boolean isPartialGroupCoverageSufficient(Collection<Node> nodes) {
         if (size() == 1)