Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7cbba464 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7cbba464 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7cbba464 Branch: refs/heads/master Commit: 7cbba46462e6d013c53cd6a8ff7ed69ce956f0d6 Parents: 983e53b Author: Andrea Cosentino <anco...@gmail.com> Authored: Mon Sep 5 10:39:57 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Mon Sep 5 10:39:57 2016 +0200 ---------------------------------------------------------------------- .../camel/component/aws/sns/SnsEndpoint.java | 37 ++++++++++---------- .../component/aws/sns/AmazonSNSClientMock.java | 6 ++-- 2 files changed, 21 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7cbba464/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java index 2cb24f6..91fde15 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java @@ -93,27 +93,26 @@ public class SnsEndpoint extends DefaultEndpoint { snsClient.setEndpoint(configuration.getAmazonSNSEndpoint()); } - if (configuration.getTopicArn() == null) { - try { - String nextToken = null; - final String arnSuffix = ":" + configuration.getTopicName(); - do { - final ListTopicsResult response = snsClient.listTopics(nextToken); - nextToken = response.getNextToken(); - - for (final Topic topic : response.getTopics()) { - if (topic.getTopicArn().endsWith(arnSuffix)) { - configuration.setTopicArn(topic.getTopicArn()); - break; - } - } - - } while (nextToken != null); - } catch (final AmazonServiceException ase) { + if (configuration.getTopicArn() == null) { + try { + String nextToken = null; + final String arnSuffix = ":" + configuration.getTopicName(); + do { + final ListTopicsResult response = snsClient.listTopics(nextToken); + nextToken = response.getNextToken(); + + for (final Topic topic : response.getTopics()) { + if (topic.getTopicArn().endsWith(arnSuffix)) { + configuration.setTopicArn(topic.getTopicArn()); + break; + } + } + } while (nextToken != null); + } catch (final AmazonServiceException ase) { LOG.trace("The list topics operation return the following error code {}", ase.getErrorCode()); throw ase; - } - } + } + } if (configuration.getTopicArn() == null) { // creates a new topic, or returns the URL of an existing one http://git-wip-us.apache.org/repos/asf/camel/blob/7cbba464/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java index 08fe892..dbbb410 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java @@ -16,6 +16,9 @@ */ package org.apache.camel.component.aws.sns; +import java.util.ArrayList; +import java.util.List; + import com.amazonaws.AmazonClientException; import com.amazonaws.AmazonServiceException; import com.amazonaws.AmazonWebServiceRequest; @@ -50,9 +53,6 @@ import com.amazonaws.services.sns.model.Topic; import com.amazonaws.services.sns.model.UnsubscribeRequest; import com.amazonaws.services.sns.model.UnsubscribeResult; -import java.util.ArrayList; -import java.util.List; - import org.junit.Assert; public class AmazonSNSClientMock extends AmazonSNSClient {
