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 
130565 gjames: SEARCH-171:Search api default language should be Afts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132146 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-03 13:11:51 +00:00
parent 4f47d68c8b
commit 60bc1692dc
2 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
View File

@@ -40,25 +40,17 @@ import org.alfresco.rest.api.search.model.SortDef;
import org.alfresco.rest.api.search.model.Spelling;
import org.alfresco.rest.api.search.model.Template;
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
import org.alfresco.rest.framework.resource.content.BasicContentInfo;
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
import org.alfresco.rest.framework.resource.parameters.Paging;
import org.alfresco.rest.framework.resource.parameters.Params;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.LimitBy;
import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.rest.api.model.Node;
import org.alfresco.service.cmr.search.SearchParameters.FieldFacet;
import org.alfresco.service.cmr.search.SearchParameters.FieldFacetMethod;
import org.alfresco.service.cmr.search.SearchParameters.FieldFacetSort;
import org.alfresco.service.cmr.search.SearchParameters.Operator;
import org.alfresco.service.cmr.search.SearchParameters.SortDefinition;
import org.alfresco.service.cmr.search.SearchParameters.SortDefinition.SortType;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.ParameterCheck;
import org.apache.commons.lang.NotImplementedException;
import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ALLOWABLEOPERATIONS;
import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ASSOCIATION;
@@ -66,12 +58,9 @@ import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ISLINK;
import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_PATH;
import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ASPECTNAMES;
import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_PROPERTIES;
import static org.alfresco.rest.api.impl.NodesImpl.PARAM_SYNONYMS_QNAME;
import static org.alfresco.service.cmr.search.SearchService.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
@@ -138,9 +127,9 @@ public class SearchMapper
public void fromQuery(SearchParameters sp, Query q)
{
ParameterCheck.mandatoryString("query", q.getQuery());
ParameterCheck.mandatoryString("language", q.getLanguage());
String lang = q.getLanguage()==null?AFTS:q.getLanguage();
switch (q.getLanguage().toLowerCase())
switch (lang.toLowerCase())
{
case AFTS:
sp.setLanguage(LANGUAGE_FTS_ALFRESCO);

10
source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
View File

@@ -56,7 +56,6 @@ import org.alfresco.service.cmr.search.LimitBy;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchParameters.FieldFacet;
import org.alfresco.service.cmr.search.SearchService;
import org.codehaus.jackson.annotate.JsonProperty;
import org.junit.Test;
import java.util.Arrays;
@@ -109,14 +108,9 @@ public class SearchMapperTests
Query q = new Query(null,"hello", null);
try
{
searchMapper.fromQuery(searchParameters, q);
fail();
} catch (IllegalArgumentException iae)
{
assertTrue(iae.getLocalizedMessage().contains("language is a mandatory parameter"));
}
//Default
assertEquals(LANGUAGE_FTS_ALFRESCO, searchParameters.getLanguage());
q = new Query("world", "hello", null);