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

Browse Source 
135431 gjames: SEARCH-339: A basic restapi for facet intevals


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@136077 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-03-24 13:13:17 +00:00
parent 29aecf23fe
commit 1d91a071e3
8 changed files with 218 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,8 +36,9 @@ public class SearchContext
private final List<FacetQueryContext> facetQueries;
private final SpellCheckContext spellCheck;
private final List<FacetFieldContext> facetsFields;
private final List<FacetFieldContext> facetIntervals;
public SearchContext(long lastTxId, List<FacetQueryContext> facetQueries, List<FacetFieldContext> facetsFields, SpellCheckContext spellCheck)
public SearchContext(long lastTxId, List<FacetQueryContext> facetQueries, List<FacetFieldContext> facetsFields, List<FacetFieldContext> facetIntervals, SpellCheckContext spellCheck)
{
this.spellCheck = spellCheck;
if (lastTxId > 0)
@@ -50,6 +51,7 @@ public class SearchContext
}
this.facetQueries = facetQueries;
this.facetsFields = facetsFields;
this.facetIntervals = facetIntervals;
}
public Consistency getConsistency()
@@ -67,6 +69,11 @@ public class SearchContext
return spellCheck;
}
public List<FacetFieldContext> getFacetIntervals()
{
return facetIntervals;
}
public List<FacetFieldContext> getFacetsFields()
{
return facetsFields;

50
source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
View File

@@ -282,23 +282,10 @@ public class ResultMapper
//Field Facets
Map<String, List<Pair<String, Integer>>> facetFields = solrResultSet.getFieldFacets();
if (facetFields != null && !facetFields.isEmpty())
{
ffcs = new ArrayList<>(facetFields.size());
for (Entry<String, List<Pair<String, Integer>>> facet:facetFields.entrySet())
{
if (facet.getValue() != null && !facet.getValue().isEmpty())
{
List<Bucket> buckets = new ArrayList<>(facet.getValue().size());
for (Pair<String, Integer> buck:facet.getValue())
{
Object display = propertyLookup.lookup(facet.getKey(), buck.getFirst());
buckets.add(new Bucket(buck.getFirst(), buck.getSecond(), display));
}
ffcs.add(new FacetFieldContext(facet.getKey(), buckets));
}
}
}
ffcs = getFacetBuckets(facetFields, true);
Map<String, List<Pair<String, Integer>>> facetInterval = solrResultSet.getFacetIntervals();
List<FacetFieldContext> intervals = getFacetBuckets(facetInterval, false);
//Spelling
SpellCheckResult spell = solrResultSet.getSpellCheckResult();
@@ -308,10 +295,34 @@ public class ResultMapper
}
//Put it all together
context = new SearchContext(solrResultSet.getLastIndexedTxId(), facetResults, ffcs, spellCheckContext);
context = new SearchContext(solrResultSet.getLastIndexedTxId(), facetResults, ffcs, intervals, spellCheckContext);
return isNullContext(context)?null:context;
}
protected List<FacetFieldContext> getFacetBuckets(Map<String, List<Pair<String, Integer>>> facetFields, boolean withDisplay)
{
if (facetFields != null && !facetFields.isEmpty())
{
List<FacetFieldContext> ffcs = new ArrayList<>(facetFields.size());
for (Entry<String, List<Pair<String, Integer>>> facet:facetFields.entrySet())
{
if (facet.getValue() != null && !facet.getValue().isEmpty())
{
List<Bucket> buckets = new ArrayList<>(facet.getValue().size());
for (Pair<String, Integer> buck:facet.getValue())
{
Object display = withDisplay?propertyLookup.lookup(facet.getKey(), buck.getFirst()):null;
buckets.add(new Bucket(buck.getFirst(), buck.getSecond(), display));
}
ffcs.add(new FacetFieldContext(facet.getKey(), buckets));
}
}
return ffcs;
}
return null;
}
/**
* Is the context null?
* @param context
@@ -322,7 +333,8 @@ public class ResultMapper
return (context.getFacetQueries() == null
&& context.getConsistency() == null
&& context.getSpellCheck() == null
&& context.getFacetsFields() == null);
&& context.getFacetsFields() == null
&& context.getFacetIntervals() == null);
}
/**

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

@@ -45,6 +45,9 @@ import org.alfresco.rest.framework.resource.parameters.Paging;
import org.alfresco.rest.framework.resource.parameters.Params;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.GeneralHighlightParameters;
import org.alfresco.service.cmr.search.Interval;
import org.alfresco.service.cmr.search.IntervalParameters;
import org.alfresco.service.cmr.search.IntervalSet;
import org.alfresco.service.cmr.search.LimitBy;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchParameters.FieldFacet;
@@ -108,6 +111,7 @@ public class SearchMapper
fromFacetFields(sp, searchQuery.getFacetFields());
fromSpellCheck(sp, searchQuery.getSpellcheck());
fromHighlight(sp, searchQuery.getHighlight());
fromFacetIntervals(sp, searchQuery.getFacetIntervals());
fromScope(sp, searchQuery.getScope());
fromLimits(sp, searchQuery.getLimits());
@@ -452,6 +456,56 @@ public class SearchMapper
}
}
/**
* Sets the Interval Parameters object on search parameters
*
* It does some valiation then takes any "SETS" at the top level and sets them at every field level.
*
* @param sp SearchParameters
* @param facetIntervals IntervalParameters
*/
public void fromFacetIntervals(SearchParameters sp, IntervalParameters facetIntervals)
{
if (facetIntervals != null)
{
ParameterCheck.mandatory("facetIntervals intervals", facetIntervals.getIntervals());
List<IntervalSet> globalSets = facetIntervals.getSets();
validateSets(globalSets, "facetIntervals");
if (facetIntervals.getIntervals() != null && !facetIntervals.getIntervals().isEmpty())
{
for (Interval interval:facetIntervals.getIntervals())
{
ParameterCheck.mandatory("facetIntervals intervals field", interval.getField());
validateSets(interval.getSets(), "facetIntervals intervals "+interval.getField());
if (interval.getSets() != null && globalSets != null)
{
interval.getSets().addAll(globalSets);
}
}
}
if (facetIntervals.getSets() != null)
{
facetIntervals.getSets().clear();
}
}
sp.setInterval(facetIntervals);
}
protected void validateSets(List<IntervalSet> intervalSets, String prefix)
{
if (intervalSets != null && !intervalSets.isEmpty())
{
for (IntervalSet aSet:intervalSets)
{
ParameterCheck.mandatory(prefix+" sets start", aSet.getStart());
ParameterCheck.mandatory(prefix+" sets end", aSet.getEnd());
}
}
}
/**
* Sets the hightlight object on search parameters
* @param sp SearchParameters

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

@@ -28,6 +28,7 @@ package org.alfresco.rest.api.search.model;
import org.alfresco.rest.framework.resource.parameters.Paging;
import org.alfresco.service.cmr.search.GeneralHighlightParameters;
import org.alfresco.service.cmr.search.IntervalParameters;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty;
@@ -54,8 +55,9 @@ public class SearchQuery
private final Scope scope;
private final Limits limits;
private final GeneralHighlightParameters highlight;
private final IntervalParameters facetIntervals;
public static final SearchQuery EMPTY = new SearchQuery(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);
@JsonCreator
public SearchQuery(@JsonProperty("query") Query query,
@@ -71,7 +73,8 @@ public class SearchQuery
@JsonProperty("spellcheck") Spelling spellcheck,
@JsonProperty("scope") Scope scope,
@JsonProperty("limits")Limits limits,
@JsonProperty("highlight")GeneralHighlightParameters highlight)
@JsonProperty("highlight")GeneralHighlightParameters highlight,
@JsonProperty("facetIntervals")IntervalParameters facetIntervals)
{
this.query = query;
this.paging = paging;
@@ -87,6 +90,7 @@ public class SearchQuery
this.facetFields = facetFields;
this.limits = limits;
this.highlight = highlight;
this.facetIntervals = facetIntervals;
}
public Query getQuery()
@@ -152,6 +156,12 @@ public class SearchQuery
{
return highlight;
}
public IntervalParameters getFacetIntervals()
{
return facetIntervals;
}
public Limits getLimits()
{
return limits;