Merged 5.2.N (5.2.1) to HEAD (5.2)

131308 gjames: SEARCH-106: Fix highlighting typo


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132242 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-03 13:48:25 +00:00
parent 7778664fda
commit 8e8d663b4f
2 changed files with 4 additions and 5 deletions

View File

@@ -431,11 +431,11 @@ public class SearchMapper
/**
* Sets the hightlight object on search parameters
* @param sp SearchParameters
* @param hightlight GeneralHighlightParameters
* @param highlight GeneralHighlightParameters
*/
public void fromHighlight(SearchParameters sp, GeneralHighlightParameters hightlight)
public void fromHighlight(SearchParameters sp, GeneralHighlightParameters highlight)
{
sp.setHightlight(hightlight);
sp.setHighlight(highlight);
}
/**

View File

@@ -51,7 +51,6 @@ 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.parameters.Paging;
import org.alfresco.rest.framework.resource.parameters.Params;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.FieldHighlightParameters;
import org.alfresco.service.cmr.search.GeneralHighlightParameters;
@@ -521,7 +520,7 @@ public class SearchMapperTests
List<FieldHighlightParameters> fields = Arrays.asList(new FieldHighlightParameters("desc",50,100,false,"@","#"), new FieldHighlightParameters("title",55,105,true,"*","¿"));
GeneralHighlightParameters highlightParameters = new GeneralHighlightParameters(5, 10, false, "{", "}", 20, true, fields);
searchMapper.fromHighlight(searchParameters,highlightParameters);
assertEquals(searchParameters.getHightlight(), highlightParameters);
assertEquals(searchParameters.getHighlight(), highlightParameters);
}
private SearchQuery minimalQuery()