This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2ca1b32f7345e9b2e5aafc187e0f4d0159fcd9b8 Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Apr 14 10:51:38 2023 +0200 CAMEL-19266 - Camel-AWS2-S3: Add a forcePathStyle option to configuration Signed-off-by: Andrea Cosentino <[email protected]> --- .../apache/camel/catalog/components/aws2-s3.json | 2 + .../endpoint/dsl/AWS2S3EndpointBuilderFactory.java | 103 +++++++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-s3.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-s3.json index 60835d54f56..27e3213f4a7 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-s3.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-s3.json @@ -27,6 +27,7 @@ "autoCreateBucket": { "kind": "property", "displayName": "Auto Create Bucket", "group": "common", "label": "common", "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": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfte [...] "configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "deprecated": false, "autowired": false, "secret": false, "description": "The component configuration" }, "delimiter": { "kind": "property", "displayName": "Delimiter", "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 delimiter which is used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we are interested in." }, + "forcePathStyle": { "kind": "property", "displayName": "Force Path Style", "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": "Set whether the S3 client should use path-style URL instead of virtual-hosted-style" }, "overrideEndpoint": { "kind": "property", "displayName": "Override Endpoint", "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": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpoin [...] "pojoRequest": { "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": { "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." }, @@ -114,6 +115,7 @@ "amazonS3Presigner": { "kind": "parameter", "displayName": "Amazon S3 Presigner", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.s3.presigner.S3Presigner", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "An S3 Presigner for Request, used mainly in create [...] "autoCreateBucket": { "kind": "parameter", "displayName": "Auto Create Bucket", "group": "common", "label": "common", "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": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAft [...] "delimiter": { "kind": "parameter", "displayName": "Delimiter", "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 delimiter which is used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we are interested in." }, + "forcePathStyle": { "kind": "parameter", "displayName": "Force Path Style", "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": "Set whether the S3 client should use path-style URL instead of virtual-hosted-style" }, "overrideEndpoint": { "kind": "parameter", "displayName": "Override Endpoint", "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": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpoi [...] "pojoRequest": { "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": { "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." }, diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java index 97d591a41e0..6b52eb6d688 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java @@ -166,6 +166,41 @@ public interface AWS2S3EndpointBuilderFactory { doSetProperty("delimiter", delimiter); return this; } + /** + * Set whether the S3 client should use path-style URL instead of + * virtual-hosted-style. + * + * The option is a: <code>boolean</code> type. + * + * Default: false + * Group: common + * + * @param forcePathStyle the value to set + * @return the dsl builder + */ + default AWS2S3EndpointConsumerBuilder forcePathStyle( + boolean forcePathStyle) { + doSetProperty("forcePathStyle", forcePathStyle); + return this; + } + /** + * Set whether the S3 client should use path-style URL instead of + * virtual-hosted-style. + * + * The option will be converted to a <code>boolean</code> + * type. + * + * Default: false + * Group: common + * + * @param forcePathStyle the value to set + * @return the dsl builder + */ + default AWS2S3EndpointConsumerBuilder forcePathStyle( + String forcePathStyle) { + doSetProperty("forcePathStyle", forcePathStyle); + return this; + } /** * Set the need for overidding the endpoint. This option needs to be * used in combination with uriEndpointOverride option. @@ -1770,6 +1805,41 @@ public interface AWS2S3EndpointBuilderFactory { doSetProperty("delimiter", delimiter); return this; } + /** + * Set whether the S3 client should use path-style URL instead of + * virtual-hosted-style. + * + * The option is a: <code>boolean</code> type. + * + * Default: false + * Group: common + * + * @param forcePathStyle the value to set + * @return the dsl builder + */ + default AWS2S3EndpointProducerBuilder forcePathStyle( + boolean forcePathStyle) { + doSetProperty("forcePathStyle", forcePathStyle); + return this; + } + /** + * Set whether the S3 client should use path-style URL instead of + * virtual-hosted-style. + * + * The option will be converted to a <code>boolean</code> + * type. + * + * Default: false + * Group: common + * + * @param forcePathStyle the value to set + * @return the dsl builder + */ + default AWS2S3EndpointProducerBuilder forcePathStyle( + String forcePathStyle) { + doSetProperty("forcePathStyle", forcePathStyle); + return this; + } /** * Set the need for overidding the endpoint. This option needs to be * used in combination with uriEndpointOverride option. @@ -2829,6 +2899,39 @@ public interface AWS2S3EndpointBuilderFactory { doSetProperty("delimiter", delimiter); return this; } + /** + * Set whether the S3 client should use path-style URL instead of + * virtual-hosted-style. + * + * The option is a: <code>boolean</code> type. + * + * Default: false + * Group: common + * + * @param forcePathStyle the value to set + * @return the dsl builder + */ + default AWS2S3EndpointBuilder forcePathStyle(boolean forcePathStyle) { + doSetProperty("forcePathStyle", forcePathStyle); + return this; + } + /** + * Set whether the S3 client should use path-style URL instead of + * virtual-hosted-style. + * + * The option will be converted to a <code>boolean</code> + * type. + * + * Default: false + * Group: common + * + * @param forcePathStyle the value to set + * @return the dsl builder + */ + default AWS2S3EndpointBuilder forcePathStyle(String forcePathStyle) { + doSetProperty("forcePathStyle", forcePathStyle); + return this; + } /** * Set the need for overidding the endpoint. This option needs to be * used in combination with uriEndpointOverride option.
