From 7369c04df61bba6287d0720f4c61d347726646e9 Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Fri, 24 Mar 2017 13:18:20 +0000
Subject: [PATCH] Merged searchbcr (5.2.1) to 5.2.N (5.2.1)    136070 gjames:
 SEARCH-334: Processing pivot response

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@136100 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../rest/api/search/context/SearchContext.java       |  3 ++-
 .../alfresco/rest/api/search/model/SearchQuery.java  | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/source/java/org/alfresco/rest/api/search/context/SearchContext.java b/source/java/org/alfresco/rest/api/search/context/SearchContext.java
index a985a8804d..9a900b12dc 100644
--- a/source/java/org/alfresco/rest/api/search/context/SearchContext.java
+++ b/source/java/org/alfresco/rest/api/search/context/SearchContext.java
@@ -25,9 +25,10 @@
  */
 package org.alfresco.rest.api.search.context;
 
-import org.alfresco.rest.api.search.context.facetsresponse.GenericFacetResponse;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericFacetResponse;
 import org.alfresco.rest.api.search.model.SearchQuery;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
diff --git a/source/java/org/alfresco/rest/api/search/model/SearchQuery.java b/source/java/org/alfresco/rest/api/search/model/SearchQuery.java
index ea38b9a844..b81e019897 100644
--- a/source/java/org/alfresco/rest/api/search/model/SearchQuery.java
+++ b/source/java/org/alfresco/rest/api/search/model/SearchQuery.java
@@ -57,8 +57,9 @@ public class SearchQuery
     private final GeneralHighlightParameters highlight;
     private final IntervalParameters facetIntervals;
     private final boolean includeRequest;
+    private final List<Pivot> pivots;
 
-    public static final SearchQuery EMPTY = new SearchQuery(null, null, null, null, null, null,null, null, null,null, null, null, null, null, null, null);
+    public static final SearchQuery EMPTY = new SearchQuery(null, null, null, null, null, null,null, null, null, null,null, null, null, null, null, null, null);
 
     @JsonCreator
     public SearchQuery(@JsonProperty("query") Query query,
@@ -76,7 +77,8 @@ public class SearchQuery
                 @JsonProperty("scope") Scope scope,
                 @JsonProperty("limits")Limits limits,
                 @JsonProperty("highlight")GeneralHighlightParameters highlight,
-                @JsonProperty("facetIntervals")IntervalParameters facetIntervals)
+                @JsonProperty("facetIntervals")IntervalParameters facetIntervals,
+                @JsonProperty("pivots") List<Pivot> pivots)
     {
         this.query = query;
         this.includeRequest = includeRequest==null?false:includeRequest;
@@ -94,6 +96,7 @@ public class SearchQuery
         this.limits = limits;
         this.highlight = highlight;
         this.facetIntervals = facetIntervals;
+        this.pivots = pivots;
     }
 
     public Query getQuery()
@@ -174,4 +177,9 @@ public class SearchQuery
     {
         return includeRequest;
     }
+
+    public List<Pivot> getPivots()
+    {
+        return pivots;
+    }
 }