inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.2) to HEAD (5.2)

Browse Source 
136100 gjames: 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/HEAD/root@137472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:00:59 +00:00
parent 96c36523f3
commit eb62c3f32c
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/rest/api/search/context/SearchContext.java
View File

@@ -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;
/**

12
source/java/org/alfresco/rest/api/search/model/SearchQuery.java
View File

@@ -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;
}
}