inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
137044 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136707 gjames: SEARCH-348: Adding timezone to search api


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:14:14 +00:00
parent 1ceecf1ebf
commit d6ccfa432f
3 changed files with 84 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,9 +62,11 @@ public class SearchQuery
private final List<Pivot> pivots;
private final List<StatsRequestParameters> stats;
private final RangeParameters facetRange;
private final String timezone;
public static final SearchQuery EMPTY = new SearchQuery(null, null, null, null, null, null,
null,null, null, null, null,null, null, null, null, null, null, null,null);
null,null, null, null, null,null, null, null, null,
null, null, null,null, null);
@JsonCreator
public SearchQuery(@JsonProperty("query") Query query,
@@ -85,7 +87,8 @@ public class SearchQuery
@JsonProperty("facetIntervals")IntervalParameters facetIntervals,
@JsonProperty("pivots") List<Pivot> pivots,
@JsonProperty("stats") List<StatsRequestParameters> stats,
@JsonProperty("facetRange") RangeParameters facetRange)
@JsonProperty("facetRange") RangeParameters facetRange,
@JsonProperty("timezone") String timezone)
{
this.query = query;
this.includeRequest = includeRequest==null?false:includeRequest;
@@ -106,6 +109,7 @@ public class SearchQuery
this.pivots = pivots;
this.stats = stats;
this.facetRange = facetRange;
this.timezone = timezone;
}
public Query getQuery()
@@ -201,5 +205,9 @@ public class SearchQuery
{
return facetRange;
}
public String getTimezone()
{
return timezone;
}
}