Fix Select and grouping bugs

- Deep copy the grouping structure on query copy.
  It is mutable but we have neglected doing this right until now.
- Fix a bug in the previous commit where the last constructed Query.Model was shared between all instances.
- Fix a bug in the previous commit where the query string instead of the query tree was reset when a new select
  expression is set.
- Don't use deprecated method.
- Clean up Javadoc and formatting.

1 files changed, 20 insertions, 0 deletions

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 caad1c76362..726d5cb76be 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,6 +790,11 @@ 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";
             }
@@ -797,12 +802,22 @@ 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";
             }
@@ -860,6 +875,11 @@ 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";
             }