mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
Fix for ACE-4140 BC - Public API - R109683 introduces an incompatibility change to the public API
- reverted the return type, deprecated the method and added a new one. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
* Copyright (C) 2005-2015 Alfresco Software Limited.
|
||||||
*
|
*
|
||||||
* This file is part of Alfresco
|
* This file is part of Alfresco
|
||||||
*
|
*
|
||||||
@@ -80,7 +80,7 @@ public class SolrCategoryServiceImpl extends LuceneCategoryServiceImpl
|
|||||||
sp.addStore(storeRef);
|
sp.addStore(storeRef);
|
||||||
sp.setQuery(catProperty+":*");
|
sp.setQuery(catProperty+":*");
|
||||||
FieldFacet ff = new FieldFacet(field);
|
FieldFacet ff = new FieldFacet(field);
|
||||||
ff.setLimit(count);
|
ff.setLimitOrNull(count);
|
||||||
sp.addFieldFacet(ff);
|
sp.addFieldFacet(ff);
|
||||||
|
|
||||||
ResultSet resultSet = null;
|
ResultSet resultSet = null;
|
||||||
|
@@ -447,7 +447,7 @@ public class SolrQueryHTTPClient implements BeanFactoryAware
|
|||||||
url.append("&").append(encoder.encode("f."+facet.getField()+".facet.enum.cache.minDf", "UTF-8")).append("=").append(encoder.encode(""+facet.getEnumMethodCacheMinDF(), "UTF-8"));
|
url.append("&").append(encoder.encode("f."+facet.getField()+".facet.enum.cache.minDf", "UTF-8")).append("=").append(encoder.encode(""+facet.getEnumMethodCacheMinDF(), "UTF-8"));
|
||||||
}
|
}
|
||||||
int facetLimit;
|
int facetLimit;
|
||||||
if(facet.getLimit() == null)
|
if(facet.getLimitOrNull() == null)
|
||||||
{
|
{
|
||||||
if(mapping.isSharded())
|
if(mapping.isSharded())
|
||||||
{
|
{
|
||||||
@@ -460,7 +460,7 @@ public class SolrQueryHTTPClient implements BeanFactoryAware
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
facetLimit = facet.getLimit().intValue();
|
facetLimit = facet.getLimitOrNull().intValue();
|
||||||
}
|
}
|
||||||
url.append("&").append(encoder.encode("f."+facet.getField()+".facet.limit", "UTF-8")).append("=").append(encoder.encode(""+facetLimit, "UTF-8"));
|
url.append("&").append(encoder.encode("f."+facet.getField()+".facet.limit", "UTF-8")).append("=").append(encoder.encode(""+facetLimit, "UTF-8"));
|
||||||
if(facet.getMethod() != null)
|
if(facet.getMethod() != null)
|
||||||
|
Reference in New Issue
Block a user