mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70681: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud) 69090: Updated the java doc in SolrFacetHelper class as well as removed the un-necessary LinkedHashMap. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -20,7 +20,6 @@ package org.alfresco.repo.search.impl.solr.facet;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@@ -198,12 +197,12 @@ public class SolrFacetHelper
|
|||||||
/**
|
/**
|
||||||
* Creates display name for the Date buckets.
|
* Creates display name for the Date buckets.
|
||||||
*
|
*
|
||||||
* @return Map of {@literal <date range, display label key>}
|
* @return Map of {@literal <date range, (display label key, insertion index)>}
|
||||||
*/
|
*/
|
||||||
private static Map<String, Pair<String, Integer>> makeDateBucketsDisplayLabel(LocalDate date)
|
private static Map<String, Pair<String, Integer>> makeDateBucketsDisplayLabel(LocalDate date)
|
||||||
{
|
{
|
||||||
List<String> dateBuckets = makeDateBuckets(date);
|
List<String> dateBuckets = makeDateBuckets(date);
|
||||||
Map<String, Pair<String, Integer>> bucketDisplayName = new LinkedHashMap<>(5);
|
Map<String, Pair<String, Integer>> bucketDisplayName = new HashMap<>(5);
|
||||||
|
|
||||||
if (dateBuckets.size() != 5)
|
if (dateBuckets.size() != 5)
|
||||||
{
|
{
|
||||||
@@ -222,7 +221,7 @@ public class SolrFacetHelper
|
|||||||
/**
|
/**
|
||||||
* Creates display name for the Content size buckets.
|
* Creates display name for the Content size buckets.
|
||||||
*
|
*
|
||||||
* @return Map of {@literal <size range, display label key>}
|
* @return Map of {@literal <size range, (display label key, insertion index)>}
|
||||||
*/
|
*/
|
||||||
private static Map<String, Pair<String, Integer>> makeContentSizeBucketsDisplayLabel()
|
private static Map<String, Pair<String, Integer>> makeContentSizeBucketsDisplayLabel()
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user