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 2018/02/07 09:44:57 UTC
[camel] branch master updated (6af5281 -> 5d7288c)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 6af5281 Upgrade JBoss AS Maven Plugin to version 7.9.Final
new 0b5c5b8 CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS CW
new a18a0db CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS DDB
new 376da27 CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS EC2
new cea2a08 CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS Lambda
new f34bf7c CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS S3
new feea9b1 CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS SDB
new 6e1b926 CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS SES
new 217aea5 CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS SNS
new adfdda3 CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS SQS
new 5d7288c Camel-AWS S3 - Changed javadoc related to region
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-aws/src/main/docs/aws-cw-component.adoc | 5 ++---
.../camel-aws/src/main/docs/aws-ddb-component.adoc | 5 ++---
.../camel-aws/src/main/docs/aws-ec2-component.adoc | 5 ++---
.../camel-aws/src/main/docs/aws-lambda-component.adoc | 5 ++---
components/camel-aws/src/main/docs/aws-s3-component.adoc | 7 +++----
.../camel-aws/src/main/docs/aws-sdb-component.adoc | 5 ++---
.../camel-aws/src/main/docs/aws-ses-component.adoc | 5 ++---
.../camel-aws/src/main/docs/aws-sns-component.adoc | 5 ++---
.../camel-aws/src/main/docs/aws-sqs-component.adoc | 5 ++---
.../apache/camel/component/aws/cw/CwConfiguration.java | 14 --------------
.../org/apache/camel/component/aws/cw/CwEndpoint.java | 6 ++----
.../apache/camel/component/aws/ddb/DdbConfiguration.java | 13 -------------
.../org/apache/camel/component/aws/ddb/DdbEndpoint.java | 12 +++---------
.../apache/camel/component/aws/ec2/EC2Configuration.java | 13 -------------
.../org/apache/camel/component/aws/ec2/EC2Endpoint.java | 10 +++-------
.../camel/component/aws/lambda/LambdaConfiguration.java | 13 -------------
.../camel/component/aws/lambda/LambdaEndpoint.java | 5 +++--
.../apache/camel/component/aws/s3/S3Configuration.java | 16 +---------------
.../org/apache/camel/component/aws/s3/S3Endpoint.java | 4 ----
.../apache/camel/component/aws/sdb/SdbConfiguration.java | 13 -------------
.../org/apache/camel/component/aws/sdb/SdbEndpoint.java | 7 +++----
.../apache/camel/component/aws/ses/SesConfiguration.java | 13 -------------
.../org/apache/camel/component/aws/ses/SesEndpoint.java | 10 +++-------
.../apache/camel/component/aws/sns/SnsConfiguration.java | 13 -------------
.../org/apache/camel/component/aws/sns/SnsEndpoint.java | 7 +++----
.../apache/camel/component/aws/sqs/SqsConfiguration.java | 15 ---------------
.../org/apache/camel/component/aws/sqs/SqsEndpoint.java | 11 +++--------
.../component/aws/s3/S3ComponentConfigurationTest.java | 6 +-----
.../component/aws/sdb/SdbComponentConfigurationTest.java | 4 ----
.../component/aws/ses/SesComponentConfigurationTest.java | 6 +-----
.../component/aws/sns/SnsComponentConfigurationTest.java | 8 ++------
.../component/aws/sqs/SqsComponentConfigurationTest.java | 6 +-----
.../aws/cw/springboot/CwComponentConfiguration.java | 12 ------------
.../aws/ddb/springboot/DdbComponentConfiguration.java | 12 ------------
.../aws/ec2/springboot/EC2ComponentConfiguration.java | 12 ------------
.../lambda/springboot/LambdaComponentConfiguration.java | 12 ------------
.../aws/s3/springboot/S3ComponentConfiguration.java | 15 +--------------
.../aws/ses/springboot/SesComponentConfiguration.java | 12 ------------
.../aws/sns/springboot/SnsComponentConfiguration.java | 12 ------------
.../aws/sqs/springboot/SqsComponentConfiguration.java | 15 ---------------
40 files changed, 49 insertions(+), 325 deletions(-)
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 02/10: CAMEL-12234 - Camel-AWS: Since we are using builders,
we need to remove the AWS endpoint options on the components that are using
them - AWS DDB
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a18a0dbc8b91df63e724981d41385c3319c44c6e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 7 09:41:30 2018 +0100
CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS DDB
---
components/camel-aws/src/main/docs/aws-ddb-component.adoc | 5 ++---
.../apache/camel/component/aws/ddb/DdbConfiguration.java | 13 -------------
.../org/apache/camel/component/aws/ddb/DdbEndpoint.java | 10 +++-------
.../aws/ddb/springboot/DdbComponentConfiguration.java | 12 ------------
4 files changed, 5 insertions(+), 35 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-ddb-component.adoc b/components/camel-aws/src/main/docs/aws-ddb-component.adoc
index 918d5a6..d98f95c 100644
--- a/components/camel-aws/src/main/docs/aws-ddb-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-ddb-component.adoc
@@ -61,13 +61,12 @@ with the following path and query parameters:
| *tableName* | *Required* The name of the table currently worked with. | | String
|===
-==== Query Parameters (14 parameters):
+==== Query Parameters (13 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *amazonDDBClient* (producer) | To use the AmazonDynamoDB as the client | | AmazonDynamoDB
-| *amazonDdbEndpoint* (producer) | The endpoint with which the AWS-DDB client wants to work with. | | String
| *consistentRead* (producer) | Determines whether or not strong consistency should be enforced when data is read. | false | boolean
| *keyAttributeName* (producer) | Attribute name when creating table | | String
| *keyAttributeType* (producer) | Attribute type when creating table | | String
@@ -340,4 +339,4 @@ where `${camel-version`} must be replaced by the actual version of Camel
* link:endpoint.html[Endpoint]
* link:getting-started.html[Getting Started]
-* link:aws.html[AWS Component]
\ No newline at end of file
+* link:aws.html[AWS Component]
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 cecd2c5..f245ec4 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
@@ -36,8 +36,6 @@ public class DdbConfiguration implements Cloneable {
@UriParam
private AmazonDynamoDB amazonDDBClient;
@UriParam
- private String amazonDdbEndpoint;
- @UriParam
private boolean consistentRead;
@UriParam(defaultValue = "PutItem")
private DdbOperations operation = DdbOperations.PutItem;
@@ -56,17 +54,6 @@ public class DdbConfiguration implements Cloneable {
@UriParam
private String region;
- /**
- * The endpoint with which the AWS-DDB client wants to work with.
- */
- public void setAmazonDdbEndpoint(String amazonDdbEndpoint) {
- this.amazonDdbEndpoint = amazonDdbEndpoint;
- }
-
- public String getAmazonDdbEndpoint() {
- return amazonDdbEndpoint;
- }
-
public String getAccessKey() {
return accessKey;
}
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 306aa06..f3a65fb 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
@@ -23,6 +23,7 @@ import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
+import com.amazonaws.regions.Regions;
import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
@@ -89,10 +90,6 @@ public class DdbEndpoint extends ScheduledPollEndpoint {
ddbClient = configuration.getAmazonDDBClient() != null ? configuration.getAmazonDDBClient()
: createDdbClient();
- if (ObjectHelper.isNotEmpty(configuration.getAmazonDdbEndpoint())) {
- ddbClient.setEndpoint(configuration.getAmazonDdbEndpoint());
- }
-
String tableName = getConfiguration().getTableName();
LOG.trace("Querying whether table [{}] already exists...", tableName);
@@ -163,9 +160,8 @@ public class DdbEndpoint extends ScheduledPollEndpoint {
clientBuilder = AmazonDynamoDBClientBuilder.standard().withClientConfiguration(clientConfiguration);
}
}
- if (ObjectHelper.isNotEmpty(configuration.getAmazonDdbEndpoint()) && ObjectHelper.isNotEmpty(configuration.getRegion())) {
- EndpointConfiguration endpointConfiguration = new EndpointConfiguration(configuration.getAmazonDdbEndpoint(), configuration.getRegion());
- clientBuilder = clientBuilder.withEndpointConfiguration(endpointConfiguration);
+ if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
+ clientBuilder = clientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
}
client = clientBuilder.build();
return client;
diff --git a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentConfiguration.java
index 1beee46..ac1fd2c 100644
--- a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentConfiguration.java
@@ -103,10 +103,6 @@ public class DdbComponentConfiguration
public static class DdbConfigurationNestedConfiguration {
public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.ddb.DdbConfiguration.class;
/**
- * The endpoint with which the AWS-DDB client wants to work with.
- */
- private String amazonDdbEndpoint;
- /**
* Amazon AWS Access Key
*/
private String accessKey;
@@ -153,14 +149,6 @@ public class DdbComponentConfiguration
private Integer proxyPort;
private String region;
- public String getAmazonDdbEndpoint() {
- return amazonDdbEndpoint;
- }
-
- public void setAmazonDdbEndpoint(String amazonDdbEndpoint) {
- this.amazonDdbEndpoint = amazonDdbEndpoint;
- }
-
public String getAccessKey() {
return accessKey;
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 06/10: CAMEL-12234 - Camel-AWS: Since we are using builders,
we need to remove the AWS endpoint options on the components that are using
them - AWS SDB
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit feea9b1f6f4e591fcb413cf3624690ec3fa23183
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 7 10:14:40 2018 +0100
CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS SDB
---
components/camel-aws/src/main/docs/aws-sdb-component.adoc | 5 ++---
.../apache/camel/component/aws/sdb/SdbConfiguration.java | 13 -------------
.../org/apache/camel/component/aws/sdb/SdbEndpoint.java | 7 +++----
.../component/aws/sdb/SdbComponentConfigurationTest.java | 4 ----
4 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-sdb-component.adoc b/components/camel-aws/src/main/docs/aws-sdb-component.adoc
index 8087f4f..7f41ae5 100644
--- a/components/camel-aws/src/main/docs/aws-sdb-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-sdb-component.adoc
@@ -49,14 +49,13 @@ with the following path and query parameters:
| *domainName* | *Required* The name of the domain currently worked with. | | String
|===
-==== Query Parameters (11 parameters):
+==== Query Parameters (10 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *accessKey* (producer) | Amazon AWS Access Key | | String
| *amazonSDBClient* (producer) | To use the AmazonSimpleDB as the client | | AmazonSimpleDB
-| *amazonSdbEndpoint* (producer) | The region with which the AWS-SDB client wants to work with. | | String
| *consistentRead* (producer) | Determines whether or not strong consistency should be enforced when data is read. | false | boolean
| *maxNumberOfDomains* (producer) | The maximum number of domain names you want returned. The range is 1 to 100. | | Integer
| *operation* (producer) | Operation to perform | PutAttributes | SdbOperations
@@ -223,4 +222,4 @@ where `${camel-version`} must be replaced by the actual version of Camel
* link:endpoint.html[Endpoint]
* link:getting-started.html[Getting Started]
-* link:aws.html[AWS Component]
\ No newline at end of file
+* link:aws.html[AWS Component]
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 5686f7f..d93fbe4 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
@@ -35,8 +35,6 @@ public class SdbConfiguration {
@UriParam
private String secretKey;
@UriParam
- private String amazonSdbEndpoint;
- @UriParam
private Integer maxNumberOfDomains;
@UriParam
private boolean consistentRead;
@@ -49,17 +47,6 @@ public class SdbConfiguration {
@UriParam
private String region;
- /**
- * The region with which the AWS-SDB client wants to work with.
- */
- public void setAmazonSdbEndpoint(String amazonSdbEndpoint) {
- this.amazonSdbEndpoint = amazonSdbEndpoint;
- }
-
- public String getAmazonSdbEndpoint() {
- return amazonSdbEndpoint;
- }
-
public String getAccessKey() {
return accessKey;
}
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 c2ace82..c671ed6 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
@@ -21,7 +21,7 @@ import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
+import com.amazonaws.regions.Regions;
import com.amazonaws.services.simpledb.AmazonSimpleDB;
import com.amazonaws.services.simpledb.AmazonSimpleDBClientBuilder;
import com.amazonaws.services.simpledb.model.CreateDomainRequest;
@@ -131,9 +131,8 @@ public class SdbEndpoint extends ScheduledPollEndpoint {
clientBuilder = AmazonSimpleDBClientBuilder.standard().withClientConfiguration(clientConfiguration);
}
}
- if (ObjectHelper.isNotEmpty(configuration.getAmazonSdbEndpoint()) && ObjectHelper.isNotEmpty(configuration.getRegion())) {
- EndpointConfiguration endpointConfiguration = new EndpointConfiguration(configuration.getAmazonSdbEndpoint(), configuration.getRegion());
- clientBuilder = clientBuilder.withEndpointConfiguration(endpointConfiguration);
+ if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
+ clientBuilder = clientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
}
client = clientBuilder.build();
return client;
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java
index 93627e5..e2a568b 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java
@@ -39,7 +39,6 @@ public class SdbComponentConfigurationTest extends CamelTestSupport {
assertEquals("yyy", endpoint.getConfiguration().getSecretKey());
assertNotNull(endpoint.getConfiguration().getAmazonSDBClient());
assertEquals(SdbOperations.PutAttributes, endpoint.getConfiguration().getOperation());
- assertNull(endpoint.getConfiguration().getAmazonSdbEndpoint());
assertFalse(endpoint.getConfiguration().isConsistentRead());
assertNull(endpoint.getConfiguration().getMaxNumberOfDomains());
}
@@ -55,7 +54,6 @@ public class SdbComponentConfigurationTest extends CamelTestSupport {
assertEquals("yyy", endpoint.getConfiguration().getSecretKey());
assertNull(endpoint.getConfiguration().getAmazonSDBClient());
assertEquals(SdbOperations.PutAttributes, endpoint.getConfiguration().getOperation());
- assertNull(endpoint.getConfiguration().getAmazonSdbEndpoint());
assertFalse(endpoint.getConfiguration().isConsistentRead());
assertNull(endpoint.getConfiguration().getMaxNumberOfDomains());
}
@@ -76,7 +74,6 @@ public class SdbComponentConfigurationTest extends CamelTestSupport {
assertNull(endpoint.getConfiguration().getSecretKey());
assertSame(mock, endpoint.getConfiguration().getAmazonSDBClient());
assertEquals(SdbOperations.PutAttributes, endpoint.getConfiguration().getOperation());
- assertNull(endpoint.getConfiguration().getAmazonSdbEndpoint());
assertFalse(endpoint.getConfiguration().isConsistentRead());
assertNull(endpoint.getConfiguration().getMaxNumberOfDomains());
}
@@ -97,7 +94,6 @@ public class SdbComponentConfigurationTest extends CamelTestSupport {
assertEquals("yyy", endpoint.getConfiguration().getSecretKey());
assertNotNull(endpoint.getConfiguration().getAmazonSDBClient());
assertEquals(SdbOperations.DeleteAttributes, endpoint.getConfiguration().getOperation());
- assertNull(endpoint.getConfiguration().getAmazonSdbEndpoint());
assertTrue(endpoint.getConfiguration().isConsistentRead());
assertEquals(new Integer(5), endpoint.getConfiguration().getMaxNumberOfDomains());
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 08/10: CAMEL-12234 - Camel-AWS: Since we are using builders,
we need to remove the AWS endpoint options on the components that are using
them - AWS SNS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 217aea5c32a9a64d05cceacc52fc20494bab634e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 7 10:32:15 2018 +0100
CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS SNS
---
components/camel-aws/src/main/docs/aws-sns-component.adoc | 5 ++---
.../apache/camel/component/aws/sns/SnsConfiguration.java | 13 -------------
.../org/apache/camel/component/aws/sns/SnsEndpoint.java | 7 +++----
.../component/aws/sns/SnsComponentConfigurationTest.java | 8 ++------
.../aws/sns/springboot/SnsComponentConfiguration.java | 12 ------------
5 files changed, 7 insertions(+), 38 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-sns-component.adoc b/components/camel-aws/src/main/docs/aws-sns-component.adoc
index c7a7762..bc29847 100644
--- a/components/camel-aws/src/main/docs/aws-sns-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-sns-component.adoc
@@ -65,13 +65,12 @@ with the following path and query parameters:
| *topicNameOrArn* | *Required* Topic name or ARN | | String
|===
-==== Query Parameters (12 parameters):
+==== Query Parameters (11 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *amazonSNSClient* (producer) | To use the AmazonSNS as the client | | AmazonSNS
-| *amazonSNSEndpoint* (producer) | The region with which the AWS-SNS client wants to work with. | | String
| *headerFilterStrategy* (producer) | To use a custom HeaderFilterStrategy to map headers to/from Camel. | | HeaderFilterStrategy
| *messageStructure* (producer) | The message structure to use such as json | | String
| *policy* (producer) | The policy for this queue | | String
@@ -167,4 +166,4 @@ where `${camel-version`} must be replaced by the actual version of Camel
* link:endpoint.html[Endpoint]
* link:getting-started.html[Getting Started]
-* link:aws.html[AWS Component]
\ No newline at end of file
+* link:aws.html[AWS Component]
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
index 691fecf..dccb223 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
@@ -36,8 +36,6 @@ public class SnsConfiguration implements Cloneable {
@UriParam(label = "security", secret = true)
private String secretKey;
@UriParam
- private String amazonSNSEndpoint;
- @UriParam
private String proxyHost;
@UriParam
private Integer proxyPort;
@@ -52,17 +50,6 @@ public class SnsConfiguration implements Cloneable {
@UriParam
private String region;
- /**
- * The region with which the AWS-SNS client wants to work with.
- */
- public void setAmazonSNSEndpoint(String awsSNSEndpoint) {
- this.amazonSNSEndpoint = awsSNSEndpoint;
- }
-
- public String getAmazonSNSEndpoint() {
- return amazonSNSEndpoint;
- }
-
public String getSubject() {
return subject;
}
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 22ad83c..352ebb4 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
@@ -23,8 +23,8 @@ import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
+import com.amazonaws.regions.Regions;
import com.amazonaws.services.sns.AmazonSNS;
-import com.amazonaws.services.sns.AmazonSNSClient;
import com.amazonaws.services.sns.AmazonSNSClientBuilder;
import com.amazonaws.services.sns.model.CreateTopicRequest;
import com.amazonaws.services.sns.model.CreateTopicResult;
@@ -201,9 +201,8 @@ public class SnsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
clientBuilder = AmazonSNSClientBuilder.standard().withClientConfiguration(clientConfiguration);
}
}
- if (ObjectHelper.isNotEmpty(configuration.getAmazonSNSEndpoint()) && ObjectHelper.isNotEmpty(configuration.getRegion())) {
- EndpointConfiguration endpointConfiguration = new EndpointConfiguration(configuration.getAmazonSNSEndpoint(), configuration.getRegion());
- clientBuilder = clientBuilder.withEndpointConfiguration(endpointConfiguration);
+ if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
+ clientBuilder = clientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
}
client = clientBuilder.build();
return client;
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 52077c6..329263f 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
@@ -39,7 +39,6 @@ public class SnsComponentConfigurationTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getAmazonSNSClient());
assertNull(endpoint.getConfiguration().getTopicArn());
assertNull(endpoint.getConfiguration().getSubject());
- assertNull(endpoint.getConfiguration().getAmazonSNSEndpoint());
assertNull(endpoint.getConfiguration().getPolicy());
}
@Test
@@ -53,7 +52,6 @@ public class SnsComponentConfigurationTest extends CamelTestSupport {
assertNull(endpoint.getConfiguration().getAmazonSNSClient());
assertNull(endpoint.getConfiguration().getTopicArn());
assertNull(endpoint.getConfiguration().getSubject());
- assertNull(endpoint.getConfiguration().getAmazonSNSEndpoint());
assertNull(endpoint.getConfiguration().getPolicy());
}
@@ -76,14 +74,13 @@ 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&amazonSNSEndpoint=sns.ap-southeast-2.amazonaws.com");
+ SnsEndpoint endpoint = (SnsEndpoint) component.createEndpoint("aws-sns://MyTopic?amazonSNSClient=#amazonSNSClient");
assertEquals("MyTopic", endpoint.getConfiguration().getTopicName());
assertNull(endpoint.getConfiguration().getAccessKey());
assertNull(endpoint.getConfiguration().getSecretKey());
assertNull(endpoint.getConfiguration().getTopicArn());
assertNull(endpoint.getConfiguration().getSubject());
- assertNotNull(endpoint.getConfiguration().getAmazonSNSEndpoint());
assertNull(endpoint.getConfiguration().getPolicy());
endpoint.start();
@@ -102,12 +99,11 @@ 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&amazonSNSEndpoint=sns.eu-west-1.amazonaws.com&accessKey=xxx&secretKey=yyy"
+ SnsEndpoint endpoint = (SnsEndpoint) component.createEndpoint("aws-sns://MyTopic?amazonSNSClient=#amazonSNSClient&accessKey=xxx&secretKey=yyy"
+ "&policy=%7B%22Version%22%3A%222008-10-17%22,%22Statement%22%3A%5B%7B%22Sid%22%3A%221%22,%22Effect%22%3A%22Allow%22,%22Principal%22%3A%7B%22AWS%22%3A%5B%22*%22%5D%7D,"
+ "%22Action%22%3A%5B%22sns%3ASubscribe%22%5D%7D%5D%7D&subject=The+subject+message");
assertEquals("MyTopic", endpoint.getConfiguration().getTopicName());
- assertEquals("sns.eu-west-1.amazonaws.com", endpoint.getConfiguration().getAmazonSNSEndpoint());
assertEquals("xxx", endpoint.getConfiguration().getAccessKey());
assertEquals("yyy", endpoint.getConfiguration().getSecretKey());
assertNull(endpoint.getConfiguration().getTopicArn());
diff --git a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConfiguration.java
index b5962a2..5065d24 100644
--- a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConfiguration.java
@@ -101,10 +101,6 @@ public class SnsComponentConfiguration
public static class SnsConfigurationNestedConfiguration {
public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.sns.SnsConfiguration.class;
/**
- * The region with which the AWS-SNS client wants to work with.
- */
- private String amazonSNSEndpoint;
- /**
* The subject which is used if the message header 'CamelAwsSnsSubject'
* is not present.
*/
@@ -141,14 +137,6 @@ public class SnsComponentConfiguration
private Integer proxyPort;
private String region;
- public String getAmazonSNSEndpoint() {
- return amazonSNSEndpoint;
- }
-
- public void setAmazonSNSEndpoint(String amazonSNSEndpoint) {
- this.amazonSNSEndpoint = amazonSNSEndpoint;
- }
-
public String getSubject() {
return subject;
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 07/10: CAMEL-12234 - Camel-AWS: Since we are using builders,
we need to remove the AWS endpoint options on the components that are using
them - AWS SES
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6e1b92642e64e5cddc1470edef97edf134454696
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 7 10:17:59 2018 +0100
CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS SES
---
components/camel-aws/src/main/docs/aws-ses-component.adoc | 5 ++---
.../apache/camel/component/aws/ses/SesConfiguration.java | 13 -------------
.../org/apache/camel/component/aws/ses/SesEndpoint.java | 10 +++-------
.../component/aws/ses/SesComponentConfigurationTest.java | 6 +-----
.../aws/ses/springboot/SesComponentConfiguration.java | 12 ------------
5 files changed, 6 insertions(+), 40 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-ses-component.adoc b/components/camel-aws/src/main/docs/aws-ses-component.adoc
index d6c5631..bd0e52c 100644
--- a/components/camel-aws/src/main/docs/aws-ses-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-ses-component.adoc
@@ -61,13 +61,12 @@ with the following path and query parameters:
| *from* | *Required* The sender's email address. | | String
|===
-==== Query Parameters (12 parameters):
+==== Query Parameters (11 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *amazonSESClient* (producer) | To use the AmazonSimpleEmailService as the client | | AmazonSimpleEmail Service
-| *amazonSESEndpoint* (producer) | The region with which the AWS-SES client wants to work with. | | String
| *proxyHost* (producer) | To define a proxy host when instantiating the SES client | | String
| *proxyPort* (producer) | To define a proxy port when instantiating the SES client | | Integer
| *region* (producer) | The region in which SES client needs to work | | String
@@ -172,4 +171,4 @@ where `${camel-version`} must be replaced by the actual version of Camel
* link:endpoint.html[Endpoint]
* link:getting-started.html[Getting Started]
-* link:aws.html[AWS Component]
\ No newline at end of file
+* link:aws.html[AWS Component]
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 3616b69..ffc69f3 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
@@ -39,8 +39,6 @@ public class SesConfiguration implements Cloneable {
@UriParam(label = "security", secret = true)
private String secretKey;
@UriParam
- private String amazonSESEndpoint;
- @UriParam
private String subject;
@UriParam
private List<String> to;
@@ -154,17 +152,6 @@ public class SesConfiguration implements Cloneable {
this.replyToAddresses = Arrays.asList(replyToAddresses.split(","));
}
- public String getAmazonSESEndpoint() {
- return amazonSESEndpoint;
- }
-
- /**
- * The region with which the AWS-SES client wants to work with.
- */
- public void setAmazonSESEndpoint(String amazonSesEndpoint) {
- this.amazonSESEndpoint = amazonSesEndpoint;
- }
-
/**
* To define a proxy host when instantiating the SES client
*/
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 f65db60..b4f5dbc 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
@@ -22,6 +22,7 @@ import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
+import com.amazonaws.regions.Regions;
import com.amazonaws.services.simpleemail.AmazonSimpleEmailService;
import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient;
import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClientBuilder;
@@ -63,10 +64,6 @@ public class SesEndpoint extends DefaultEndpoint {
sesClient = configuration.getAmazonSESClient() != null
? configuration.getAmazonSESClient()
: createSESClient();
-
- if (ObjectHelper.isNotEmpty(configuration.getAmazonSESEndpoint())) {
- sesClient.setEndpoint(configuration.getAmazonSESEndpoint());
- }
}
public Consumer createConsumer(Processor processor) throws Exception {
@@ -115,9 +112,8 @@ public class SesEndpoint extends DefaultEndpoint {
clientBuilder = AmazonSimpleEmailServiceClientBuilder.standard().withClientConfiguration(clientConfiguration);
}
}
- if (ObjectHelper.isNotEmpty(configuration.getAmazonSESEndpoint()) && ObjectHelper.isNotEmpty(configuration.getRegion())) {
- EndpointConfiguration endpointConfiguration = new EndpointConfiguration(configuration.getAmazonSESEndpoint(), configuration.getRegion());
- clientBuilder = clientBuilder.withEndpointConfiguration(endpointConfiguration);
+ if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
+ clientBuilder = clientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
}
client = clientBuilder.build();
return client;
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ses/SesComponentConfigurationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ses/SesComponentConfigurationTest.java
index 9c118aa..3d66aeb 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ses/SesComponentConfigurationTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ses/SesComponentConfigurationTest.java
@@ -38,7 +38,6 @@ public class SesComponentConfigurationTest extends CamelTestSupport {
assertEquals("from@example.com", endpoint.getConfiguration().getFrom());
assertEquals("xxx", endpoint.getConfiguration().getAccessKey());
assertEquals("yyy", endpoint.getConfiguration().getSecretKey());
- assertNull(endpoint.getConfiguration().getAmazonSESEndpoint());
assertNotNull(endpoint.getConfiguration().getAmazonSESClient());
assertNull(endpoint.getConfiguration().getTo());
assertNull(endpoint.getConfiguration().getSubject());
@@ -54,7 +53,6 @@ public class SesComponentConfigurationTest extends CamelTestSupport {
assertEquals("from@example.com", endpoint.getConfiguration().getFrom());
assertEquals("xxx", endpoint.getConfiguration().getAccessKey());
assertEquals("yyy", endpoint.getConfiguration().getSecretKey());
- assertNull(endpoint.getConfiguration().getAmazonSESEndpoint());
assertNull(endpoint.getConfiguration().getAmazonSESClient());
assertNull(endpoint.getConfiguration().getTo());
assertNull(endpoint.getConfiguration().getSubject());
@@ -76,7 +74,6 @@ public class SesComponentConfigurationTest extends CamelTestSupport {
assertEquals("from@example.com", endpoint.getConfiguration().getFrom());
assertNull(endpoint.getConfiguration().getAccessKey());
assertNull(endpoint.getConfiguration().getSecretKey());
- assertNull(endpoint.getConfiguration().getAmazonSESEndpoint());
assertSame(mock, endpoint.getConfiguration().getAmazonSESClient());
assertNull(endpoint.getConfiguration().getTo());
assertNull(endpoint.getConfiguration().getSubject());
@@ -93,13 +90,12 @@ public class SesComponentConfigurationTest extends CamelTestSupport {
SesComponent component = new SesComponent(context);
SesEndpoint endpoint = (SesEndpoint) component.createEndpoint("aws-ses://from@example.com?amazonSESClient=#amazonSESClient&accessKey=xxx"
- + "&secretKey=yyy&to=to1@example.com,to2@example.com&amazonSESEndpoint=us-east-1&subject=Subject"
+ + "&secretKey=yyy&to=to1@example.com,to2@example.com&subject=Subject"
+ "&returnPath=bounce@example.com&replyToAddresses=replyTo1@example.com,replyTo2@example.com");
assertEquals("from@example.com", endpoint.getConfiguration().getFrom());
assertEquals("xxx", endpoint.getConfiguration().getAccessKey());
assertEquals("yyy", endpoint.getConfiguration().getSecretKey());
- assertEquals("us-east-1", endpoint.getConfiguration().getAmazonSESEndpoint());
assertNotNull(endpoint.getConfiguration().getAmazonSESClient());
assertEquals(2, endpoint.getConfiguration().getTo().size());
assertTrue(endpoint.getConfiguration().getTo().contains("to1@example.com"));
diff --git a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentConfiguration.java
index 42c61a0..8044df1 100644
--- a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentConfiguration.java
@@ -136,10 +136,6 @@ public class SesComponentConfiguration
* 'CamelAwsSesReplyToAddresses' header.
*/
private List replyToAddresses;
- /**
- * The region with which the AWS-SES client wants to work with.
- */
- private String amazonSESEndpoint;
private String proxyHost;
private Integer proxyPort;
private String region;
@@ -208,14 +204,6 @@ public class SesComponentConfiguration
this.replyToAddresses = replyToAddresses;
}
- public String getAmazonSESEndpoint() {
- return amazonSESEndpoint;
- }
-
- public void setAmazonSESEndpoint(String amazonSESEndpoint) {
- this.amazonSESEndpoint = amazonSESEndpoint;
- }
-
public String getProxyHost() {
return proxyHost;
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 03/10: CAMEL-12234 - Camel-AWS: Since we are using builders,
we need to remove the AWS endpoint options on the components that are using
them - AWS EC2
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 376da27d065988f8f4ef4803a221d31f1439012b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 7 09:49:51 2018 +0100
CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS EC2
---
components/camel-aws/src/main/docs/aws-ec2-component.adoc | 5 ++---
.../java/org/apache/camel/component/aws/cw/CwEndpoint.java | 1 -
.../org/apache/camel/component/aws/ddb/DdbEndpoint.java | 2 --
.../apache/camel/component/aws/ec2/EC2Configuration.java | 13 -------------
.../org/apache/camel/component/aws/ec2/EC2Endpoint.java | 10 +++-------
.../aws/ec2/springboot/EC2ComponentConfiguration.java | 12 ------------
6 files changed, 5 insertions(+), 38 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-ec2-component.adoc b/components/camel-aws/src/main/docs/aws-ec2-component.adoc
index 12c3b54..32f2d6a 100644
--- a/components/camel-aws/src/main/docs/aws-ec2-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-ec2-component.adoc
@@ -61,14 +61,13 @@ with the following path and query parameters:
| *label* | *Required* Logical name | | String
|===
-==== Query Parameters (9 parameters):
+==== Query Parameters (8 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *accessKey* (producer) | Amazon AWS Access Key | | String
| *amazonEc2Client* (producer) | To use a existing configured AmazonEC2Client as client | | AmazonEC2Client
-| *amazonEc2Endpoint* (producer) | The region with which the AWS-EC2 client wants to work with. | | String
| *operation* (producer) | *Required* The operation to perform. It can be createAndRunInstances startInstances stopInstances terminateInstances describeInstances describeInstancesStatus rebootInstances monitorInstances unmonitorInstances createTags or deleteTags | | EC2Operations
| *proxyHost* (producer) | To define a proxy host when instantiating the EC2 client | | String
| *proxyPort* (producer) | To define a proxy port when instantiating the EC2 client | | Integer
@@ -141,4 +140,4 @@ where `${camel-version`} must be replaced by the actual version of Camel
* link:endpoint.html[Endpoint]
* link:getting-started.html[Getting Started]
-* link:aws.html[AWS Component]
\ No newline at end of file
+* link:aws.html[AWS Component]
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 d947182..735131f 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
@@ -21,7 +21,6 @@ import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
import com.amazonaws.services.cloudwatch.AmazonCloudWatchClientBuilder;
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 f3a65fb..b10cecd 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
@@ -22,10 +22,8 @@ import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
import com.amazonaws.services.dynamodbv2.model.CreateTableRequest;
import com.amazonaws.services.dynamodbv2.model.DescribeTableRequest;
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 ad8bd03..0576cb7 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
@@ -36,8 +36,6 @@ public class EC2Configuration implements Cloneable {
@UriParam(label = "producer", secret = true)
private String secretKey;
@UriParam(label = "producer")
- private String amazonEc2Endpoint;
- @UriParam(label = "producer")
@Metadata(required = "true")
private EC2Operations operation;
@UriParam(label = "producer")
@@ -79,17 +77,6 @@ public class EC2Configuration implements Cloneable {
public void setSecretKey(String secretKey) {
this.secretKey = secretKey;
}
-
- public String getAmazonEc2Endpoint() {
- return amazonEc2Endpoint;
- }
-
- /**
- * The region with which the AWS-EC2 client wants to work with.
- */
- public void setAmazonEc2Endpoint(String amazonEc2Endpoint) {
- this.amazonEc2Endpoint = amazonEc2Endpoint;
- }
public EC2Operations getOperation() {
return operation;
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 a9a6cc5..bd00ee9 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
@@ -21,7 +21,7 @@ import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
+import com.amazonaws.regions.Regions;
import com.amazonaws.services.ec2.AmazonEC2;
import com.amazonaws.services.ec2.AmazonEC2Client;
import com.amazonaws.services.ec2.AmazonEC2ClientBuilder;
@@ -68,9 +68,6 @@ public class EC2Endpoint extends ScheduledPollEndpoint {
super.doStart();
ec2Client = configuration.getAmazonEc2Client() != null ? configuration.getAmazonEc2Client() : (AmazonEC2Client) createEc2Client();
- if (ObjectHelper.isNotEmpty(configuration.getAmazonEc2Endpoint())) {
- ec2Client.setEndpoint(configuration.getAmazonEc2Endpoint());
- }
}
public EC2Configuration getConfiguration() {
@@ -107,9 +104,8 @@ public class EC2Endpoint extends ScheduledPollEndpoint {
clientBuilder = AmazonEC2ClientBuilder.standard().withClientConfiguration(clientConfiguration);
}
}
- if (ObjectHelper.isNotEmpty(configuration.getAmazonEc2Endpoint()) && ObjectHelper.isNotEmpty(configuration.getRegion())) {
- EndpointConfiguration endpointConfiguration = new EndpointConfiguration(configuration.getAmazonEc2Endpoint(), configuration.getRegion());
- clientBuilder = clientBuilder.withEndpointConfiguration(endpointConfiguration);
+ if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
+ clientBuilder = clientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
}
client = clientBuilder.build();
return client;
diff --git a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentConfiguration.java
index c4896dd..5ef474a 100644
--- a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentConfiguration.java
@@ -115,10 +115,6 @@ public class EC2ComponentConfiguration
*/
private String secretKey;
/**
- * The region with which the AWS-EC2 client wants to work with.
- */
- private String amazonEc2Endpoint;
- /**
* The operation to perform. It can be createAndRunInstances,
* startInstances, stopInstances, terminateInstances, describeInstances,
* describeInstancesStatus, rebootInstances, monitorInstances,
@@ -153,14 +149,6 @@ public class EC2ComponentConfiguration
this.secretKey = secretKey;
}
- public String getAmazonEc2Endpoint() {
- return amazonEc2Endpoint;
- }
-
- public void setAmazonEc2Endpoint(String amazonEc2Endpoint) {
- this.amazonEc2Endpoint = amazonEc2Endpoint;
- }
-
public EC2Operations getOperation() {
return operation;
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 01/10: CAMEL-12234 - Camel-AWS: Since we are using builders,
we need to remove the AWS endpoint options on the components that are using
them - AWS CW
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0b5c5b80569e2b8943b11762909517b0fa7b7938
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 7 09:38:14 2018 +0100
CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS CW
---
components/camel-aws/src/main/docs/aws-cw-component.adoc | 5 ++---
.../org/apache/camel/component/aws/cw/CwConfiguration.java | 14 --------------
.../java/org/apache/camel/component/aws/cw/CwEndpoint.java | 5 ++---
.../aws/cw/springboot/CwComponentConfiguration.java | 12 ------------
4 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-cw-component.adoc b/components/camel-aws/src/main/docs/aws-cw-component.adoc
index 8f4daea..32a3880 100644
--- a/components/camel-aws/src/main/docs/aws-cw-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-cw-component.adoc
@@ -64,13 +64,12 @@ with the following path and query parameters:
| *namespace* | *Required* The metric namespace | | String
|===
-==== Query Parameters (12 parameters):
+==== Query Parameters (11 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *amazonCwClient* (producer) | To use the AmazonCloudWatch as the client | | AmazonCloudWatch
-| *amazonCwEndpoint* (producer) | The endpoint with which the AWS-CW client wants to work with. | | String
| *name* (producer) | The metric name | | String
| *proxyHost* (producer) | To define a proxy host when instantiating the CW client | | String
| *proxyPort* (producer) | To define a proxy port when instantiating the CW client | | Integer
@@ -171,4 +170,4 @@ where `${camel-version`} must be replaced by the actual version of Camel
* link:endpoint.html[Endpoint]
* link:getting-started.html[Getting Started]
-* link:aws.html[AWS Component]
\ No newline at end of file
+* link:aws.html[AWS Component]
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 2d34014..a802422 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
@@ -33,8 +33,6 @@ public class CwConfiguration implements Cloneable {
private String namespace;
@UriParam
private AmazonCloudWatch amazonCwClient;
- @UriParam
- private String amazonCwEndpoint;
@UriParam(label = "security", secret = true)
private String accessKey;
@UriParam(label = "security", secret = true)
@@ -53,18 +51,6 @@ public class CwConfiguration implements Cloneable {
private Integer proxyPort;
@UriParam
private String region;
-
-
- /**
- * The endpoint with which the AWS-CW client wants to work with.
- */
- public void setAmazonCwEndpoint(String amazonCwEndpoint) {
- this.amazonCwEndpoint = amazonCwEndpoint;
- }
-
- public String getAmazonCwEndpoint() {
- return amazonCwEndpoint;
- }
public String getAccessKey() {
return accessKey;
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 c462216..d947182 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
@@ -118,9 +118,8 @@ public class CwEndpoint extends DefaultEndpoint {
clientBuilder = AmazonCloudWatchClientBuilder.standard().withClientConfiguration(clientConfiguration);
}
}
- if (ObjectHelper.isNotEmpty(configuration.getAmazonCwEndpoint()) && ObjectHelper.isNotEmpty(configuration.getRegion())) {
- EndpointConfiguration endpointConfiguration = new EndpointConfiguration(configuration.getAmazonCwEndpoint(), configuration.getRegion());
- clientBuilder = clientBuilder.withEndpointConfiguration(endpointConfiguration);
+ if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
+ clientBuilder = clientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
}
client = clientBuilder.build();
return client;
diff --git a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentConfiguration.java
index f4b7887..fdeea0b 100644
--- a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentConfiguration.java
@@ -101,10 +101,6 @@ public class CwComponentConfiguration
public static class CwConfigurationNestedConfiguration {
public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.cw.CwConfiguration.class;
/**
- * The endpoint with which the AWS-CW client wants to work with.
- */
- private String amazonCwEndpoint;
- /**
* Amazon AWS Access Key
*/
private String accessKey;
@@ -140,14 +136,6 @@ public class CwComponentConfiguration
private Integer proxyPort;
private String region;
- public String getAmazonCwEndpoint() {
- return amazonCwEndpoint;
- }
-
- public void setAmazonCwEndpoint(String amazonCwEndpoint) {
- this.amazonCwEndpoint = amazonCwEndpoint;
- }
-
public String getAccessKey() {
return accessKey;
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 05/10: CAMEL-12234 - Camel-AWS: Since we are using builders,
we need to remove the AWS endpoint options on the components that are using
them - AWS S3
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f34bf7cf6c5f4009efd3abf1918e9b76d7a31ae2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 7 10:10:33 2018 +0100
CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS S3
---
components/camel-aws/src/main/docs/aws-s3-component.adoc | 5 ++---
.../org/apache/camel/component/aws/s3/S3Configuration.java | 13 -------------
.../java/org/apache/camel/component/aws/s3/S3Endpoint.java | 4 ----
.../component/aws/s3/S3ComponentConfigurationTest.java | 6 +-----
.../aws/s3/springboot/S3ComponentConfiguration.java | 12 ------------
5 files changed, 3 insertions(+), 37 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-s3-component.adoc b/components/camel-aws/src/main/docs/aws-s3-component.adoc
index bbd3f73..2d80eec 100644
--- a/components/camel-aws/src/main/docs/aws-s3-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-s3-component.adoc
@@ -78,13 +78,12 @@ with the following path and query parameters:
| *bucketNameOrArn* | *Required* Bucket name or ARN | | String
|===
-==== Query Parameters (50 parameters):
+==== Query Parameters (49 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *amazonS3Client* (common) | Reference to a com.amazonaws.services.sqs.AmazonS3 in the link:registry.htmlRegistry. | | AmazonS3
-| *amazonS3Endpoint* (common) | The region with which the AWS-S3 client wants to work with. | | String
| *pathStyleAccess* (common) | Whether or not the S3 client should use path style access | false | boolean
| *policy* (common) | The policy for this queue to set in the com.amazonaws.services.s3.AmazonS3setBucketPolicy() method. | | String
| *proxyHost* (common) | To define a proxy host when instantiating the SQS client | | String
@@ -334,4 +333,4 @@ where `${camel-version`} must be replaced by the actual version of Camel
* link:endpoint.html[Endpoint]
* link:getting-started.html[Getting Started]
-* link:aws.html[AWS Component]
\ No newline at end of file
+* link:aws.html[AWS Component]
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 f580633..ad13880 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
@@ -49,8 +49,6 @@ public class S3Configuration implements Cloneable {
@UriParam(label = "producer", defaultValue = "" + 25 * 1024 * 1024)
private long partSize = 25 * 1024 * 1024;
@UriParam
- private String amazonS3Endpoint;
- @UriParam
private String policy;
@UriParam(label = "producer")
private String storageClass;
@@ -111,17 +109,6 @@ public class S3Configuration implements Cloneable {
this.multiPartUpload = multiPartUpload;
}
- /**
- * The region with which the AWS-S3 client wants to work with.
- */
- public void setAmazonS3Endpoint(String amazonS3Endpoint) {
- this.amazonS3Endpoint = amazonS3Endpoint;
- }
-
- public String getAmazonS3Endpoint() {
- return amazonS3Endpoint;
- }
-
public String getAccessKey() {
return accessKey;
}
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 1d930e0..ede278c 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
@@ -104,10 +104,6 @@ public class S3Endpoint extends ScheduledPollEndpoint {
s3Client = configuration.getAmazonS3Client() != null ? configuration.getAmazonS3Client() : createS3Client();
- if (ObjectHelper.isNotEmpty(configuration.getAmazonS3Endpoint())) {
- s3Client.setEndpoint(configuration.getAmazonS3Endpoint());
- }
-
String fileName = getConfiguration().getFileName();
if (fileName != null) {
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
index 2e1faf0..8144d7f 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
@@ -41,7 +41,6 @@ public class S3ComponentConfigurationTest extends CamelTestSupport {
assertNull(endpoint.getConfiguration().getRegion());
assertTrue(endpoint.getConfiguration().isDeleteAfterRead());
assertEquals(10, endpoint.getMaxMessagesPerPoll());
- assertNull(endpoint.getConfiguration().getAmazonS3Endpoint());
assertNull(endpoint.getConfiguration().getPolicy());
assertNull(endpoint.getConfiguration().getPrefix());
assertTrue(endpoint.getConfiguration().isIncludeBody());
@@ -59,7 +58,6 @@ public class S3ComponentConfigurationTest extends CamelTestSupport {
assertNull(endpoint.getConfiguration().getRegion());
assertTrue(endpoint.getConfiguration().isDeleteAfterRead());
assertEquals(10, endpoint.getMaxMessagesPerPoll());
- assertNull(endpoint.getConfiguration().getAmazonS3Endpoint());
assertNull(endpoint.getConfiguration().getPolicy());
assertNull(endpoint.getConfiguration().getPrefix());
assertTrue(endpoint.getConfiguration().isIncludeBody());
@@ -93,7 +91,6 @@ public class S3ComponentConfigurationTest extends CamelTestSupport {
assertNull(endpoint.getConfiguration().getRegion());
assertTrue(endpoint.getConfiguration().isDeleteAfterRead());
assertEquals(10, endpoint.getMaxMessagesPerPoll());
- assertNull(endpoint.getConfiguration().getAmazonS3Endpoint());
assertNull(endpoint.getConfiguration().getPolicy());
assertNull(endpoint.getConfiguration().getPrefix());
assertTrue(endpoint.getConfiguration().isIncludeBody());
@@ -106,7 +103,7 @@ public class S3ComponentConfigurationTest extends CamelTestSupport {
((JndiRegistry) ((PropertyPlaceholderDelegateRegistry) context.getRegistry()).getRegistry()).bind("amazonS3Client", mock);
S3Component component = new S3Component(context);
- S3Endpoint endpoint = (S3Endpoint) component.createEndpoint("aws-s3://MyBucket?amazonS3Client=#amazonS3Client&amazonS3Endpoint=sns.eu-west-1.amazonaws.com"
+ S3Endpoint endpoint = (S3Endpoint) component.createEndpoint("aws-s3://MyBucket?amazonS3Client=#amazonS3Client"
+ "&accessKey=xxx&secretKey=yyy®ion=us-west-1&deleteAfterRead=false&maxMessagesPerPoll=1&policy=%7B%22Version%22%3A%222008-10-17%22,%22Id%22%3A%22Policy4324355464%22,"
+ "%22Statement%22%3A%5B%7B%22Sid%22%3A%22Stmt456464646477%22,%22Action%22%3A%5B%22s3%3AGetObject%22%5D,%22Effect%22%3A%22Allow%22,"
+ "%22Resource%22%3A%5B%22arn%3Aaws%3As3%3A%3A%3Amybucket/some/path/*%22%5D,%22Principal%22%3A%7B%22AWS%22%3A%5B%22*%22%5D%7D%7D%5D%7D&storageClass=REDUCED_REDUNDANCY"
@@ -119,7 +116,6 @@ public class S3ComponentConfigurationTest extends CamelTestSupport {
assertEquals("us-west-1", endpoint.getConfiguration().getRegion());
assertFalse(endpoint.getConfiguration().isDeleteAfterRead());
assertEquals(1, endpoint.getMaxMessagesPerPoll());
- assertEquals("sns.eu-west-1.amazonaws.com", endpoint.getConfiguration().getAmazonS3Endpoint());
assertEquals("{\"Version\":\"2008-10-17\",\"Id\":\"Policy4324355464\",\"Statement\":[{\"Sid\":\"Stmt456464646477\",\"Action\":[\"s3:GetObject\"],\"Effect\":\"Allow\",\"Resource\":"
+ "[\"arn:aws:s3:::mybucket/some/path/*\"],\"Principal\":{\"AWS\":[\"*\"]}}]}", endpoint.getConfiguration().getPolicy());
assertEquals("REDUCED_REDUNDANCY", endpoint.getConfiguration().getStorageClass());
diff --git a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java
index 8442ce3..d33167f 100644
--- a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java
@@ -115,10 +115,6 @@ public class S3ComponentConfiguration
*/
private Boolean multiPartUpload = false;
/**
- * The region with which the AWS-S3 client wants to work with.
- */
- private String amazonS3Endpoint;
- /**
* Amazon AWS Access Key
*/
private String accessKey;
@@ -272,14 +268,6 @@ public class S3ComponentConfiguration
this.multiPartUpload = multiPartUpload;
}
- public String getAmazonS3Endpoint() {
- return amazonS3Endpoint;
- }
-
- public void setAmazonS3Endpoint(String amazonS3Endpoint) {
- this.amazonS3Endpoint = amazonS3Endpoint;
- }
-
public String getAccessKey() {
return accessKey;
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 10/10: Camel-AWS S3 - Changed javadoc related to region
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5d7288cfe45acba896f3eac25210f255683d3643
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 7 10:43:39 2018 +0100
Camel-AWS S3 - Changed javadoc related to region
---
components/camel-aws/src/main/docs/aws-s3-component.adoc | 2 +-
.../main/java/org/apache/camel/component/aws/s3/S3Configuration.java | 3 +--
.../camel/component/aws/s3/springboot/S3ComponentConfiguration.java | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-s3-component.adoc b/components/camel-aws/src/main/docs/aws-s3-component.adoc
index 2d80eec..f512559 100644
--- a/components/camel-aws/src/main/docs/aws-s3-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-s3-component.adoc
@@ -88,7 +88,7 @@ with the following path and query parameters:
| *policy* (common) | The policy for this queue to set in the com.amazonaws.services.s3.AmazonS3setBucketPolicy() method. | | String
| *proxyHost* (common) | To define a proxy host when instantiating the SQS client | | String
| *proxyPort* (common) | Specify a proxy port to be used inside the client definition. | | Integer
-| *region* (common) | The region where the bucket is located. This option is used in the com.amazonaws.services.s3.model.CreateBucketRequest. | | String
+| *region* (common) | The region in which S3 client needs to work | | String
| *encryptionMaterials* (common) | The encryption materials to use in case of Symmetric/Asymmetric client usage | | EncryptionMaterials
| *useEncryption* (common) | Define if encryption must be used or not | false | boolean
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN or ERROR level and ignored. | false | boolean
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 ad13880..a3a08ac 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
@@ -184,8 +184,7 @@ public class S3Configuration implements Cloneable {
}
/**
- * The region where the bucket is located. This option is used in the
- * `com.amazonaws.services.s3.model.CreateBucketRequest`.
+ * The region in which S3 client needs to work
*/
public void setRegion(String region) {
this.region = region;
diff --git a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java
index d33167f..8b97bdf 100644
--- a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java
@@ -143,8 +143,7 @@ public class S3ComponentConfiguration
*/
private String fileName;
/**
- * The region where the bucket is located. This option is used in the
- * `com.amazonaws.services.s3.model.CreateBucketRequest`.
+ * The region in which S3 client needs to work
*/
private String region;
/**
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 04/10: CAMEL-12234 - Camel-AWS: Since we are using builders,
we need to remove the AWS endpoint options on the components that are using
them - AWS Lambda
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cea2a08533404957e58f10df8ec63bd76cc8d937
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 7 10:00:25 2018 +0100
CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS Lambda
---
.../camel-aws/src/main/docs/aws-lambda-component.adoc | 5 ++---
.../camel/component/aws/lambda/LambdaConfiguration.java | 13 -------------
.../apache/camel/component/aws/lambda/LambdaEndpoint.java | 5 +++--
.../aws/lambda/springboot/LambdaComponentConfiguration.java | 12 ------------
4 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-lambda-component.adoc b/components/camel-aws/src/main/docs/aws-lambda-component.adoc
index bb2f650..d258045 100644
--- a/components/camel-aws/src/main/docs/aws-lambda-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-lambda-component.adoc
@@ -67,12 +67,11 @@ with the following path and query parameters:
| *function* | *Required* Name of the Lambda function. | | String
|===
-==== Query Parameters (9 parameters):
+==== Query Parameters (8 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *awsLambdaEndpoint* (producer) | The AWS-Lambda client to use. | | String
| *operation* (producer) | *Required* The operation to perform. It can be listFunctions getFunction createFunction deleteFunction or invokeFunction | | LambdaOperations
| *region* (producer) | Amazon AWS Region | | String
| *awsLambdaClient* (advanced) | To use a existing configured AwsLambdaClient as client | | AWSLambda
@@ -178,4 +177,4 @@ where `${camel-version`} must be replaced by the actual version of Camel
* link:endpoint.html[Endpoint]
* link:getting-started.html[Getting Started]
-* link:aws.html[AWS Component]
\ No newline at end of file
+* link:aws.html[AWS Component]
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/lambda/LambdaConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/lambda/LambdaConfiguration.java
index bf98ff6..cd11aa4 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/lambda/LambdaConfiguration.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/lambda/LambdaConfiguration.java
@@ -33,8 +33,6 @@ public class LambdaConfiguration implements Cloneable {
@UriParam
@Metadata(required = "true")
private LambdaOperations operation;
- @UriParam
- private String awsLambdaEndpoint;
@UriParam(label = "security", secret = true)
private String accessKey;
@UriParam(label = "security", secret = true)
@@ -103,17 +101,6 @@ public class LambdaConfiguration implements Cloneable {
this.region = region;
}
- public String getAwsLambdaEndpoint() {
- return awsLambdaEndpoint;
- }
-
- /**
- * The AWS-Lambda client to use.
- */
- public void setAwsLambdaEndpoint(String awsLambdaEndpoint) {
- this.awsLambdaEndpoint = awsLambdaEndpoint;
- }
-
public LambdaOperations getOperation() {
return operation;
}
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java
index 725a404..35a2d91 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java
@@ -20,6 +20,7 @@ import com.amazonaws.ClientConfiguration;
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.regions.Regions;
import com.amazonaws.services.lambda.AWSLambda;
import com.amazonaws.services.lambda.AWSLambdaClientBuilder;
import org.apache.camel.Component;
@@ -84,8 +85,8 @@ public class LambdaEndpoint extends DefaultEndpoint {
builder = builder.withClientConfiguration(clientConfiguration);
}
- if (ObjectHelper.isNotEmpty(configuration.getAwsLambdaEndpoint())) {
- builder = builder.withRegion(configuration.getAwsLambdaEndpoint());
+ if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
+ builder = builder.withRegion(Regions.valueOf(configuration.getRegion()));
}
if (configuration.getAccessKey() != null && configuration.getSecretKey() != null) {
diff --git a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentConfiguration.java
index 4536083..94b1277 100644
--- a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentConfiguration.java
@@ -122,10 +122,6 @@ public class LambdaComponentConfiguration
*/
private String region;
/**
- * The AWS-Lambda client to use.
- */
- private String awsLambdaEndpoint;
- /**
* The operation to perform. It can be listFunctions, getFunction,
* createFunction, deleteFunction or invokeFunction
*/
@@ -173,14 +169,6 @@ public class LambdaComponentConfiguration
this.region = region;
}
- public String getAwsLambdaEndpoint() {
- return awsLambdaEndpoint;
- }
-
- public void setAwsLambdaEndpoint(String awsLambdaEndpoint) {
- this.awsLambdaEndpoint = awsLambdaEndpoint;
- }
-
public LambdaOperations getOperation() {
return operation;
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 09/10: CAMEL-12234 - Camel-AWS: Since we are using builders,
we need to remove the AWS endpoint options on the components that are using
them - AWS SQS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit adfdda36cd6d4736ee292f13514badd58b2dbe5b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 7 10:38:19 2018 +0100
CAMEL-12234 - Camel-AWS: Since we are using builders, we need to remove the AWS endpoint options on the components that are using them - AWS SQS
---
components/camel-aws/src/main/docs/aws-sqs-component.adoc | 5 ++---
.../apache/camel/component/aws/sqs/SqsConfiguration.java | 15 ---------------
.../org/apache/camel/component/aws/sqs/SqsEndpoint.java | 11 +++--------
.../component/aws/sqs/SqsComponentConfigurationTest.java | 6 +-----
.../aws/sqs/springboot/SqsComponentConfiguration.java | 15 ---------------
5 files changed, 6 insertions(+), 46 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-sqs-component.adoc b/components/camel-aws/src/main/docs/aws-sqs-component.adoc
index 43c2e35..e65bd08 100644
--- a/components/camel-aws/src/main/docs/aws-sqs-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-sqs-component.adoc
@@ -66,14 +66,13 @@ with the following path and query parameters:
| *queueNameOrArn* | *Required* Queue name or ARN | | String
|===
-==== Query Parameters (47 parameters):
+==== Query Parameters (46 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *amazonAWSHost* (common) | The hostname of the Amazon AWS cloud. | amazonaws.com | String
| *amazonSQSClient* (common) | To use the AmazonSQS as client | | AmazonSQS
-| *amazonSQSEndpoint* (common) | The region with which the AWS-SQS client wants to work with. Only works if Camel creates the AWS-SQS client i.e. if you explicitly set amazonSQSClient then this setting will have no effect. You would have to set it on the client you create directly | | String
| *headerFilterStrategy* (common) | To use a custom HeaderFilterStrategy to map headers to/from Camel. | | HeaderFilterStrategy
| *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id when you need to connect the queue with different account owner. | | String
| *region* (common) | Specify the queue region which could be used with queueOwnerAWSAccountId to build the service URL. | | String
@@ -248,4 +247,4 @@ consumers.
* link:endpoint.html[Endpoint]
* link:getting-started.html[Getting Started]
-* link:aws.html[AWS Component]
\ No newline at end of file
+* link:aws.html[AWS Component]
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 5817506..d052976 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
@@ -35,8 +35,6 @@ public class SqsConfiguration implements Cloneable {
private String secretKey;
@UriParam(defaultValue = "amazonaws.com")
private String amazonAWSHost = "amazonaws.com";
- @UriParam
- private String amazonSQSEndpoint;
@UriParam(secret = true)
private String queueOwnerAWSAccountId;
@UriParam
@@ -100,19 +98,6 @@ public class SqsConfiguration implements Cloneable {
return false;
}
- /**
- * The region with which the AWS-SQS client wants to work with.
- * Only works if Camel creates the AWS-SQS client, i.e., if you explicitly set amazonSQSClient,
- * then this setting will have no effect. You would have to set it on the client you create directly
- */
- public void setAmazonSQSEndpoint(String amazonSQSEndpoint) {
- this.amazonSQSEndpoint = amazonSQSEndpoint;
- }
-
- public String getAmazonSQSEndpoint() {
- return amazonSQSEndpoint;
- }
-
public String getAmazonAWSHost() {
return amazonAWSHost;
}
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 f1b2dc3..7a7281e 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
@@ -25,6 +25,7 @@ import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
+import com.amazonaws.regions.Regions;
import com.amazonaws.services.sqs.AmazonSQS;
import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
import com.amazonaws.services.sqs.model.CreateQueueRequest;
@@ -116,11 +117,6 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt
client = getConfiguration().getAmazonSQSClient() != null
? getConfiguration().getAmazonSQSClient() : getClient();
- // Override the endpoint location
- if (ObjectHelper.isNotEmpty(getConfiguration().getAmazonSQSEndpoint())) {
- client.setEndpoint(getConfiguration().getAmazonSQSEndpoint());
- }
-
// check the setting the headerFilterStrategy
if (headerFilterStrategy == null) {
headerFilterStrategy = new SqsHeaderFilterStrategy();
@@ -306,9 +302,8 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt
clientBuilder = AmazonSQSClientBuilder.standard().withClientConfiguration(clientConfiguration);
}
}
- if (ObjectHelper.isNotEmpty(configuration.getAmazonSQSEndpoint()) && ObjectHelper.isNotEmpty(configuration.getRegion())) {
- EndpointConfiguration endpointConfiguration = new EndpointConfiguration(configuration.getAmazonSQSEndpoint(), configuration.getRegion());
- clientBuilder = clientBuilder.withEndpointConfiguration(endpointConfiguration);
+ if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
+ clientBuilder = clientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
}
client = clientBuilder.build();
return client;
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
index dce261b..240a48b 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
@@ -41,7 +41,6 @@ public class SqsComponentConfigurationTest extends CamelTestSupport {
assertNull(endpoint.getConfiguration().getMessageAttributeNames());
assertNull(endpoint.getConfiguration().getDefaultVisibilityTimeout());
assertNull(endpoint.getConfiguration().getVisibilityTimeout());
- assertNull(endpoint.getConfiguration().getAmazonSQSEndpoint());
assertNull(endpoint.getConfiguration().getMaximumMessageSize());
assertNull(endpoint.getConfiguration().getMessageRetentionPeriod());
assertNull(endpoint.getConfiguration().getPolicy());
@@ -61,7 +60,6 @@ public class SqsComponentConfigurationTest extends CamelTestSupport {
assertNull(endpoint.getConfiguration().getMessageAttributeNames());
assertNull(endpoint.getConfiguration().getDefaultVisibilityTimeout());
assertNull(endpoint.getConfiguration().getVisibilityTimeout());
- assertNull(endpoint.getConfiguration().getAmazonSQSEndpoint());
assertNull(endpoint.getConfiguration().getMaximumMessageSize());
assertNull(endpoint.getConfiguration().getMessageRetentionPeriod());
assertNull(endpoint.getConfiguration().getPolicy());
@@ -115,7 +113,6 @@ public class SqsComponentConfigurationTest extends CamelTestSupport {
assertNull(endpoint.getConfiguration().getMessageAttributeNames());
assertNull(endpoint.getConfiguration().getDefaultVisibilityTimeout());
assertNull(endpoint.getConfiguration().getVisibilityTimeout());
- assertNull(endpoint.getConfiguration().getAmazonSQSEndpoint());
assertNull(endpoint.getConfiguration().getMaximumMessageSize());
assertNull(endpoint.getConfiguration().getMessageRetentionPeriod());
assertNull(endpoint.getConfiguration().getPolicy());
@@ -130,7 +127,7 @@ public class SqsComponentConfigurationTest extends CamelTestSupport {
((JndiRegistry) ((PropertyPlaceholderDelegateRegistry) context.getRegistry()).getRegistry()).bind("amazonSQSClient", mock);
SqsComponent component = new SqsComponent(context);
- SqsEndpoint endpoint = (SqsEndpoint) component.createEndpoint("aws-sqs://MyQueue?amazonSQSClient=#amazonSQSClient&amazonSQSEndpoint=sns.eu-west-1.amazonaws.com&accessKey=xxx"
+ SqsEndpoint endpoint = (SqsEndpoint) component.createEndpoint("aws-sqs://MyQueue?amazonSQSClient=#amazonSQSClient&accessKey=xxx"
+ "&secretKey=yyy&attributeNames=color,size"
+ "&messageAttributeNames=msgColor,msgSize&DefaultVisibilityTimeout=1000&visibilityTimeout=2000&maximumMessageSize=65536&messageRetentionPeriod=1209600&policy="
+ "%7B%22Version%22%3A%222008-10-17%22%2C%22Id%22%3A%22%2F195004372649%2FMyQueue%2FSQSDefaultPolicy%22%2C%22Statement%22%3A%5B%7B%22Sid%22%3A%22Queue1ReceiveMessage%22%2C%22"
@@ -147,7 +144,6 @@ public class SqsComponentConfigurationTest extends CamelTestSupport {
assertEquals("msgColor,msgSize", endpoint.getConfiguration().getMessageAttributeNames());
assertEquals(new Integer(1000), endpoint.getConfiguration().getDefaultVisibilityTimeout());
assertEquals(new Integer(2000), endpoint.getConfiguration().getVisibilityTimeout());
- assertEquals("sns.eu-west-1.amazonaws.com", endpoint.getConfiguration().getAmazonSQSEndpoint());
assertEquals(new Integer(65536), endpoint.getConfiguration().getMaximumMessageSize());
assertEquals(new Integer(1209600), endpoint.getConfiguration().getMessageRetentionPeriod());
assertEquals("{\"Version\":\"2008-10-17\",\"Id\":\"/195004372649/MyQueue/SQSDefaultPolicy\",\"Statement\":[{\"Sid\":\"Queue1ReceiveMessage\",\"Effect\":\"Allow\",\"Principal\":"
diff --git a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConfiguration.java
index 9d24428..1db47e5 100644
--- a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConfiguration.java
@@ -102,13 +102,6 @@ public class SqsComponentConfiguration
public static class SqsConfigurationNestedConfiguration {
public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.sqs.SqsConfiguration.class;
/**
- * The region with which the AWS-SQS client wants to work with. Only
- * works if Camel creates the AWS-SQS client, i.e., if you explicitly
- * set amazonSQSClient, then this setting will have no effect. You would
- * have to set it on the client you create directly
- */
- private String amazonSQSEndpoint;
- /**
* The hostname of the Amazon AWS cloud.
*/
private String amazonAWSHost = "amazonaws.com";
@@ -218,14 +211,6 @@ public class SqsComponentConfiguration
private String proxyHost;
private Integer proxyPort;
- public String getAmazonSQSEndpoint() {
- return amazonSQSEndpoint;
- }
-
- public void setAmazonSQSEndpoint(String amazonSQSEndpoint) {
- this.amazonSQSEndpoint = amazonSQSEndpoint;
- }
-
public String getAmazonAWSHost() {
return amazonAWSHost;
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.