Updated Branches: refs/heads/master 2f75b2f1b -> f3285bee4
Fixed the CS error of camel-aws Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd5ed054 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd5ed054 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd5ed054 Branch: refs/heads/master Commit: cd5ed054332136130a6b1f91fad6a983fa13417f Parents: 2f75b2f Author: Willem Jiang <ningji...@apache.org> Authored: Fri Aug 16 14:55:59 2013 +0800 Committer: Willem Jiang <ningji...@apache.org> Committed: Fri Aug 16 14:58:33 2013 +0800 ---------------------------------------------------------------------- .../component/aws/sqs/SqsConfiguration.java | 10 +++--- .../camel/component/aws/sqs/SqsEndpoint.java | 32 ++++++++++---------- .../component/aws/sqs/SqsEndpointTest.java | 24 ++++++++------- 3 files changed, 34 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/cd5ed054/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java index 2de6b0f..e306221 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java @@ -180,12 +180,12 @@ public class SqsConfiguration { } public String getQueueOwnerAWSAccountId() { - return queueOwnerAWSAccountId; - } - + return queueOwnerAWSAccountId; + } + public void setQueueOwnerAWSAccountId(String queueOwnerAWSAccountId) { - this.queueOwnerAWSAccountId = queueOwnerAWSAccountId; - } + this.queueOwnerAWSAccountId = queueOwnerAWSAccountId; + } @Override public String toString() { http://git-wip-us.apache.org/repos/asf/camel/blob/cd5ed054/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java index 29bfc47..e43b07f 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java @@ -78,26 +78,26 @@ public class SqsEndpoint extends ScheduledPollEndpoint { @Override protected void doStart() throws Exception { client = getConfiguration().getAmazonSQSClient() != null - ? getConfiguration().getAmazonSQSClient() : getClient(); + ? getConfiguration().getAmazonSQSClient() : getClient(); if (configuration.getQueueOwnerAWSAccountId() != null) { - GetQueueUrlRequest getQueueUrlRequest = new GetQueueUrlRequest(); - getQueueUrlRequest.setQueueName(configuration.getQueueName()); - getQueueUrlRequest.setQueueOwnerAWSAccountId(configuration.getQueueOwnerAWSAccountId()); - GetQueueUrlResult getQueueUrlResult = client.getQueueUrl(getQueueUrlRequest ); - queueUrl = getQueueUrlResult.getQueueUrl(); + GetQueueUrlRequest getQueueUrlRequest = new GetQueueUrlRequest(); + getQueueUrlRequest.setQueueName(configuration.getQueueName()); + getQueueUrlRequest.setQueueOwnerAWSAccountId(configuration.getQueueOwnerAWSAccountId()); + GetQueueUrlResult getQueueUrlResult = client.getQueueUrl(getQueueUrlRequest); + queueUrl = getQueueUrlResult.getQueueUrl(); } else { - // check whether the queue already exists - ListQueuesResult listQueuesResult = client.listQueues(); - for (String url : listQueuesResult.getQueueUrls()) { - if (url.endsWith("/" + configuration.getQueueName())) { - queueUrl = url; - LOG.trace("Queue available at '{}'.", queueUrl); - break; - } - } + // check whether the queue already exists + ListQueuesResult listQueuesResult = client.listQueues(); + for (String url : listQueuesResult.getQueueUrls()) { + if (url.endsWith("/" + configuration.getQueueName())) { + queueUrl = url; + LOG.trace("Queue available at '{}'.", queueUrl); + break; + } + } } - + if (queueUrl == null) { createQueue(client); } else { http://git-wip-us.apache.org/repos/asf/camel/blob/cd5ed054/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java index 45baf6a..aa08de6 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java @@ -58,16 +58,18 @@ public class SqsEndpointTest { @Test public void doStartWithDifferentQueueOwner() throws Exception { - - EasyMock.expect(amazonSQSClient.getQueueUrl(new GetQueueUrlRequest("test-queue").withQueueOwnerAWSAccountId("111222333"))) - .andReturn(new GetQueueUrlResult().withQueueUrl("https://sqs.us-east-1.amazonaws.com/111222333/test-queue";)); - - EasyMock.replay(amazonSQSClient); - - endpoint.getConfiguration().setQueueOwnerAWSAccountId("111222333"); - endpoint.doStart(); - - EasyMock.verify(amazonSQSClient); - + + EasyMock.expect(amazonSQSClient.getQueueUrl(new GetQueueUrlRequest("test-queue") + .withQueueOwnerAWSAccountId("111222333"))) + .andReturn(new GetQueueUrlResult() + .withQueueUrl("https://sqs.us-east-1.amazonaws.com/111222333/test-queue";)); + + EasyMock.replay(amazonSQSClient); + + endpoint.getConfiguration().setQueueOwnerAWSAccountId("111222333"); + endpoint.doStart(); + + EasyMock.verify(amazonSQSClient); + } } \ No newline at end of file
