Repository: camel Updated Branches: refs/heads/master 8493dbbe0 -> dbe8ed92a
Optimize toString on camel-aws consumers/producers Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dbe8ed92 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dbe8ed92 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dbe8ed92 Branch: refs/heads/master Commit: dbe8ed92a2a6543dc53907528a8c25e6d7ff40b3 Parents: 8493dbb Author: Andrea Cosentino <anco...@gmail.com> Authored: Sat Feb 13 11:20:30 2016 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Sat Feb 13 11:20:30 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/component/aws/cw/CwProducer.java | 7 ++++++- .../java/org/apache/camel/component/aws/ddb/DdbProducer.java | 7 ++++++- .../java/org/apache/camel/component/aws/ec2/EC2Producer.java | 7 ++++++- .../java/org/apache/camel/component/aws/s3/S3Consumer.java | 6 +++++- .../java/org/apache/camel/component/aws/s3/S3Producer.java | 7 ++++++- .../java/org/apache/camel/component/aws/sdb/SdbProducer.java | 7 ++++++- .../java/org/apache/camel/component/aws/ses/SesProducer.java | 7 ++++++- .../java/org/apache/camel/component/aws/sns/SnsProducer.java | 7 ++++++- .../java/org/apache/camel/component/aws/sqs/SqsConsumer.java | 7 ++++++- .../java/org/apache/camel/component/aws/sqs/SqsProducer.java | 7 ++++++- .../apache/camel/component/aws/swf/SWFActivityConsumer.java | 7 ++++++- .../apache/camel/component/aws/swf/SWFActivityProducer.java | 7 ++++++- .../apache/camel/component/aws/swf/SWFWorkflowConsumer.java | 7 ++++++- .../apache/camel/component/aws/swf/SWFWorkflowProducer.java | 7 ++++++- 14 files changed, 83 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/dbe8ed92/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java index 26ad572..e58bea1 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java @@ -39,6 +39,8 @@ import org.apache.camel.util.URISupport; */ public class CwProducer extends DefaultProducer { + private transient String cwProducerToString; + public CwProducer(Endpoint endpoint) { super(endpoint); } @@ -137,7 +139,10 @@ public class CwProducer extends DefaultProducer { @Override public String toString() { - return "CwProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + if (cwProducerToString == null) { + cwProducerToString = "CwProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + } + return cwProducerToString; } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/dbe8ed92/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbProducer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbProducer.java index 93234df..53ff5bc 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbProducer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbProducer.java @@ -27,6 +27,8 @@ import org.apache.camel.util.URISupport; */ public class DdbProducer extends DefaultProducer { + private transient String ddbProducerToString; + public DdbProducer(Endpoint endpoint) { super(endpoint); } @@ -79,7 +81,10 @@ public class DdbProducer extends DefaultProducer { @Override public String toString() { - return "DdbProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + if (ddbProducerToString == null) { + ddbProducerToString = "DdbProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + } + return ddbProducerToString; } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/dbe8ed92/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java index c4cc242..cf1f55b 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java @@ -58,6 +58,8 @@ public class EC2Producer extends DefaultProducer { private static final Logger LOG = LoggerFactory.getLogger(EC2Producer.class); + private transient String ec2ProducerToString; + public EC2Producer(Endpoint endpoint) { super(endpoint); } @@ -110,7 +112,10 @@ public class EC2Producer extends DefaultProducer { @Override public String toString() { - return "EC2Producer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + if (ec2ProducerToString == null) { + ec2ProducerToString = "EC2Producer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + } + return ec2ProducerToString; } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/dbe8ed92/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java index 7de2b9d..5f910d2 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java @@ -50,6 +50,7 @@ public class S3Consumer extends ScheduledBatchPollingConsumer { private static final Logger LOG = LoggerFactory.getLogger(S3Consumer.class); private String marker; private boolean filesConsumed; + private transient String s3ConsumerToString; public S3Consumer(S3Endpoint endpoint, Processor processor) throws NoFactoryAvailableException { super(endpoint, processor); @@ -225,6 +226,9 @@ public class S3Consumer extends ScheduledBatchPollingConsumer { @Override public String toString() { - return "S3Consumer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + if (s3ConsumerToString == null) { + s3ConsumerToString = "S3Consumer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + } + return s3ConsumerToString; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/dbe8ed92/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java index 8097525..0822112 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java @@ -58,6 +58,8 @@ public class S3Producer extends DefaultProducer { private static final Logger LOG = LoggerFactory.getLogger(S3Producer.class); + private transient String s3ProducerToString; + public S3Producer(final Endpoint endpoint) { super(endpoint); } @@ -313,7 +315,10 @@ public class S3Producer extends DefaultProducer { @Override public String toString() { - return "S3Producer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + if (s3ProducerToString == null) { + s3ProducerToString = "S3Producer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + } + return s3ProducerToString; } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/dbe8ed92/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbProducer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbProducer.java index 1b41686..36f240e 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbProducer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbProducer.java @@ -27,6 +27,8 @@ import org.apache.camel.util.URISupport; */ public class SdbProducer extends DefaultProducer { + private transient String sdbProducerToString; + public SdbProducer(Endpoint endpoint) { super(endpoint); } @@ -79,7 +81,10 @@ public class SdbProducer extends DefaultProducer { @Override public String toString() { - return "SdbProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + if (sdbProducerToString == null) { + sdbProducerToString = "SdbProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + } + return sdbProducerToString; } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/dbe8ed92/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java index 4863858..414fed3 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java @@ -42,6 +42,8 @@ import org.apache.camel.util.URISupport; */ public class SesProducer extends DefaultProducer { + private transient String sesProducerToString; + public SesProducer(Endpoint endpoint) { super(endpoint); } @@ -177,7 +179,10 @@ public class SesProducer extends DefaultProducer { @Override public String toString() { - return "SesProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + if (sesProducerToString == null) { + sesProducerToString = "SesProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + } + return sesProducerToString; } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/dbe8ed92/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java index b0dbdcc..7bbbe6b 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java @@ -35,6 +35,8 @@ import org.slf4j.LoggerFactory; public class SnsProducer extends DefaultProducer { private static final Logger LOG = LoggerFactory.getLogger(SnsProducer.class); + + private transient String snsProducerToString; public SnsProducer(Endpoint endpoint) { super(endpoint); @@ -92,7 +94,10 @@ public class SnsProducer extends DefaultProducer { @Override public String toString() { - return "SnsProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + if (snsProducerToString == null) { + snsProducerToString = "SnsProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + } + return snsProducerToString; } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/dbe8ed92/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java index 51aa261..324f043 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java @@ -58,6 +58,8 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer { private static final Logger LOG = LoggerFactory.getLogger(SqsConsumer.class); private ScheduledExecutorService scheduledExecutor; + + private transient String sqsConsumerToString; public SqsConsumer(SqsEndpoint endpoint, Processor processor) throws NoFactoryAvailableException { super(endpoint, processor); @@ -265,7 +267,10 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer { @Override public String toString() { - return "SqsConsumer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + if (sqsConsumerToString == null) { + sqsConsumerToString = "SqsConsumer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + } + return sqsConsumerToString; } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/dbe8ed92/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java index cd16707..0f18293 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java @@ -43,6 +43,8 @@ public class SqsProducer extends DefaultProducer { private static final Logger LOG = LoggerFactory.getLogger(SqsProducer.class); + private transient String sqsProducerToString; + public SqsProducer(SqsEndpoint endpoint) throws NoFactoryAvailableException { super(endpoint); } @@ -103,7 +105,10 @@ public class SqsProducer extends DefaultProducer { @Override public String toString() { - return "SqsProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + if (sqsProducerToString == null) { + sqsProducerToString = "SqsProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + } + return sqsProducerToString; } private Map<String, MessageAttributeValue> translateAttributes(Map<String, Object> headers, Exchange exchange) { http://git-wip-us.apache.org/repos/asf/camel/blob/dbe8ed92/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityConsumer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityConsumer.java index 2f2f60c..99eac51 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityConsumer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityConsumer.java @@ -31,6 +31,8 @@ public class SWFActivityConsumer extends DefaultConsumer { private SWFEndpoint endpoint; private final SWFConfiguration configuration; private GenericActivityWorker genericWorker; + + private transient String swfActivityConsumerToString; public SWFActivityConsumer(SWFEndpoint endpoint, Processor processor, SWFConfiguration configuration) { super(endpoint, processor); @@ -67,6 +69,9 @@ public class SWFActivityConsumer extends DefaultConsumer { @Override public String toString() { - return "SWFActivityConsumer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + if (swfActivityConsumerToString == null) { + swfActivityConsumerToString = "SWFActivityConsumer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + } + return swfActivityConsumerToString; } } http://git-wip-us.apache.org/repos/asf/camel/blob/dbe8ed92/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityProducer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityProducer.java index 7b364ac..a0e4323 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityProducer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFActivityProducer.java @@ -27,6 +27,8 @@ public class SWFActivityProducer extends DefaultProducer { private final CamelSWFActivityClient camelSWFClient; private SWFEndpoint endpoint; private SWFConfiguration configuration; + + private transient String swfActivityProducerToString; public SWFActivityProducer(SWFEndpoint endpoint, CamelSWFActivityClient camelSWFActivityClient) { super(endpoint); @@ -56,6 +58,9 @@ public class SWFActivityProducer extends DefaultProducer { @Override public String toString() { - return "SWFActivityProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + if (swfActivityProducerToString == null) { + swfActivityProducerToString = "SWFActivityProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + } + return swfActivityProducerToString; } } http://git-wip-us.apache.org/repos/asf/camel/blob/dbe8ed92/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowConsumer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowConsumer.java index 9192535..74c5248 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowConsumer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowConsumer.java @@ -32,6 +32,8 @@ public class SWFWorkflowConsumer extends DefaultConsumer { private SWFEndpoint endpoint; private final SWFConfiguration configuration; private GenericWorkflowWorker genericWorker; + + private transient String swfWorkflowConsumerToString; public SWFWorkflowConsumer(SWFEndpoint endpoint, Processor processor, SWFConfiguration configuration) { super(endpoint, processor); @@ -83,6 +85,9 @@ public class SWFWorkflowConsumer extends DefaultConsumer { @Override public String toString() { - return "SWFWorkflowConsumer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + if (swfWorkflowConsumerToString == null) { + swfWorkflowConsumerToString = "SWFWorkflowConsumer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + } + return swfWorkflowConsumerToString; } } http://git-wip-us.apache.org/repos/asf/camel/blob/dbe8ed92/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java index 36b8fec..5ac0cec 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java @@ -31,6 +31,8 @@ public class SWFWorkflowProducer extends DefaultProducer { private final CamelSWFWorkflowClient camelSWFClient; private SWFEndpoint endpoint; private SWFConfiguration configuration; + + private transient String swfWorkflowProducerToString; public SWFWorkflowProducer(SWFEndpoint endpoint, CamelSWFWorkflowClient camelSWFClient) { super(endpoint); @@ -161,7 +163,10 @@ public class SWFWorkflowProducer extends DefaultProducer { @Override public String toString() { - return "SWFWorkflowProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + if (swfWorkflowProducerToString == null) { + swfWorkflowProducerToString = "SWFWorkflowProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; + } + return swfWorkflowProducerToString; } private enum Operation {