From 99a47b92e7790d70469ae5704bc4ba6cc5cb7ce0 Mon Sep 17 00:00:00 2001 From: Gethin James Date: Tue, 11 Oct 2016 10:59:54 +0000 Subject: [PATCH] SEARCH-106: Fix highlighting typo git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../search/impl/solr/SolrQueryHTTPClient.java | 40 +++++++++---------- .../impl/solr/SolrQueryHTTPClientTest.java | 8 ++-- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java b/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java index 730c803be5..cd9a941e2f 100644 --- a/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java +++ b/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java @@ -682,63 +682,63 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean // end of field facets - if (searchParameters.getHightlight() != null) + if (searchParameters.getHighlight() != null) { url.append("&").append(HighlightParams.HIGHLIGHT+"=true"); url.append("&"+HighlightParams.HIGHLIGHT+".q=").append(encoder.encode(searchParameters.getSearchTerm(), "UTF-8")); - if (searchParameters.getHightlight().getSnippetCount() != null) + if (searchParameters.getHighlight().getSnippetCount() != null) { url.append("&") .append(HighlightParams.SNIPPETS+"=") - .append(searchParameters.getHightlight().getSnippetCount()); + .append(searchParameters.getHighlight().getSnippetCount()); } - if (searchParameters.getHightlight().getFragmentSize() != null) + if (searchParameters.getHighlight().getFragmentSize() != null) { url.append("&") .append(HighlightParams.FRAGSIZE+"=") - .append(searchParameters.getHightlight().getFragmentSize()); + .append(searchParameters.getHighlight().getFragmentSize()); } - if (searchParameters.getHightlight().getMaxAnalyzedChars() != null) + if (searchParameters.getHighlight().getMaxAnalyzedChars() != null) { url.append("&") .append(HighlightParams.MAX_CHARS+"=") - .append(searchParameters.getHightlight().getMaxAnalyzedChars()); + .append(searchParameters.getHighlight().getMaxAnalyzedChars()); } - if (searchParameters.getHightlight().getMergeContiguous() != null) + if (searchParameters.getHighlight().getMergeContiguous() != null) { url.append("&") .append(HighlightParams.MERGE_CONTIGUOUS_FRAGMENTS+"=") - .append(searchParameters.getHightlight().getMergeContiguous()); + .append(searchParameters.getHighlight().getMergeContiguous()); } - if (searchParameters.getHightlight().getUsePhraseHighlighter() != null) + if (searchParameters.getHighlight().getUsePhraseHighlighter() != null) { url.append("&") .append(HighlightParams.USE_PHRASE_HIGHLIGHTER+"=") - .append(searchParameters.getHightlight().getUsePhraseHighlighter()); + .append(searchParameters.getHighlight().getUsePhraseHighlighter()); } - if (searchParameters.getHightlight().getUsePhraseHighlighter() != null) + if (searchParameters.getHighlight().getUsePhraseHighlighter() != null) { url.append("&") .append(HighlightParams.USE_PHRASE_HIGHLIGHTER+"=") - .append(searchParameters.getHightlight().getUsePhraseHighlighter()); + .append(searchParameters.getHighlight().getUsePhraseHighlighter()); } - if (searchParameters.getHightlight().getPrefix() != null) + if (searchParameters.getHighlight().getPrefix() != null) { url.append("&") .append(HighlightParams.SIMPLE_PRE+"=") - .append(encoder.encode(searchParameters.getHightlight().getPrefix(), "UTF-8")); + .append(encoder.encode(searchParameters.getHighlight().getPrefix(), "UTF-8")); } - if (searchParameters.getHightlight().getPostfix() != null) + if (searchParameters.getHighlight().getPostfix() != null) { url.append("&") .append(HighlightParams.SIMPLE_POST+"=") - .append(encoder.encode(searchParameters.getHightlight().getPostfix(), "UTF-8")); + .append(encoder.encode(searchParameters.getHighlight().getPostfix(), "UTF-8")); } - if (searchParameters.getHightlight().getFields() != null && !searchParameters.getHightlight().getFields().isEmpty()) + if (searchParameters.getHighlight().getFields() != null && !searchParameters.getHighlight().getFields().isEmpty()) { - List fieldNames = new ArrayList<>(searchParameters.getHightlight().getFields().size()); - for (FieldHighlightParameters aField:searchParameters.getHightlight().getFields()) + List fieldNames = new ArrayList<>(searchParameters.getHighlight().getFields().size()); + for (FieldHighlightParameters aField:searchParameters.getHighlight().getFields()) { ParameterCheck.mandatoryString("highlight field", aField.getField()); fieldNames.add(aField.getField()); diff --git a/source/test-java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClientTest.java b/source/test-java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClientTest.java index 28563cdf45..f88f45dba2 100644 --- a/source/test-java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClientTest.java +++ b/source/test-java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClientTest.java @@ -135,7 +135,7 @@ public class SolrQueryHTTPClientTest urlBuilder = new StringBuilder(); GeneralHighlightParameters highlightParameters = new GeneralHighlightParameters(null, null, null, null, null, null, null, null); - params.addHightlight(highlightParameters); + params.setHighlight(highlightParameters); client.buildUrlParameters(params, null, encoder, urlBuilder); url = urlBuilder.toString(); assertTrue(url.contains("&hl=true")); @@ -143,7 +143,7 @@ public class SolrQueryHTTPClientTest urlBuilder = new StringBuilder(); highlightParameters = new GeneralHighlightParameters(5, 10, false, "{", "}", 20, true, null); - params.addHightlight(highlightParameters); + params.setHighlight(highlightParameters); client.buildUrlParameters(params, null, encoder, urlBuilder); url = urlBuilder.toString(); assertTrue(url.contains("&hl=true")); @@ -160,7 +160,7 @@ public class SolrQueryHTTPClientTest List fields = Arrays.asList(new FieldHighlightParameters(null,null,null,null,null,null)); urlBuilder = new StringBuilder(); highlightParameters = new GeneralHighlightParameters(5, 10, false, "{", "}", 20, true, fields); - params.addHightlight(highlightParameters); + params.setHighlight(highlightParameters); try { @@ -175,7 +175,7 @@ public class SolrQueryHTTPClientTest fields = Arrays.asList(new FieldHighlightParameters("desc",50,100,false,"@","#"), new FieldHighlightParameters("title",55,105,true,"*","¿")); urlBuilder = new StringBuilder(); highlightParameters = new GeneralHighlightParameters(5, 10, false, "{", "}", 20, true, fields); - params.addHightlight(highlightParameters); + params.setHighlight(highlightParameters); client.buildUrlParameters(params, null, encoder, urlBuilder); url = urlBuilder.toString(); assertTrue(url.contains("&hl=true"));