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

Browse Source 
130289 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130028 gjames: SEARCH-120: Moving SearchContext and facets to its own package


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 22:09:16 +00:00
parent c80a95d755
commit bdca31ff6a
8 changed files with 65 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/rest/framework/resource/SerializablePagedCollection.java
View File

@@ -26,7 +26,7 @@
package org.alfresco.rest.framework.resource;
import org.alfresco.rest.framework.resource.parameters.SearchContext;
import org.alfresco.rest.api.search.context.SearchContext;
import org.alfresco.rest.framework.resource.parameters.Paging;
import java.util.Collection;

1
source/java/org/alfresco/rest/framework/resource/parameters/CollectionWithPagingInfo.java
View File

@@ -25,6 +25,7 @@
*/
package org.alfresco.rest.framework.resource.parameters;
import org.alfresco.rest.api.search.context.SearchContext;
import org.alfresco.rest.framework.resource.SerializablePagedCollection;
import java.util.Arrays;

98
source/java/org/alfresco/rest/framework/resource/parameters/SearchContext.java
View File

@@ -1,98 +0,0 @@
/*-
* #%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.framework.resource.parameters;
import java.util.List;
import java.util.Map;
/**
* The contextual results of a Search
*/
public class SearchContext
{
private final Consistency consistency;
private final List<FacetQueryResult> facetQueries;
public SearchContext(long lastTxId, List<FacetQueryResult> facetQueries)
{
if (lastTxId > 0)
{
consistency = new Consistency(lastTxId);
}
else
{
consistency = null;
}
this.facetQueries = facetQueries;
}
public Consistency getConsistency()
{
return consistency;
}
public List<FacetQueryResult> getFacetQueries()
{
return facetQueries;
}
public static class FacetQueryResult
{
private final String label;
private final int count;
public FacetQueryResult(String label, int count)
{
this.label = label;
this.count = count;
}
public String getLabel()
{
return label;
}
public int getCount()
{
return count;
}
}
public class Consistency
{
private final long lastTxId;
public Consistency(long lastTxId)
{
this.lastTxId = lastTxId;
}
public long getlastTxId()
{
return lastTxId;
}
}
}