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 2020/03/06 09:59:45 UTC
[camel] 10/14: CAMEL-14555 - Create an AWS-S3 component based on
SDK v2, regen
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 43eef921bf394f831e169cbbd899b7bc453541b8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Mar 6 09:37:15 2020 +0100
CAMEL-14555 - Create an AWS-S3 component based on SDK v2, regen
---
.../apache/camel/component/aws2/s3/aws2-s3.json | 6 ++---
.../src/main/docs/aws2-s3-component.adoc | 6 ++---
.../component/ComponentsBuilderFactory.java | 2 +-
.../dsl/Aws2S3ComponentBuilderFactory.java | 12 +++++-----
.../src/generated/resources/metadata.json | 2 +-
.../endpoint/dsl/AWS2S3EndpointBuilderFactory.java | 26 +++++++++++-----------
6 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/components/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json b/components/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json
index b3bcf95..8f85d87 100644
--- a/components/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json
+++ b/components/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json
@@ -5,7 +5,7 @@
"extendsScheme": "",
"syntax": "aws2-s3:\/\/bucketNameOrArn",
"title": "AWS2 S3 Storage Service",
- "description": "The aws-s3 component is used for storing and retrieving object from Amazon S3 Storage Service.",
+ "description": "The aws2-s3 component is used for storing and retrieving object from Amazon S3 Storage Service.",
"label": "cloud,file",
"deprecated": false,
"async": false,
@@ -27,7 +27,7 @@
"proxyHost": { "kind": "property", "displayName": "Proxy Host", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the SQS client" },
"proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "Specify a proxy port to be used inside the client definition." },
"proxyProtocol": { "kind": "property", "displayName": "Proxy Protocol", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the S3 client" },
- "region": { "kind": "property", "displayName": "Region", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "The region in which S3 client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST [...]
+ "region": { "kind": "property", "displayName": "Region", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "The region in which S3 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1 [...]
"useIAMCredentials": { "kind": "property", "displayName": "Use IAMCredentials", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be [...]
"encryptionMaterials": { "kind": "property", "displayName": "Encryption Materials", "group": "common (advanced)", "label": "common,advanced", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.s3.model.Encryption", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "The encryption materials to use in case of Symmetric\/Asymmetric clie [...]
"useEncryption": { "kind": "property", "displayName": "Use Encryption", "group": "common (advanced)", "label": "common,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "Define if encryption must be used or not" },
@@ -66,7 +66,7 @@
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the SQS client" },
"proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "Specify a proxy port to be used inside the client definition." },
"proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the S3 client" },
- "region": { "kind": "parameter", "displayName": "Region", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "The region in which S3 client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAS [...]
+ "region": { "kind": "parameter", "displayName": "Region", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "The region in which S3 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east- [...]
"useIAMCredentials": { "kind": "parameter", "displayName": "Use IAMCredentials", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be [...]
"encryptionMaterials": { "kind": "parameter", "displayName": "Encryption Materials", "group": "common (advanced)", "label": "common,advanced", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.s3.model.Encryption", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "The encryption materials to use in case of Symmetric\/Asymmetric cli [...]
"useEncryption": { "kind": "parameter", "displayName": "Use Encryption", "group": "common (advanced)", "label": "common,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "Define if encryption must be used or not" },
diff --git a/components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc b/components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc
index e7f3102..6856fc8 100644
--- a/components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc
+++ b/components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc
@@ -58,7 +58,7 @@ The AWS2 S3 Storage Service component supports 37 options, which are listed belo
| *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
| *proxyProtocol* (common) | To define a proxy protocol when instantiating the S3 client. The value can be one of: HTTP, HTTPS | HTTPS | Protocol
-| *region* (common) | The region in which S3 client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | | String
+| *region* (common) | The region in which S3 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String
| *useIAMCredentials* (common) | Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in. | false | boolean
| *encryptionMaterials* (common) | The encryption materials to use in case of Symmetric/Asymmetric client usage | | Encryption
| *useEncryption* (common) | Define if encryption must be used or not | false | boolean
@@ -132,7 +132,7 @@ with the following path and query parameters:
| *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
| *proxyProtocol* (common) | To define a proxy protocol when instantiating the S3 client. The value can be one of: HTTP, HTTPS | HTTPS | Protocol
-| *region* (common) | The region in which S3 client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | | String
+| *region* (common) | The region in which S3 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String
| *useIAMCredentials* (common) | Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in. | false | boolean
| *encryptionMaterials* (common) | The encryption materials to use in case of Symmetric/Asymmetric client usage | | Encryption
| *useEncryption* (common) | Define if encryption must be used or not | false | boolean
@@ -525,4 +525,4 @@ Maven users will need to add the following dependency to their pom.xml.
where `$\{camel-version\}` must be replaced by the actual version of Camel.
-include::camel-spring-boot::page$aws-s3-starter.adoc[]
\ No newline at end of file
+include::camel-spring-boot::page$aws-s3-starter.adoc[]
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 8c9516d..e7c8244 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -611,7 +611,7 @@ public interface ComponentsBuilderFactory {
}
/**
* AWS2 S3 Storage Service (camel-aws2-s3)
- * The aws-s3 component is used for storing and retrieving object from
+ * The aws2-s3 component is used for storing and retrieving object from
* Amazon S3 Storage Service.
*
* Category: cloud,file
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java
index ecfac61..406f7fa 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java
@@ -23,8 +23,8 @@ import org.apache.camel.builder.component.ComponentBuilder;
import org.apache.camel.component.aws2.s3.AWS2S3Component;
/**
- * The aws-s3 component is used for storing and retrieving object from Amazon S3
- * Storage Service.
+ * The aws2-s3 component is used for storing and retrieving object from Amazon
+ * S3 Storage Service.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@@ -33,7 +33,7 @@ public interface Aws2S3ComponentBuilderFactory {
/**
* AWS2 S3 Storage Service (camel-aws2-s3)
- * The aws-s3 component is used for storing and retrieving object from
+ * The aws2-s3 component is used for storing and retrieving object from
* Amazon S3 Storage Service.
*
* Category: cloud,file
@@ -151,9 +151,9 @@ public interface Aws2S3ComponentBuilderFactory {
}
/**
* The region in which S3 client needs to work. When using this
- * parameter, the configuration will expect the capitalized name of the
- * region (for example AP_EAST_1) You'll need to use the name
- * Regions.EU_WEST_1.name().
+ * parameter, the configuration will expect the lowercase name of the
+ * region (for example ap-east-1) You'll need to use the name
+ * Region.EU_WEST_1.id().
*
* The option is a: <code>java.lang.String</code> type.
*
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json
index bf3fc96..d55e077 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -627,7 +627,7 @@
"extendsScheme": "",
"syntax": "aws2-s3:\/\/bucketNameOrArn",
"title": "AWS2 S3 Storage Service",
- "description": "The aws-s3 component is used for storing and retrieving object from Amazon S3 Storage Service.",
+ "description": "The aws2-s3 component is used for storing and retrieving object from Amazon S3 Storage Service.",
"label": "cloud,file",
"deprecated": false,
"deprecationNote": "cloud,file",
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
index e5aae95..ef4c426 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
@@ -29,8 +29,8 @@ import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.PollingConsumerPollStrategy;
/**
- * The aws-s3 component is used for storing and retrieving object from Amazon S3
- * Storage Service.
+ * The aws2-s3 component is used for storing and retrieving object from Amazon
+ * S3 Storage Service.
*
* Generated by camel build tools - do NOT edit this file!
*/
@@ -200,9 +200,9 @@ public interface AWS2S3EndpointBuilderFactory {
}
/**
* The region in which S3 client needs to work. When using this
- * parameter, the configuration will expect the capitalized name of the
- * region (for example AP_EAST_1) You'll need to use the name
- * Regions.EU_WEST_1.name().
+ * parameter, the configuration will expect the lowercase name of the
+ * region (for example ap-east-1) You'll need to use the name
+ * Region.EU_WEST_1.id().
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -1416,9 +1416,9 @@ public interface AWS2S3EndpointBuilderFactory {
}
/**
* The region in which S3 client needs to work. When using this
- * parameter, the configuration will expect the capitalized name of the
- * region (for example AP_EAST_1) You'll need to use the name
- * Regions.EU_WEST_1.name().
+ * parameter, the configuration will expect the lowercase name of the
+ * region (for example ap-east-1) You'll need to use the name
+ * Region.EU_WEST_1.id().
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -2113,9 +2113,9 @@ public interface AWS2S3EndpointBuilderFactory {
}
/**
* The region in which S3 client needs to work. When using this
- * parameter, the configuration will expect the capitalized name of the
- * region (for example AP_EAST_1) You'll need to use the name
- * Regions.EU_WEST_1.name().
+ * parameter, the configuration will expect the lowercase name of the
+ * region (for example ap-east-1) You'll need to use the name
+ * Region.EU_WEST_1.id().
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -2453,7 +2453,7 @@ public interface AWS2S3EndpointBuilderFactory {
public interface AWS2S3Builders {
/**
* AWS2 S3 Storage Service (camel-aws2-s3)
- * The aws-s3 component is used for storing and retrieving object from
+ * The aws2-s3 component is used for storing and retrieving object from
* Amazon S3 Storage Service.
*
* Category: cloud,file
@@ -2471,7 +2471,7 @@ public interface AWS2S3EndpointBuilderFactory {
}
/**
* AWS2 S3 Storage Service (camel-aws2-s3)
- * The aws-s3 component is used for storing and retrieving object from
+ * The aws2-s3 component is used for storing and retrieving object from
* Amazon S3 Storage Service.
*
* Category: cloud,file