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

136096 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135842 gjames: SEARCH-376: Adding the includeRequest parameter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137468 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:00:27 +00:00
parent d197450d1a
commit 1f5f8cf0ee
7 changed files with 37 additions and 15 deletions

View File

@@ -56,12 +56,14 @@ public class SearchQuery
private final Limits limits;
private final GeneralHighlightParameters highlight;
private final IntervalParameters facetIntervals;
private final boolean includeRequest;
public static final SearchQuery EMPTY = new SearchQuery(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);
@JsonCreator
public SearchQuery(@JsonProperty("query") Query query,
@JsonProperty("paging") Paging paging,
@JsonProperty("includeRequest") Boolean includeRequest,
@JsonProperty("include") List<String> include,
@JsonProperty("fields") List<String> fields,
@JsonProperty("sort") List<SortDef> sort,
@@ -77,6 +79,7 @@ public class SearchQuery
@JsonProperty("facetIntervals")IntervalParameters facetIntervals)
{
this.query = query;
this.includeRequest = includeRequest==null?false:includeRequest;
this.paging = paging;
this.include = include;
this.fields = fields;
@@ -166,4 +169,9 @@ public class SearchQuery
{
return limits;
}
public boolean includeRequest()
{
return includeRequest;
}
}