You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2015/08/01 11:17:08 UTC
[1/6] camel git commit: CAMEL-9045 Camel-aws: Make it easier to
configure http proxy, aws-ses component
Repository: camel
Updated Branches:
refs/heads/master 9ddeb2f0f -> 31792a22e
CAMEL-9045 Camel-aws: Make it easier to configure http proxy, aws-ses component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/194fe325
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/194fe325
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/194fe325
Branch: refs/heads/master
Commit: 194fe32540f4f52887f972938d62b9b1f0676391
Parents: 9ddeb2f
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sat Aug 1 10:37:44 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sat Aug 1 10:37:44 2015 +0200
----------------------------------------------------------------------
.../component/aws/ses/SesConfiguration.java | 29 ++++++++++++++++++++
.../camel/component/aws/ses/SesEndpoint.java | 12 +++++++-
2 files changed, 40 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/194fe325/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesConfiguration.java
index 5c04836..d08864a 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesConfiguration.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesConfiguration.java
@@ -20,6 +20,7 @@ import java.util.Arrays;
import java.util.List;
import com.amazonaws.services.simpleemail.AmazonSimpleEmailService;
+
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
@@ -46,6 +47,10 @@ public class SesConfiguration {
private String returnPath;
@UriParam
private List<String> replyToAddresses;
+ @UriParam
+ private String proxyHost;
+ @UriParam
+ private Integer proxyPort;
public String getAccessKey() {
return accessKey;
@@ -156,6 +161,28 @@ public class SesConfiguration {
public void setAmazonSESEndpoint(String amazonSesEndpoint) {
this.amazonSESEndpoint = amazonSesEndpoint;
}
+
+ /**
+ * To define a proxy host when instantiating the SQS client
+ */
+ public String getProxyHost() {
+ return proxyHost;
+ }
+
+ public void setProxyHost(String proxyHost) {
+ this.proxyHost = proxyHost;
+ }
+
+ /**
+ * To define a proxy port when instantiating the SQS client
+ */
+ public Integer getProxyPort() {
+ return proxyPort;
+ }
+
+ public void setProxyPort(Integer proxyPort) {
+ this.proxyPort = proxyPort;
+ }
@Override
public String toString() {
@@ -169,6 +196,8 @@ public class SesConfiguration {
+ ", to='" + to + '\''
+ ", returnPath='" + returnPath + '\''
+ ", replyToAddresses='" + replyToAddresses + '\''
+ + ", proxyHost=" + proxyHost
+ + ", proxyPort=" + proxyPort
+ '}';
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/194fe325/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
index ab864ae..f8aade2 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
@@ -16,10 +16,12 @@
*/
package org.apache.camel.component.aws.ses;
+import com.amazonaws.ClientConfiguration;
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.simpleemail.AmazonSimpleEmailService;
import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
@@ -85,8 +87,16 @@ public class SesEndpoint extends DefaultEndpoint {
}
private AmazonSimpleEmailService createSESClient() {
+ AmazonSimpleEmailService client = null;
AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
- AmazonSimpleEmailService client = new AmazonSimpleEmailServiceClient(credentials);
+ if (ObjectHelper.isNotEmpty(configuration.getProxyHost()) && ObjectHelper.isNotEmpty(configuration.getProxyPort())) {
+ ClientConfiguration clientConfiguration = new ClientConfiguration();
+ clientConfiguration.setProxyHost(configuration.getProxyHost());
+ clientConfiguration.setProxyPort(configuration.getProxyPort());
+ client = new AmazonSimpleEmailServiceClient(credentials, clientConfiguration);
+ } else {
+ client = new AmazonSimpleEmailServiceClient(credentials);
+ }
return client;
}
}
[2/6] camel git commit: CAMEL-9045 Camel-aws: Make it easier to
configure http proxy, aws-sdb component
Posted by ac...@apache.org.
CAMEL-9045 Camel-aws: Make it easier to configure http proxy, aws-sdb component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9e9633e3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9e9633e3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9e9633e3
Branch: refs/heads/master
Commit: 9e9633e35c9c1e6075ce3f72b290e39bcd073afc
Parents: 194fe32
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sat Aug 1 10:41:28 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sat Aug 1 10:41:28 2015 +0200
----------------------------------------------------------------------
.../component/aws/sdb/SdbConfiguration.java | 27 ++++++++++++++++++++
.../camel/component/aws/sdb/SdbEndpoint.java | 12 ++++++++-
2 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9e9633e3/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java
index 87669b9..30019ff 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.aws.sdb;
import com.amazonaws.services.simpledb.AmazonSimpleDB;
+
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
@@ -41,6 +42,10 @@ public class SdbConfiguration {
private boolean consistentRead;
@UriParam(defaultValue = "PutAttributes")
private SdbOperations operation = SdbOperations.PutAttributes;
+ @UriParam
+ private String proxyHost;
+ @UriParam
+ private Integer proxyPort;
/**
* The region with which the AWS-SDB client wants to work with.
@@ -129,4 +134,26 @@ public class SdbConfiguration {
public void setConsistentRead(boolean consistentRead) {
this.consistentRead = consistentRead;
}
+
+ /**
+ * To define a proxy host when instantiating the SQS client
+ */
+ public String getProxyHost() {
+ return proxyHost;
+ }
+
+ public void setProxyHost(String proxyHost) {
+ this.proxyHost = proxyHost;
+ }
+
+ /**
+ * To define a proxy port when instantiating the SQS client
+ */
+ public Integer getProxyPort() {
+ return proxyPort;
+ }
+
+ public void setProxyPort(Integer proxyPort) {
+ this.proxyPort = proxyPort;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9e9633e3/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
index 1e1785d..3118dd9 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.aws.sdb;
+import com.amazonaws.ClientConfiguration;
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.simpledb.AmazonSimpleDB;
@@ -23,6 +24,7 @@ import com.amazonaws.services.simpledb.AmazonSimpleDBClient;
import com.amazonaws.services.simpledb.model.CreateDomainRequest;
import com.amazonaws.services.simpledb.model.DomainMetadataRequest;
import com.amazonaws.services.simpledb.model.NoSuchDomainException;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
@@ -104,8 +106,16 @@ public class SdbEndpoint extends ScheduledPollEndpoint {
}
AmazonSimpleDB createSdbClient() {
+ AmazonSimpleDB client = null;
AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
- AmazonSimpleDB client = new AmazonSimpleDBClient(credentials);
+ if (ObjectHelper.isNotEmpty(configuration.getProxyHost()) && ObjectHelper.isNotEmpty(configuration.getProxyPort())) {
+ ClientConfiguration clientConfiguration = new ClientConfiguration();
+ clientConfiguration.setProxyHost(configuration.getProxyHost());
+ clientConfiguration.setProxyPort(configuration.getProxyPort());
+ client = new AmazonSimpleDBClient(credentials, clientConfiguration);
+ } else {
+ client = new AmazonSimpleDBClient(credentials);
+ }
return client;
}
}
[5/6] camel git commit: CAMEL-9045 Camel-aws: Make it easier to
configure http proxy, aws-ddb component
Posted by ac...@apache.org.
CAMEL-9045 Camel-aws: Make it easier to configure http proxy, aws-ddb component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7b49e8de
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7b49e8de
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7b49e8de
Branch: refs/heads/master
Commit: 7b49e8deabbcf65defbd818d9c1e6e01e21d0562
Parents: c092429
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sat Aug 1 11:06:39 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sat Aug 1 11:06:39 2015 +0200
----------------------------------------------------------------------
.../component/aws/ddb/DdbConfiguration.java | 26 ++++++++++++++++++++
.../camel/component/aws/ddb/DdbEndpoint.java | 14 ++++++++---
2 files changed, 37 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7b49e8de/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java
index 0fb0228..e8060c8 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java
@@ -48,6 +48,10 @@ public class DdbConfiguration {
private String keyAttributeName;
@UriParam
private String keyAttributeType;
+ @UriParam
+ private String proxyHost;
+ @UriParam
+ private Integer proxyPort;
/**
* The region with which the AWS-DDB client wants to work with.
@@ -169,4 +173,26 @@ public class DdbConfiguration {
public void setKeyAttributeType(String keyAttributeType) {
this.keyAttributeType = keyAttributeType;
}
+
+ /**
+ * To define a proxy host when instantiating the SQS client
+ */
+ public String getProxyHost() {
+ return proxyHost;
+ }
+
+ public void setProxyHost(String proxyHost) {
+ this.proxyHost = proxyHost;
+ }
+
+ /**
+ * To define a proxy port when instantiating the SQS client
+ */
+ public Integer getProxyPort() {
+ return proxyPort;
+ }
+
+ public void setProxyPort(Integer proxyPort) {
+ this.proxyPort = proxyPort;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7b49e8de/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
index 18dd765..4c471fc 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.aws.ddb;
import com.amazonaws.AmazonServiceException;
+import com.amazonaws.ClientConfiguration;
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
@@ -133,9 +134,16 @@ public class DdbEndpoint extends ScheduledPollEndpoint {
}
AmazonDynamoDB createDdbClient() {
- AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(),
- configuration.getSecretKey());
- AmazonDynamoDB client = new AmazonDynamoDBClient(credentials);
+ AmazonDynamoDB client = null;
+ AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
+ if (ObjectHelper.isNotEmpty(configuration.getProxyHost()) && ObjectHelper.isNotEmpty(configuration.getProxyPort())) {
+ ClientConfiguration clientConfiguration = new ClientConfiguration();
+ clientConfiguration.setProxyHost(configuration.getProxyHost());
+ clientConfiguration.setProxyPort(configuration.getProxyPort());
+ client = new AmazonDynamoDBClient(credentials, clientConfiguration);
+ } else {
+ client = new AmazonDynamoDBClient(credentials);
+ }
return client;
}
[4/6] camel git commit: CAMEL-9045 Camel-aws: Make it easier to
configure http proxy, aws-ec2 component
Posted by ac...@apache.org.
CAMEL-9045 Camel-aws: Make it easier to configure http proxy, aws-ec2 component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c0924298
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c0924298
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c0924298
Branch: refs/heads/master
Commit: c09242987886c20ca0812a39e98a1d5911b56aa3
Parents: f95bfff
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sat Aug 1 11:03:02 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sat Aug 1 11:03:02 2015 +0200
----------------------------------------------------------------------
.../component/aws/ec2/EC2Configuration.java | 27 ++++++++++++++++++++
.../camel/component/aws/ec2/EC2Endpoint.java | 12 ++++++++-
2 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c0924298/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java
index 2d57fde..aeaa47e 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.aws.ec2;
import com.amazonaws.services.ec2.AmazonEC2Client;
+
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
@@ -37,6 +38,10 @@ public class EC2Configuration {
private String amazonEc2Endpoint;
@UriParam @Metadata(required = "true")
private EC2Operations operation;
+ @UriParam
+ private String proxyHost;
+ @UriParam
+ private Integer proxyPort;
public AmazonEC2Client getAmazonEc2Client() {
return amazonEc2Client;
@@ -92,4 +97,26 @@ public class EC2Configuration {
public void setOperation(EC2Operations operation) {
this.operation = operation;
}
+
+ /**
+ * To define a proxy host when instantiating the SQS client
+ */
+ public String getProxyHost() {
+ return proxyHost;
+ }
+
+ public void setProxyHost(String proxyHost) {
+ this.proxyHost = proxyHost;
+ }
+
+ /**
+ * To define a proxy port when instantiating the SQS client
+ */
+ public Integer getProxyPort() {
+ return proxyPort;
+ }
+
+ public void setProxyPort(Integer proxyPort) {
+ this.proxyPort = proxyPort;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c0924298/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
index c810666..c9e2904 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
@@ -16,9 +16,11 @@
*/
package org.apache.camel.component.aws.ec2;
+import com.amazonaws.ClientConfiguration;
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.ec2.AmazonEC2Client;
+
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
@@ -75,8 +77,16 @@ public class EC2Endpoint extends ScheduledPollEndpoint {
}
AmazonEC2Client createEc2Client() {
+ AmazonEC2Client client = null;
AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
- AmazonEC2Client client = new AmazonEC2Client(credentials);
+ if (ObjectHelper.isNotEmpty(configuration.getProxyHost()) && ObjectHelper.isNotEmpty(configuration.getProxyPort())) {
+ ClientConfiguration clientConfiguration = new ClientConfiguration();
+ clientConfiguration.setProxyHost(configuration.getProxyHost());
+ clientConfiguration.setProxyPort(configuration.getProxyPort());
+ client = new AmazonEC2Client(credentials, clientConfiguration);
+ } else {
+ client = new AmazonEC2Client(credentials);
+ }
return client;
}
}
[3/6] camel git commit: CAMEL-9045 Camel-aws: Make it easier to
configure http proxy, aws-s3 component
Posted by ac...@apache.org.
CAMEL-9045 Camel-aws: Make it easier to configure http proxy, aws-s3 component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f95bfffb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f95bfffb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f95bfffb
Branch: refs/heads/master
Commit: f95bfffb36db24df9df734ede1e30f5173e638ce
Parents: 9e9633e
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sat Aug 1 10:58:56 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sat Aug 1 10:58:56 2015 +0200
----------------------------------------------------------------------
.../camel/component/aws/s3/S3Configuration.java | 27 ++++++++++++++++++++
.../camel/component/aws/s3/S3Endpoint.java | 12 ++++++++-
2 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f95bfffb/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
index 5bc2ac0..36bab52 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.aws.s3;
import com.amazonaws.services.s3.AmazonS3;
+
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
@@ -55,6 +56,10 @@ public class S3Configuration implements Cloneable {
private String storageClass;
@UriParam(label = "producer")
private String serverSideEncryption;
+ @UriParam
+ private String proxyHost;
+ @UriParam
+ private Integer proxyPort;
public long getPartSize() {
return partSize;
@@ -221,4 +226,26 @@ public class S3Configuration implements Cloneable {
public void setServerSideEncryption(String serverSideEncryption) {
this.serverSideEncryption = serverSideEncryption;
}
+
+ /**
+ * To define a proxy host when instantiating the SQS client
+ */
+ public String getProxyHost() {
+ return proxyHost;
+ }
+
+ public void setProxyHost(String proxyHost) {
+ this.proxyHost = proxyHost;
+ }
+
+ /**
+ * To define a proxy port when instantiating the SQS client
+ */
+ public Integer getProxyPort() {
+ return proxyPort;
+ }
+
+ public void setProxyPort(Integer proxyPort) {
+ this.proxyPort = proxyPort;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/f95bfffb/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
index f772ee4..ff69305 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.aws.s3;
import com.amazonaws.AmazonServiceException;
+import com.amazonaws.ClientConfiguration;
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.s3.AmazonS3;
@@ -25,6 +26,7 @@ import com.amazonaws.services.s3.model.CreateBucketRequest;
import com.amazonaws.services.s3.model.ListObjectsRequest;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.S3Object;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
@@ -188,8 +190,16 @@ public class S3Endpoint extends ScheduledPollEndpoint {
* Provide the possibility to override this method for an mock implementation
*/
AmazonS3 createS3Client() {
+ AmazonS3 client = null;
AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
- AmazonS3 client = new AmazonS3Client(credentials);
+ if (ObjectHelper.isNotEmpty(configuration.getProxyHost()) && ObjectHelper.isNotEmpty(configuration.getProxyPort())) {
+ ClientConfiguration clientConfiguration = new ClientConfiguration();
+ clientConfiguration.setProxyHost(configuration.getProxyHost());
+ clientConfiguration.setProxyPort(configuration.getProxyPort());
+ client = new AmazonS3Client(credentials, clientConfiguration);
+ } else {
+ client = new AmazonS3Client(credentials);
+ }
return client;
}
[6/6] camel git commit: CAMEL-9045 Camel-aws: Make it easier to
configure http proxy, aws-cw component
Posted by ac...@apache.org.
CAMEL-9045 Camel-aws: Make it easier to configure http proxy, aws-cw component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/31792a22
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/31792a22
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/31792a22
Branch: refs/heads/master
Commit: 31792a22edc40f222c7eb8ea703c4986e75df668
Parents: 7b49e8d
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sat Aug 1 11:10:20 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sat Aug 1 11:10:20 2015 +0200
----------------------------------------------------------------------
.../camel/component/aws/cw/CwConfiguration.java | 30 ++++++++++++++++++++
.../camel/component/aws/cw/CwEndpoint.java | 12 +++++++-
2 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/31792a22/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java
index bcee315..9261e61 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.aws.cw;
import java.util.Date;
import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
+
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
@@ -45,6 +46,10 @@ public class CwConfiguration implements Cloneable {
private String unit;
@UriParam
private Date timestamp;
+ @UriParam
+ private String proxyHost;
+ @UriParam
+ private Integer proxyPort;
/**
* The region with which the AWS-CW client wants to work with.
@@ -144,6 +149,29 @@ public class CwConfiguration implements Cloneable {
public void setAmazonCwClient(AmazonCloudWatch amazonCwClient) {
this.amazonCwClient = amazonCwClient;
}
+
+
+ /**
+ * To define a proxy host when instantiating the SQS client
+ */
+ public String getProxyHost() {
+ return proxyHost;
+ }
+
+ public void setProxyHost(String proxyHost) {
+ this.proxyHost = proxyHost;
+ }
+
+ /**
+ * To define a proxy port when instantiating the SQS client
+ */
+ public Integer getProxyPort() {
+ return proxyPort;
+ }
+
+ public void setProxyPort(Integer proxyPort) {
+ this.proxyPort = proxyPort;
+ }
@Override
public String toString() {
@@ -153,6 +181,8 @@ public class CwConfiguration implements Cloneable {
+ ", secretKey=xxxxxxxxxxxxxxx"
+ ", value=" + value
+ ", unit=" + unit
+ + ", proxyHost=" + proxyHost
+ + ", proxyPort=" + proxyPort
+ "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/31792a22/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
index 6a75991..aa1ba61 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
@@ -16,10 +16,12 @@
*/
package org.apache.camel.component.aws.cw;
+import com.amazonaws.ClientConfiguration;
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
import com.amazonaws.services.cloudwatch.AmazonCloudWatchClient;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
@@ -92,8 +94,16 @@ public class CwEndpoint extends DefaultEndpoint {
}
AmazonCloudWatch createCloudWatchClient() {
+ AmazonCloudWatch client = null;
AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
- AmazonCloudWatch client = new AmazonCloudWatchClient(credentials);
+ if (ObjectHelper.isNotEmpty(configuration.getProxyHost()) && ObjectHelper.isNotEmpty(configuration.getProxyPort())) {
+ ClientConfiguration clientConfiguration = new ClientConfiguration();
+ clientConfiguration.setProxyHost(configuration.getProxyHost());
+ clientConfiguration.setProxyPort(configuration.getProxyPort());
+ client = new AmazonCloudWatchClient(credentials, clientConfiguration);
+ } else {
+ client = new AmazonCloudWatchClient(credentials);
+ }
return client;
}
}
\ No newline at end of file