From 8e8d663b4f03c04b76973bedc619e0b562f19675 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 3 Nov 2016 13:48:25 +0000 Subject: [PATCH] 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 --- .../org/alfresco/rest/api/search/impl/SearchMapper.java | 6 +++--- .../org/alfresco/rest/api/search/SearchMapperTests.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java index 8eea696026..4a32bba77f 100644 --- a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java +++ b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java @@ -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); } /** diff --git a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java index d4eec88f62..d90fe1b3e3 100644 --- a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java +++ b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java @@ -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 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()