You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/03/12 03:46:10 UTC
[1/2] git commit: CAMEL-7284 Added the Missing setter for
ApnsDelegate with thanks to Marcin
Repository: camel
Updated Branches:
refs/heads/master b0e32148b -> 5dd1179e5
CAMEL-7284 Added the Missing setter for ApnsDelegate with thanks to Marcin
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80dc1083
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80dc1083
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80dc1083
Branch: refs/heads/master
Commit: 80dc1083e850c9e3896cf4a095c9fc92f8ea4a1a
Parents: b0e3214
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Mar 12 10:44:44 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Mar 12 10:44:44 2014 +0800
----------------------------------------------------------------------
.../apache/camel/component/apns/factory/ApnsServiceFactory.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/80dc1083/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
index b7495f0..d7a53f5 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
@@ -161,6 +161,10 @@ public class ApnsServiceFactory implements CamelContextAware {
return apnsDelegate;
}
+ public void setApnsDelegate(ApnsDelegate apnsDelegate) {
+ this.apnsDelegate = apnsDelegate;
+ }
+
public ApnsService getApnsService() {
ApnsServiceBuilder builder = APNS.newService();
[2/2] git commit: CAMEL-7286 Fixed the issue of amazonSNSEndpoint
option
Posted by ni...@apache.org.
CAMEL-7286 Fixed the issue of amazonSNSEndpoint option
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5dd1179e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5dd1179e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5dd1179e
Branch: refs/heads/master
Commit: 5dd1179e5a7e4e2728cc92b617ddf62b2e813660
Parents: 80dc108
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Mar 12 10:45:19 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Mar 12 10:45:19 2014 +0800
----------------------------------------------------------------------
.../org/apache/camel/component/aws/sns/SnsEndpoint.java | 8 +++++++-
.../camel/component/aws/sns/AmazonSNSClientMock.java | 12 +++++++++++-
.../aws/sns/SnsComponentConfigurationTest.java | 6 ++++--
3 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5dd1179e/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 2efdd2c..63c5046 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
@@ -30,6 +30,7 @@ import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,13 +81,18 @@ public class SnsEndpoint extends DefaultEndpoint {
LOG.trace("Topic created with Amazon resource name: {}", configuration.getTopicArn());
- if (configuration.getPolicy() != null) {
+ if (ObjectHelper.isNotEmpty(configuration.getPolicy())) {
LOG.trace("Updating topic [{}] with policy [{}]", configuration.getTopicArn(), configuration.getPolicy());
getSNSClient().setTopicAttributes(new SetTopicAttributesRequest(configuration.getTopicArn(), "Policy", configuration.getPolicy()));
LOG.trace("Topic policy updated");
}
+
+ if (ObjectHelper.isNotEmpty(configuration.getAmazonSNSEndpoint())) {
+ LOG.trace("Updating the SNS region with : {} " + configuration.getAmazonSNSEndpoint());
+ getSNSClient().setEndpoint(configuration.getAmazonSNSEndpoint());
+ }
}
public SnsConfiguration getConfiguration() {
http://git-wip-us.apache.org/repos/asf/camel/blob/5dd1179e/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 aca89e3..3096017 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
@@ -49,11 +49,21 @@ import org.junit.Assert;
public class AmazonSNSClientMock extends AmazonSNSClient {
private static final String DEFAULT_TOPIC_ARN = "arn:aws:sns:us-east-1:541925086079:MyTopic";
+ private String endpoint;
public AmazonSNSClientMock() {
super(new BasicAWSCredentials("myAccessKey", "mySecretKey"));
}
-
+
+ @Override
+ public void setEndpoint(String endpoint) {
+ this.endpoint = endpoint;
+ }
+
+ public String getEndpoint() {
+ return endpoint;
+ }
+
@Override
public ConfirmSubscriptionResult confirmSubscription(ConfirmSubscriptionRequest confirmSubscriptionRequest) throws AmazonServiceException, AmazonClientException {
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/camel/blob/5dd1179e/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
index 7685ef4..8a1283b 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
@@ -45,18 +45,20 @@ public class SnsComponentConfigurationTest extends CamelTestSupport {
((JndiRegistry) ((PropertyPlaceholderDelegateRegistry) context.getRegistry()).getRegistry()).bind("amazonSNSClient", mock);
SnsComponent component = new SnsComponent(context);
- SnsEndpoint endpoint = (SnsEndpoint) component.createEndpoint("aws-sns://MyTopic?amazonSNSClient=#amazonSNSClient");
+ SnsEndpoint endpoint = (SnsEndpoint) component.createEndpoint("aws-sns://MyTopic?amazonSNSClient=#amazonSNSClient&amazonSNSEndpoint=sns.ap-southeast-2.amazonaws.com");
assertEquals("MyTopic", endpoint.getConfiguration().getTopicName());
assertNull(endpoint.getConfiguration().getAccessKey());
assertNull(endpoint.getConfiguration().getSecretKey());
assertNull(endpoint.getConfiguration().getTopicArn());
assertNull(endpoint.getConfiguration().getSubject());
- assertNull(endpoint.getConfiguration().getAmazonSNSEndpoint());
+ assertNotNull(endpoint.getConfiguration().getAmazonSNSEndpoint());
assertNull(endpoint.getConfiguration().getPolicy());
endpoint.start();
assertEquals("arn:aws:sns:us-east-1:541925086079:MyTopic", endpoint.getConfiguration().getTopicArn());
+ // check the setting of AmazonSNSEndpoint
+ assertEquals("sns.ap-southeast-2.amazonaws.com", mock.getEndpoint());
endpoint.stop();
}