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 searchrep (5.2.1) to 5.2.N (5.2.1)

Browse Source 
136780 msuzuki: Search-340, amend from range to ranges


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137055 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-06-01 11:10:24 +00:00
parent b03061d2de
commit b7918fea4b
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
View File

@@ -123,7 +123,7 @@ public class SearchMapper
fromSpellCheck(sp, searchQuery.getSpellcheck()); fromSpellCheck(sp, searchQuery.getSpellcheck());
fromHighlight(sp, searchQuery.getHighlight()); fromHighlight(sp, searchQuery.getHighlight());
fromFacetIntervals(sp, searchQuery.getFacetIntervals()); fromFacetIntervals(sp, searchQuery.getFacetIntervals());
fromRange(sp, searchQuery.getFacetRange()); fromRange(sp, searchQuery.getFacetRanges());
fromScope(sp, searchQuery.getScope(), searchRequestContext); fromScope(sp, searchQuery.getScope(), searchRequestContext);
fromLimits(sp, searchQuery.getLimits()); fromLimits(sp, searchQuery.getLimits());
fromTimezone(sp, searchQuery.getTimezone()); fromTimezone(sp, searchQuery.getTimezone());
@@ -534,7 +534,7 @@ public class SearchMapper
{ {
if(rangeParams != null) if(rangeParams != null)
{ {
ParameterCheck.mandatory("range", rangeParams); ParameterCheck.mandatory("ranges", rangeParams);
ParameterCheck.mandatory("field", rangeParams.getField()); ParameterCheck.mandatory("field", rangeParams.getField());
ParameterCheck.mandatory("start", rangeParams.getStart()); ParameterCheck.mandatory("start", rangeParams.getStart());
ParameterCheck.mandatory("end", rangeParams.getEnd()); ParameterCheck.mandatory("end", rangeParams.getEnd());

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

@@ -61,7 +61,7 @@ public class SearchQuery
private final boolean includeRequest; private final boolean includeRequest;
private final List<Pivot> pivots; private final List<Pivot> pivots;
private final List<StatsRequestParameters> stats; private final List<StatsRequestParameters> stats;
private final RangeParameters range; private final RangeParameters ranges;
private final String timezone; private final String timezone;
public static final SearchQuery EMPTY = new SearchQuery(null, null, null, null, null, null, public static final SearchQuery EMPTY = new SearchQuery(null, null, null, null, null, null,
@@ -87,7 +87,7 @@ public class SearchQuery
@JsonProperty("facetIntervals")IntervalParameters facetIntervals, @JsonProperty("facetIntervals")IntervalParameters facetIntervals,
@JsonProperty("pivots") List<Pivot> pivots, @JsonProperty("pivots") List<Pivot> pivots,
@JsonProperty("stats") List<StatsRequestParameters> stats, @JsonProperty("stats") List<StatsRequestParameters> stats,
@JsonProperty("range") RangeParameters range, @JsonProperty("ranges") RangeParameters ranges,
@JsonProperty("timezone") String timezone) @JsonProperty("timezone") String timezone)
{ {
this.query = query; this.query = query;
@@ -108,7 +108,7 @@ public class SearchQuery
this.facetIntervals = facetIntervals; this.facetIntervals = facetIntervals;
this.pivots = pivots; this.pivots = pivots;
this.stats = stats; this.stats = stats;
this.range = range; this.ranges = ranges;
this.timezone = timezone; this.timezone = timezone;
} }
@@ -201,9 +201,9 @@ public class SearchQuery
return stats; return stats;
} }
public RangeParameters getFacetRange() public RangeParameters getFacetRanges()
{ {
return range; return ranges;
} }
public String getTimezone() public String getTimezone()

2
source/test-java/org/alfresco/rest/api/search/SearchQuerySerializerTests.java
View File

@@ -164,7 +164,7 @@ public class SearchQuerySerializerTests
assertEquals("cm:creator",searchQuery.getStats().get(0).getField()); assertEquals("cm:creator",searchQuery.getStats().get(0).getField());
assertEquals("mylabel",searchQuery.getStats().get(0).getLabel()); assertEquals("mylabel",searchQuery.getStats().get(0).getLabel());
//Range Facet //Range Facet
RangeParameters range = searchQuery.getFacetRange(); RangeParameters range = searchQuery.getFacetRanges();
assertNotNull(range); assertNotNull(range);
} }

2
source/test-java/org/alfresco/rest/api/search/SerializerTestHelper.java
View File

@@ -64,7 +64,7 @@ public class SerializerTestHelper implements RequestReader
+ "\"facetFields\": {\"facets\": [{\"field\": \"cm:creator\",\"prefix\": \"myquery2\",\"sort\": \"COUNT\",\"missing\": \"false\"}, {\"field\": \"modifier\",\"label\": \"mylabel\",\"method\": \"FC\",\"mincount\": \"5\"}, {\"field\": \"owner\",\"label\": \"ownerLabel\"}]}," + "\"facetFields\": {\"facets\": [{\"field\": \"cm:creator\",\"prefix\": \"myquery2\",\"sort\": \"COUNT\",\"missing\": \"false\"}, {\"field\": \"modifier\",\"label\": \"mylabel\",\"method\": \"FC\",\"mincount\": \"5\"}, {\"field\": \"owner\",\"label\": \"ownerLabel\"}]},"
+ "\"facetQueries\": [{\"query\": \"cm:created:bob\",\"label\": \"small\"}]," + "\"facetQueries\": [{\"query\": \"cm:created:bob\",\"label\": \"small\"}],"
+ "\"pivots\": [{\"key\": \"mylabel\"}]," + "\"pivots\": [{\"key\": \"mylabel\"}],"
+ "\"range\": {\"field\": \"content.size\",\"start\": \"0\",\"end\": \"300\",\"gap\": \"100\"}," + "\"ranges\": {\"field\": \"content.size\",\"start\": \"0\",\"end\": \"300\",\"gap\": \"100\"},"
+ "\"facetIntervals\": {\"sets\": [{ \"label\": \"king\", \"start\": \"1\", \"end\": \"2\",\"startInclusive\": true,\"endInclusive\": false}]" + "\"facetIntervals\": {\"sets\": [{ \"label\": \"king\", \"start\": \"1\", \"end\": \"2\",\"startInclusive\": true,\"endInclusive\": false}]"
+ ",\"intervals\": [{\"field\": \"cm:creator\",\"label\": \"creator\"," + ",\"intervals\": [{\"field\": \"cm:creator\",\"label\": \"creator\","
+ "\"sets\": [{\"label\": \"last\",\"start\": \"a\",\"end\": \"b\",\"startInclusive\": false}]" + "\"sets\": [{\"label\": \"last\",\"start\": \"a\",\"end\": \"b\",\"startInclusive\": false}]"