Repository: camel Updated Branches: refs/heads/camel-2.16.x b83298c7d -> 05c1cc78e refs/heads/master 9ed3ea1f2 -> 5ad274f86
Camel catalog - Add api to validate endpoint uri Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5ad274f8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5ad274f8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5ad274f8 Branch: refs/heads/master Commit: 5ad274f86b15b13c5dfe8466da2db744350f2b75 Parents: 9ed3ea1 Author: Claus Ibsen <[email protected]> Authored: Thu Dec 31 10:59:19 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Thu Dec 31 11:03:48 2015 +0100 ---------------------------------------------------------------------- .../camel/catalog/EndpointValidationResult.java | 15 +++++++++------ .../org/apache/camel/catalog/CamelCatalogTest.java | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5ad274f8/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 dba4032..dcc9c57 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 @@ -221,9 +221,10 @@ public class EndpointValidationResult implements Serializable { /** * A human readable summary of the validation errors. * + * @param includeHeader whether to include a header * @return the summary, or <tt>null</tt> if no validation errors */ - public String summaryErrorMessage() { + public String summaryErrorMessage(boolean includeHeader) { if (isSuccess()) { return null; } @@ -243,7 +244,7 @@ public class EndpointValidationResult implements Serializable { String str = Arrays.asList(suggestions).toString(); options.put(name, "Unknown option. Did you mean: " + str); } else { - options.put(name, "Unknown option."); + options.put(name, "Unknown option"); } } } @@ -299,14 +300,16 @@ public class EndpointValidationResult implements Serializable { // build the human error summary StringBuilder sb = new StringBuilder(); - sb.append("Endpoint validator error\n"); - sb.append("---------------------------------------------------------------------------------------------------------------------------------------\n"); - sb.append("\n\t").append(uri).append("\n"); + if (includeHeader) { + sb.append("Endpoint validator error\n"); + sb.append("---------------------------------------------------------------------------------------------------------------------------------------\n"); + sb.append("\n"); + } + sb.append("\t").append(uri).append("\n"); for (Map.Entry<String, String> option : options.entrySet()) { String out = String.format(format, option.getKey(), option.getValue()); sb.append("\n\t").append(out); } - sb.append("\n\n"); return sb.toString(); } http://git-wip-us.apache.org/repos/asf/camel/blob/5ad274f8/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java ---------------------------------------------------------------------- diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java index a9bdeff..0bd8d3b 100644 --- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java +++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java @@ -462,12 +462,12 @@ public class CamelCatalogTest { public void validatePropertiesSummary() throws Exception { EndpointValidationResult result = catalog.validateEndpointProperties("yammer:MESSAGES?blah=yada&accessToken=aaa&consumerKey=&useJson=no&initialDelay=five&pollStrategy=myStrategy"); assertFalse(result.isSuccess()); - String reason = result.summaryErrorMessage(); + String reason = result.summaryErrorMessage(true); LOG.info(reason); result = catalog.validateEndpointProperties("jms:unknown:myqueue"); assertFalse(result.isSuccess()); - reason = result.summaryErrorMessage(); + reason = result.summaryErrorMessage(false); LOG.info(reason); }
