Added requested changes

3 files changed, 6 insertions, 13 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java b/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java
index e3f2af19449..778429a4f64 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java
@@ -21,8 +21,7 @@ import java.util.*;
  * @author Simon Thoresen Hult
  */
 public class GroupingRequest {
-
-    public final static String PROP_REQUEST = GroupingRequest.class.getName() + ".Request";
+    
     private final List<Continuation> continuations = new ArrayList<>();
     private final int requestId;
     private GroupingOperation root;
@@ -136,7 +135,7 @@ public class GroupingRequest {
         List<GroupingRequest> lst = getRequests(query);
         if (lst.isEmpty()) {
             lst = new LinkedList<>();
-            query.properties().set(PROP_REQUEST, lst);
+            query.getSelect().setGrouping(lst);
         }
         GroupingRequest ret = new GroupingRequest(lst.size());
         lst.add(ret);
diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
index 8d59560b13b..559a7279f83 100644
--- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
+++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
@@ -141,9 +141,8 @@ public class QueryProperties extends Properties {
             if (key.toString().equals(Ranking.RANKING)) return query.getRanking();
             if (key.toString().equals(Presentation.PRESENTATION)) return query.getPresentation();
 
-        } else if (key.toString().equals(GroupingRequest.PROP_REQUEST)) {
-            return query.getSelect().getGrouping();
         }
+
         return super.get(key, context, substitution);
     }
 
@@ -281,11 +280,7 @@ public class QueryProperties extends Properties {
                     query.setGroupingSessionCache(asBoolean(value, false));
                 else
                     super.set(key,value,context);
-            } else if (key.toString().equals(GroupingRequest.PROP_REQUEST)) {
-                query.getSelect().setGrouping((List<GroupingRequest>) value);
-
-            }
-            else
+            } else
                 super.set(key,value,context);
         }
         catch (Exception e) { // Make sure error messages are informative. This should be moved out of this properties implementation
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 2815bce41f5..410dd47734f 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
@@ -119,10 +119,9 @@ public class GroupingRequestTestCase {
     @Test
     public void requireThatGetRequestThrowsIllegalArgumentOnBadProperty() throws Exception {
         Query query = new Query();
-        Field propName = GroupingRequest.class.getDeclaredField("PROP_REQUEST");
-        propName.setAccessible(true);
+        String propName = GroupingRequest.class.getName() + ".Request";
         try {
-            query.properties().set(propName.get(null).toString(), new Object());
+            query.properties().set(propName, new Object());
             GroupingRequest.getRequests(query);
             fail();
         } catch (IllegalArgumentException e) {