Merge pull request #6582 from vespa-engine/revert-6557-revert-6553-revert-6512-henrhoi/object-structured-grouping

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

10 files changed, 24 insertions, 65 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/grouping/GroupingQueryParserTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/GroupingQueryParserTestCase.java
index 90459fe614f..8de704a8a0e 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/GroupingQueryParserTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/GroupingQueryParserTestCase.java
@@ -105,6 +105,6 @@ public class GroupingQueryParserTestCase {
         query.properties().set(GroupingQueryParser.PARAM_CONTINUE, continuation);
         query.properties().set(GroupingQueryParser.PARAM_TIMEZONE, timeZone);
         new Execution(new GroupingQueryParser(), Execution.Context.createContextStub()).search(query);
-        return query.getSelect().getGrouping();
+        return GroupingRequest.getRequests(query);
     }
 }
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java
index 8b1bbb6842e..494602be7b3 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java
@@ -10,10 +10,8 @@ import com.yahoo.search.result.Hit;
 import org.junit.Test;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
 
 import static org.junit.Assert.*;
 
@@ -28,10 +26,7 @@ public class GroupingRequestTestCase {
         assertTrue(req.continuations().isEmpty());
 
         Continuation foo = new Continuation() {
-            @Override
-            public Continuation copy() {
-                return null;
-            }
+
         };
         req.continuations().add(foo);
         assertEquals(Arrays.asList(foo), req.continuations());
@@ -110,22 +105,32 @@ public class GroupingRequestTestCase {
     @Test
     public void requireThatGetRequestsReturnsAllRequests() {
         Query query = new Query();
-        assertEquals(Collections.emptyList(), query.getSelect().getGrouping());
+        assertEquals(Collections.emptyList(), GroupingRequest.getRequests(query));
 
         GroupingRequest foo = GroupingRequest.newInstance(query);
-        assertEquals(Arrays.asList(foo), query.getSelect().getGrouping());
+        assertEquals(Arrays.asList(foo), GroupingRequest.getRequests(query));
 
         GroupingRequest bar = GroupingRequest.newInstance(query);
-        assertEquals(Arrays.asList(foo, bar), query.getSelect().getGrouping());
+        assertEquals(Arrays.asList(foo, bar), GroupingRequest.getRequests(query));
+    }
+
+    @Test
+    public void requireThatGetRequestThrowsIllegalArgumentOnBadProperty() throws Exception {
+        Query query = new Query();
+        Field propName = GroupingRequest.class.getDeclaredField("PROP_REQUEST");
+        propName.setAccessible(true);
+        query.properties().set((CompoundName)propName.get(null), new Object());
+        try {
+            GroupingRequest.getRequests(query);
+            fail();
+        } catch (IllegalArgumentException e) {
+
+        }
     }
-    
 
     private static RootGroup newRootGroup(int id) {
         return new RootGroup(id, new Continuation() {
-            @Override
-            public Continuation copy() {
-                return null;
-            }
+
         });
     }
 }
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/UniqueGroupingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/UniqueGroupingSearcherTestCase.java
index 22e5196c0c6..b570adc51c6 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/UniqueGroupingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/UniqueGroupingSearcherTestCase.java
@@ -210,7 +210,7 @@ public class UniqueGroupingSearcherTestCase {
             Result result = new Result(query);
             if (addGroupingData) {
                 result.hits().add(resultGroup);
-                query.getSelect().getGrouping().get(0).setResultGroup(resultGroup);
+                GroupingRequest.getRequests(query).get(0).setResultGroup(resultGroup);
                 result.setTotalHitCount(totalHitCount);
             }
             return result;
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java
index b8cc25930e2..651321a3b69 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java
@@ -31,11 +31,5 @@ public class GroupListTestCase {
 
     private static class MyContinuation extends Continuation {
 
-        @Override
-        public Continuation copy() {
-            return null;
-        }
-
     }
-
 }
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/HitListTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/HitListTestCase.java
index 8203691e11e..05a78b71cac 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/result/HitListTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/result/HitListTestCase.java
@@ -31,11 +31,5 @@ public class HitListTestCase {
 
     private static class MyContinuation extends Continuation {
 
-        @Override
-        public Continuation copy() {
-            return null;
-        }
-
     }
-
 }
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java
index 657c169720e..85b8ff7a6d5 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java
@@ -167,15 +167,8 @@ public class HitRendererTestCase {
         }
 
         @Override
-        public Continuation copy() {
-            return null;
-        }
-
-        @Override
         public String toString() {
             return str;
         }
-
     }
-
 }
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/CompositeContinuationTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/CompositeContinuationTestCase.java
index b9887495940..6a6741ae1b4 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/CompositeContinuationTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/CompositeContinuationTestCase.java
@@ -109,11 +109,6 @@ public class CompositeContinuationTestCase {
     private static class MyContinuation extends EncodableContinuation {
 
         @Override
-        public EncodableContinuation copy() {
-            return null;
-        }
-
-        @Override
         public void encode(IntegerEncoder out) {
 
         }
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java
index 161c3a24801..038df42bd28 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java
@@ -162,10 +162,7 @@ public class GroupingTransformTestCase {
         GroupingTransform transform = newTransform();
         try {
             transform.addContinuation(new Continuation() {
-                @Override
-                public Continuation copy() {
-                    return null;
-                }
+
             });
             fail();
         } catch (UnsupportedOperationException e) {
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
index 726d5cb76be..caad1c76362 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
@@ -790,11 +790,6 @@ public class JsonRendererTestCase {
         Result r = newEmptyResult();
         RootGroup rg = new RootGroup(0, new Continuation() {
             @Override
-            public Continuation copy() {
-                return null;
-            }
-
-            @Override
             public String toString() {
                 return "AAAA";
             }
@@ -802,22 +797,12 @@ public class JsonRendererTestCase {
         GroupList gl = new GroupList("customer");
         gl.continuations().put("prev", new Continuation() {
             @Override
-            public Continuation copy() {
-                return null;
-            }
-
-            @Override
             public String toString() {
                 return "BBBB";
             }
         });
         gl.continuations().put("next", new Continuation() {
             @Override
-            public Continuation copy() {
-                return null;
-            }
-
-            @Override
             public String toString() {
                 return "CCCC";
             }
@@ -875,11 +860,6 @@ public class JsonRendererTestCase {
         Result r = newEmptyResult();
         RootGroup rg = new RootGroup(0, new Continuation() {
             @Override
-            public Continuation copy() {
-                return null;
-            }
-
-            @Override
             public String toString() {
                 return "AAAA";
             }
diff --git a/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java
index b23e25e173e..e5dbe10a0e4 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java
@@ -329,8 +329,9 @@ public class MinimalQueryInserterTestCase {
 
     private static void assertGrouping(String expected, Query query) {
         List<String> actual = new ArrayList<>();
-        for (GroupingRequest request : query.getSelect().getGrouping())
+        for (GroupingRequest request : GroupingRequest.getRequests(query)) {
             actual.add(request.continuations().toString() + request.getRootOperation());
+        }
         assertEquals(expected, actual.toString());
     }