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

Browse Source 
130028 gjames: SEARCH-120: Moving SearchContext and facets to its own package


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130289 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2016-09-06 15:36:44 +00:00
parent 8cdfa5f8de
commit f0f886be92
8 changed files with 65 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
source/java/org/alfresco/rest/api/search/context/FacetQueryContext.java Normal file
View File

@@ -0,0 +1,51 @@
/*-
* #%L
* Alfresco Remote API
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.rest.api.search.context;
/**
* The results of a facet query
*/
public class FacetQueryContext
{
private final String label;
private final int count;
public FacetQueryContext(String label, int count)
{
this.label = label;
this.count = count;
}
public String getLabel()
{
return label;
}
public int getCount()
{
return count;
}
}

75
source/java/org/alfresco/rest/api/search/context/SearchContext.java Normal file
View File

@@ -0,0 +1,75 @@
/*-
* #%L
* Alfresco Remote API
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.rest.api.search.context;
import java.util.List;
/**
* The contextual results of a Search
*/
public class SearchContext
{
private final Consistency consistency;
private final List<FacetQueryContext> facetQueries;
public SearchContext(long lastTxId, List<FacetQueryContext> facetQueries)
{
if (lastTxId > 0)
{
consistency = new Consistency(lastTxId);
}
else
{
consistency = null;
}
this.facetQueries = facetQueries;
}
public Consistency getConsistency()
{
return consistency;
}
public List<FacetQueryContext> getFacetQueries()
{
return facetQueries;
}
public class Consistency
{
private final long lastTxId;
public Consistency(long lastTxId)
{
this.lastTxId = lastTxId;
}
public long getlastTxId()
{
return lastTxId;
}
}
}

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

@@ -33,8 +33,8 @@ import org.alfresco.rest.api.model.UserInfo;
import org.alfresco.rest.api.search.model.SearchEntry;
import org.alfresco.rest.api.search.model.SearchQuery;
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
import org.alfresco.rest.framework.resource.parameters.SearchContext;
import org.alfresco.rest.framework.resource.parameters.SearchContext.FacetQueryResult;
import org.alfresco.rest.api.search.context.SearchContext;
import org.alfresco.rest.api.search.context.FacetQueryContext;
import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.util.ParameterCheck;
import org.apache.commons.logging.Log;
@@ -134,14 +134,14 @@ public class ResultMapper
{
SearchContext context = null;
Map<String, Integer> facetQueries = solrResultSet.getFacetQueries();
List<FacetQueryResult> facetResults = null;
List<FacetQueryContext> facetResults = null;
if(facetQueries!= null && !facetQueries.isEmpty())
{
facetResults = new ArrayList<>(facetQueries.size());
for (Entry<String, Integer> fq:facetQueries.entrySet())
{
facetResults.add(new FacetQueryResult(fq.getKey(), fq.getValue()));
facetResults.add(new FacetQueryContext(fq.getKey(), fq.getValue()));
}
}
context = new SearchContext(solrResultSet.getLastIndexedTxId(), facetResults);