This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch aws-region
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6fa4b2d0781cf748e95b638e174f4a6baeba8257
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Oct 23 20:17:20 2023 +0200
CAMEL-20025: camel-aws - Add enum for region option. WIP
---
.../org/apache/camel/component/aws2/s3/aws2-s3.json | 4 ++--
.../apache/camel/component/aws2/s3/AWS2S3Configuration.java | 13 +++++++------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json
b/components/camel-aws/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json
index 05398c8d8d7..4ef8ecb585c 100644
---
a/components/camel-aws/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json
+++
b/components/camel-aws/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json
@@ -30,7 +30,7 @@
"pojoRequest": { "index": 5, "kind": "property", "displayName": "Pojo
Request", "group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If we want to use a POJO request as body or
not" },
"policy": { "index": 6, "kind": "property", "displayName": "Policy",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "The policy for this queue to set in the
com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method." },
"prefix": { "index": 7, "kind": "property", "displayName": "Prefix",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "The prefix which is used in the
com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we
are interested in." },
- "region": { "index": 8, "kind": "property", "displayName": "Region",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
t [...]
+ "region": { "index": 8, "kind": "property", "displayName": "Region",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "ap-south-2", "ap-south-1",
"eu-south-1", "eu-south-2", "us-gov-east-1", "me-central-1", "il-central-1",
"ca-central-1", "eu-central-1", "us-iso-west-1", "eu-central-2", "us-west-1",
"us-west-2", "af-south-1", "eu-north-1", "eu-west-3", "eu-west-2", "eu-west-1",
"ap-northeast-3", "ap-northeast-2", "ap-north [...]
"uriEndpointOverride": { "index": 9, "kind": "property", "displayName":
"Uri Endpoint Override", "group": "common", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoin [...]
"customerAlgorithm": { "index": 10, "kind": "property", "displayName":
"Customer Algorithm", "group": "common (advanced)", "label": "common,advanced",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Define the customer algorithm to use in case
CustomerKey is enabled" },
"customerKeyId": { "index": 11, "kind": "property", "displayName":
"Customer Key Id", "group": "common (advanced)", "label": "common,advanced",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Define the id of Customer key to use in case
CustomerKey is enabled" },
@@ -121,7 +121,7 @@
"pojoRequest": { "index": 5, "kind": "parameter", "displayName": "Pojo
Request", "group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If we want to use a POJO request as body or
not" },
"policy": { "index": 6, "kind": "parameter", "displayName": "Policy",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "The policy for this queue to set in the
com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method." },
"prefix": { "index": 7, "kind": "parameter", "displayName": "Prefix",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "The prefix which is used in the
com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we
are interested [...]
- "region": { "index": 8, "kind": "parameter", "displayName": "Region",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
[...]
+ "region": { "index": 8, "kind": "parameter", "displayName": "Region",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "ap-south-2", "ap-south-1",
"eu-south-1", "eu-south-2", "us-gov-east-1", "me-central-1", "il-central-1",
"ca-central-1", "eu-central-1", "us-iso-west-1", "eu-central-2", "us-west-1",
"us-west-2", "af-south-1", "eu-north-1", "eu-west-3", "eu-west-2", "eu-west-1",
"ap-northeast-3", "ap-northeast-2", "ap-nort [...]
"uriEndpointOverride": { "index": 9, "kind": "parameter", "displayName":
"Uri Endpoint Override", "group": "common", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoi [...]
"customerAlgorithm": { "index": 10, "kind": "parameter", "displayName":
"Customer Algorithm", "group": "common (advanced)", "label": "common,advanced",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Define the customer algorithm to use in case
CustomerKey is enabled" },
"customerKeyId": { "index": 11, "kind": "parameter", "displayName":
"Customer Key Id", "group": "common (advanced)", "label": "common,advanced",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Define the id of Customer key to use in case
CustomerKey is enabled" },
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
index 1a9a18bcc6f..0cf7d6b81e4 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
@@ -50,7 +50,7 @@ public class AWS2S3Configuration implements Cloneable {
private String doneFileName;
@UriParam(label = "consumer", defaultValue = "true")
private boolean includeFolders = true;
- @UriParam
+ @UriParam(enums =
"ap-south-2,ap-south-1,eu-south-1,eu-south-2,us-gov-east-1,me-central-1,il-central-1,ca-central-1,eu-central-1,us-iso-west-1,eu-central-2,us-west-1,us-west-2,af-south-1,eu-north-1,eu-west-3,eu-west-2,eu-west-1,ap-northeast-3,ap-northeast-2,ap-northeast-1,me-south-1,sa-east-1,ap-east-1,cn-north-1,us-gov-west-1,ap-southeast-1,ap-southeast-2,us-iso-east-1,ap-southeast-3,ap-southeast-4,us-east-1,us-east-2,cn-northwest-1,us-isob-east-1,aws-global,aws-cn-global,aws-us-gov
[...]
private String region;
@UriParam
private boolean forcePathStyle;
@@ -144,8 +144,8 @@ public class AWS2S3Configuration implements Cloneable {
/**
* Setup the partSize which is used in multi-part upload, the default size
is 25M.
*
- * Camel will only do multi-part uploads for files that are larger than
the part-size thresholds.
- * Files that are smaller will be uploaded in a single operation.
+ * Camel will only do multi-part uploads for files that are larger than
the part-size thresholds. Files that are
+ * smaller will be uploaded in a single operation.
*/
public void setPartSize(long partSize) {
this.partSize = partSize;
@@ -156,10 +156,11 @@ public class AWS2S3Configuration implements Cloneable {
}
/**
- * If it is true, camel will upload the file with multi-part format, the
part size is decided by the partSize option.
+ * If it is true, camel will upload the file with multi-part format, the
part size is decided by the partSize
+ * option.
*
- * Camel will only do multi-part uploads for files that are larger than
the part-size thresholds.
- * Files that are smaller will be uploaded in a single operation.
+ * Camel will only do multi-part uploads for files that are larger than
the part-size thresholds. Files that are
+ * smaller will be uploaded in a single operation.
*/
public void setMultiPartUpload(boolean multiPartUpload) {
this.multiPartUpload = multiPartUpload;
