Revert "Revert "Revert "Added a object structure for GroupingRequest objects, accessable from…"""

1 files changed, 2 insertions, 1 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 d96f490909e..6379c43bc87 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
@@ -63,8 +63,9 @@ public class GroupingValidator extends Searcher {
     public Result search(Query query, Execution execution) {
         if (enabled && query.properties().getBoolean(PARAM_ENABLED, true)) {
             ExpressionVisitor visitor = new MyVisitor();
-            for (GroupingRequest req : query.getSelect().getGrouping())
+            for (GroupingRequest req : GroupingRequest.getRequests(query)) {
                 req.getRootOperation().visitExpressions(visitor);
+            }
         }
         return execution.search(query);
     }