Repository: camel Updated Branches: refs/heads/camel-2.16.x b19ae7851 -> c12fdebdb
Optimize the toString of endpoint Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8cae3381 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8cae3381 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8cae3381 Branch: refs/heads/camel-2.16.x Commit: 8cae33817ab85ab3debed93cb80ff4ad665a0a74 Parents: b19ae78 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Feb 12 16:03:01 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Feb 12 18:03:28 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/impl/DefaultEndpoint.java | 16 ++++++++++------ .../main/java/org/apache/camel/util/URISupport.java | 2 +- .../org/apache/camel/impl/DefaultEndpointTest.java | 1 - 3 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8cae3381/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java index cf6461e..ff8253c 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java @@ -56,6 +56,7 @@ import org.slf4j.LoggerFactory; public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint, HasId, CamelContextAware { private static final Logger LOG = LoggerFactory.getLogger(DefaultEndpoint.class); + private transient String endpointUriToString; private String endpointUri; private EndpointConfiguration endpointConfiguration; private CamelContext camelContext; @@ -153,13 +154,16 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint @Override public String toString() { - String value = null; - try { - value = getEndpointUri(); - } catch (RuntimeException e) { - // ignore any exception and use null for building the string value + if (endpointUriToString == null) { + String value = null; + try { + value = getEndpointUri(); + } catch (RuntimeException e) { + // ignore any exception and use null for building the string value + } + endpointUriToString = String.format("Endpoint[%s]", URISupport.sanitizeUri(value)); } - return String.format("Endpoint[%s]", URISupport.sanitizeUri(value)); + return endpointUriToString; } /** http://git-wip-us.apache.org/repos/asf/camel/blob/8cae3381/camel-core/src/main/java/org/apache/camel/util/URISupport.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/URISupport.java b/camel-core/src/main/java/org/apache/camel/util/URISupport.java index 90229a6..20dd1c2 100644 --- a/camel-core/src/main/java/org/apache/camel/util/URISupport.java +++ b/camel-core/src/main/java/org/apache/camel/util/URISupport.java @@ -63,7 +63,7 @@ public final class URISupport { * Removes detected sensitive information (such as passwords) from the URI and returns the result. * * @param uri The uri to sanitize. - * @see #SECRETS for the matched pattern + * @see #SECRETS and #USERINFO_PASSWORD for the matched pattern * * @return Returns null if the uri is null, otherwise the URI with the passphrase, password or secretKey sanitized. */ http://git-wip-us.apache.org/repos/asf/camel/blob/8cae3381/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointTest.java index 0b61ef7..9a2f657 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointTest.java @@ -45,7 +45,6 @@ public class DefaultEndpointTest extends ContextTestSupport { public void testToString() { final String epstr = "myep:///test"; MyEndpoint ep = new MyEndpoint(); - assertNotNull(ep.toString()); ep.setEndpointUri(epstr); assertTrue(ep.toString().indexOf(epstr) > 0); }
