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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
84948: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83656: Addition of standard paging to FacetableProperties result sets. Part of ACE-2639.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-09-20 09:23:46 +00:00
parent dd26455cf4
commit 1d5aa5d15c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetService.java
View File

@@ -20,7 +20,7 @@
package org.alfresco.repo.search.impl.solr.facet;
import java.util.List;
import java.util.Set;
import java.util.SortedSet;
import org.alfresco.repo.dictionary.Facetable;
import org.alfresco.repo.search.impl.solr.facet.Exceptions.DuplicateFacetId;
@@ -111,7 +111,7 @@ public interface SolrFacetService
* @return a collection of facetable {@link FacetablePropertyData}s.
* @see Facetable
*/
public Set<FacetablePropertyData> getFacetableProperties();
public SortedSet<FacetablePropertyData> getFacetableProperties();
/**
* This method offers a convenient access point for getting all Facetable
@@ -120,7 +120,7 @@ public interface SolrFacetService
* @return a collection of facetable {@link FacetablePropertyData}s.
* @see Facetable
*/
public Set<FacetablePropertyData> getFacetableProperties(QName contentClass);
public SortedSet<FacetablePropertyData> getFacetableProperties(QName contentClass);
/** A simple POJO/DTO intended primarily for use in an FTL model and rendering in the JSON API. */
public static class FacetablePropertyData implements Comparable<FacetablePropertyData>

8
source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImpl.java
View File

@@ -769,9 +769,9 @@ public class SolrFacetServiceImpl extends AbstractLifecycleBean implements SolrF
}
}
@Override public Set<FacetablePropertyData> getFacetableProperties()
@Override public SortedSet<FacetablePropertyData> getFacetableProperties()
{
final Set<FacetablePropertyData> result = new TreeSet<>();
final SortedSet<FacetablePropertyData> result = new TreeSet<>();
final List<QName> allContentClasses = CollectionUtils.flatten(dictionaryService.getAllAspects(), dictionaryService.getAllTypes());
@@ -783,9 +783,9 @@ public class SolrFacetServiceImpl extends AbstractLifecycleBean implements SolrF
return result;
}
@Override public Set<FacetablePropertyData> getFacetableProperties(QName contentClass)
@Override public SortedSet<FacetablePropertyData> getFacetableProperties(QName contentClass)
{
final Set<FacetablePropertyData> result = new TreeSet<>();
final SortedSet<FacetablePropertyData> result = new TreeSet<>();
final Map<QName, PropertyDefinition> propertyDefs = dictionaryService.getPropertyDefs(contentClass);