Repository: camel Updated Branches: refs/heads/camel-2.16.x 5b4b7f01f -> f9352d9eb refs/heads/master a9df1da1b -> d20d0be4c
CAMEL-9434: camel-catalog - did you mean Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d20d0be4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d20d0be4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d20d0be4 Branch: refs/heads/master Commit: d20d0be4ceea1e402142e51759525c2b28396f93 Parents: a9df1da Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Dec 23 16:06:39 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Dec 23 16:06:39 2015 +0100 ---------------------------------------------------------------------- .../apache/camel/catalog/lucene/LuceneSuggestionStrategy.java | 7 +++---- .../org/apache/camel/catalog/EndpointValidationResult.java | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d20d0be4/platforms/catalog-lucene/src/main/java/org/apache/camel/catalog/lucene/LuceneSuggestionStrategy.java ---------------------------------------------------------------------- diff --git a/platforms/catalog-lucene/src/main/java/org/apache/camel/catalog/lucene/LuceneSuggestionStrategy.java b/platforms/catalog-lucene/src/main/java/org/apache/camel/catalog/lucene/LuceneSuggestionStrategy.java index 331e206..0be3cc5 100644 --- a/platforms/catalog-lucene/src/main/java/org/apache/camel/catalog/lucene/LuceneSuggestionStrategy.java +++ b/platforms/catalog-lucene/src/main/java/org/apache/camel/catalog/lucene/LuceneSuggestionStrategy.java @@ -20,7 +20,7 @@ import java.io.StringReader; import java.util.Set; import org.apache.camel.catalog.SuggestionStrategy; -import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.lucene.analysis.core.KeywordAnalyzer; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.search.spell.PlainTextDictionary; import org.apache.lucene.search.spell.SpellChecker; @@ -33,7 +33,7 @@ import org.apache.lucene.store.RAMDirectory; */ public class LuceneSuggestionStrategy implements SuggestionStrategy { - private int maxSuggestions = 5; + private int maxSuggestions = 3; @Override public String[] suggestEndpointOptions(Set<String> names, String unknownOption) { @@ -51,9 +51,8 @@ public class LuceneSuggestionStrategy implements SuggestionStrategy { // use in-memory lucene spell checker to make the suggestions RAMDirectory dir = new RAMDirectory(); SpellChecker checker = new SpellChecker(dir); - checker.indexDictionary(words, new IndexWriterConfig(new StandardAnalyzer()), false); + checker.indexDictionary(words, new IndexWriterConfig(new KeywordAnalyzer()), false); - // suggest up to 5 names return checker.suggestSimilar(unknownOption, maxSuggestions); } catch (Exception e) { // ignore http://git-wip-us.apache.org/repos/asf/camel/blob/d20d0be4/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java ---------------------------------------------------------------------- diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java index 953ebf4..4c03e2f 100644 --- a/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java +++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java @@ -229,15 +229,15 @@ public class EndpointValidationResult implements Serializable { if (unknownSuggestions != null && unknownSuggestions.containsKey(name)) { String[] suggestions = unknownSuggestions.get(name); String str = Arrays.asList(suggestions).toString(); - options.put(name, "Unknown field. Did you mean: " + str); + options.put(name, "Unknown option. Did you mean: " + str); } else { - options.put(name, "Unknown field."); + options.put(name, "Unknown option."); } } } if (required != null) { for (String name : required) { - options.put(name, "Missing required field"); + options.put(name, "Missing required option"); } } if (invalidEnum != null) {
