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 2023/04/14 10:28:34 UTC
[camel] branch main created (now fde82c63771)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
at fde82c63771 Let's deploy also 3.x and 3.20.x
This branch includes the following new commits:
new 410f413a18c Regen for commit 646b371c8b8cf6b5887e4c9d56ecda86905f60ec
new 6e96da923bc CAMEL-19266 - Camel-AWS2-S3: Add a forcePathStyle option to configuration
new 4cb0e62e6cd CAMEL-19266 - Camel-AWS2-S3: Add a forcePathStyle option to configuration
new 2ca1b32f734 CAMEL-19266 - Camel-AWS2-S3: Add a forcePathStyle option to configuration
new e9828d25fe0 CAMEL-19266 - Camel-AWS2-S3: Add a forcePathStyle option to configuration
new fde82c63771 Let's deploy also 3.x and 3.20.x
The 6 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.
[camel] 02/06: CAMEL-19266 - Camel-AWS2-S3: Add a forcePathStyle option to configuration
Posted by ac...@apache.org.
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 6e96da923bc6f0be5d868fb46147541c71cbeec3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Apr 14 10:42:53 2023 +0200
CAMEL-19266 - Camel-AWS2-S3: Add a forcePathStyle option to configuration
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../apache/camel/component/aws2/s3/AWS2S3Configuration.java | 12 ++++++++++++
.../aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java | 3 +++
.../s3/client/impl/AWS2S3ClientIAMProfileOptimizedImpl.java | 3 +++
.../aws2/s3/client/impl/AWS2S3ClientStandardImpl.java | 3 +++
4 files changed, 21 insertions(+)
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 e9454c574ed..06a8f0c7c43 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
@@ -52,6 +52,8 @@ public class AWS2S3Configuration implements Cloneable {
private boolean includeFolders = true;
@UriParam
private String region;
+ @UriParam
+ private boolean forcePathStyle;
@UriParam(label = "consumer", defaultValue = "true")
private boolean deleteAfterRead = true;
@UriParam(label = "consumer")
@@ -518,6 +520,16 @@ public class AWS2S3Configuration implements Cloneable {
this.customerAlgorithm = customerAlgorithm;
}
+ public boolean isForcePathStyle() {
+ return forcePathStyle;
+ }
+ /**
+ * Set whether the S3 client should use path-style URL instead of virtual-hosted-style
+ */
+ public void setForcePathStyle(boolean forcePathStyle) {
+ this.forcePathStyle = forcePathStyle;
+ }
+
/**
* Set whether the S3 client should expect to load credentials through a default credentials provider.
*/
diff --git a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java
index 338bb3b4a2e..72ea19fed75 100644
--- a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java
+++ b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java
@@ -73,6 +73,9 @@ public class AWS2S3ClientIAMOptimizedImpl implements AWS2CamelS3InternalClient {
if (configuration.isOverrideEndpoint()) {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
+ if (configuration.isForcePathStyle()) {
+ clientBuilder.forcePathStyle(true);
+ }
if (configuration.isTrustAllCertificates()) {
SdkHttpClient ahc = ApacheHttpClient.builder().buildWithDefaults(AttributeMap
.builder()
diff --git a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMProfileOptimizedImpl.java b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMProfileOptimizedImpl.java
index e2f74370518..77419f8650c 100644
--- a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMProfileOptimizedImpl.java
+++ b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMProfileOptimizedImpl.java
@@ -88,6 +88,9 @@ public class AWS2S3ClientIAMProfileOptimizedImpl implements AWS2CamelS3InternalC
if (configuration.isOverrideEndpoint()) {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
+ if (configuration.isForcePathStyle()) {
+ clientBuilder.forcePathStyle(true);
+ }
if (configuration.isTrustAllCertificates()) {
SdkHttpClient ahc = ApacheHttpClient.builder().buildWithDefaults(AttributeMap
.builder()
diff --git a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java
index 2cd7693f82a..5d0fffc6cd7 100644
--- a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java
+++ b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java
@@ -89,6 +89,9 @@ public class AWS2S3ClientStandardImpl implements AWS2CamelS3InternalClient {
if (configuration.isOverrideEndpoint()) {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
+ if (configuration.isForcePathStyle()) {
+ clientBuilder.forcePathStyle(true);
+ }
if (configuration.isTrustAllCertificates()) {
SdkHttpClient ahc = ApacheHttpClient.builder().buildWithDefaults(AttributeMap
.builder()
[camel] 03/06: CAMEL-19266 - Camel-AWS2-S3: Add a forcePathStyle option to configuration
Posted by ac...@apache.org.
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 4cb0e62e6cd4f705a0f486c1f7666c6a9c236817
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Apr 14 10:47:55 2023 +0200
CAMEL-19266 - Camel-AWS2-S3: Add a forcePathStyle option to configuration
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../apache/camel/component/aws2/s3/AWS2S3ComponentConfigurer.java | 6 ++++++
.../apache/camel/component/aws2/s3/AWS2S3EndpointConfigurer.java | 6 ++++++
.../apache/camel/component/aws2/s3/AWS2S3EndpointUriFactory.java | 3 ++-
.../resources/org/apache/camel/component/aws2/s3/aws2-s3.json | 2 ++
4 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/components/camel-aws/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3ComponentConfigurer.java b/components/camel-aws/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3ComponentConfigurer.java
index 90c7662081d..782376b3f32 100644
--- a/components/camel-aws/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3ComponentConfigurer.java
+++ b/components/camel-aws/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3ComponentConfigurer.java
@@ -70,6 +70,8 @@ public class AWS2S3ComponentConfigurer extends PropertyConfigurerSupport impleme
case "doneFileName": getOrCreateConfiguration(target).setDoneFileName(property(camelContext, java.lang.String.class, value)); return true;
case "filename":
case "fileName": getOrCreateConfiguration(target).setFileName(property(camelContext, java.lang.String.class, value)); return true;
+ case "forcepathstyle":
+ case "forcePathStyle": getOrCreateConfiguration(target).setForcePathStyle(property(camelContext, boolean.class, value)); return true;
case "ignorebody":
case "ignoreBody": getOrCreateConfiguration(target).setIgnoreBody(property(camelContext, boolean.class, value)); return true;
case "includebody":
@@ -182,6 +184,8 @@ public class AWS2S3ComponentConfigurer extends PropertyConfigurerSupport impleme
case "doneFileName": return java.lang.String.class;
case "filename":
case "fileName": return java.lang.String.class;
+ case "forcepathstyle":
+ case "forcePathStyle": return boolean.class;
case "ignorebody":
case "ignoreBody": return boolean.class;
case "includebody":
@@ -290,6 +294,8 @@ public class AWS2S3ComponentConfigurer extends PropertyConfigurerSupport impleme
case "doneFileName": return getOrCreateConfiguration(target).getDoneFileName();
case "filename":
case "fileName": return getOrCreateConfiguration(target).getFileName();
+ case "forcepathstyle":
+ case "forcePathStyle": return getOrCreateConfiguration(target).isForcePathStyle();
case "ignorebody":
case "ignoreBody": return getOrCreateConfiguration(target).isIgnoreBody();
case "includebody":
diff --git a/components/camel-aws/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointConfigurer.java b/components/camel-aws/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointConfigurer.java
index 1c5d426cc01..51a9a73a4a3 100644
--- a/components/camel-aws/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointConfigurer.java
+++ b/components/camel-aws/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointConfigurer.java
@@ -71,6 +71,8 @@ public class AWS2S3EndpointConfigurer extends PropertyConfigurerSupport implemen
case "exchangePattern": target.setExchangePattern(property(camelContext, org.apache.camel.ExchangePattern.class, value)); return true;
case "filename":
case "fileName": target.getConfiguration().setFileName(property(camelContext, java.lang.String.class, value)); return true;
+ case "forcepathstyle":
+ case "forcePathStyle": target.getConfiguration().setForcePathStyle(property(camelContext, boolean.class, value)); return true;
case "greedy": target.setGreedy(property(camelContext, boolean.class, value)); return true;
case "ignorebody":
case "ignoreBody": target.getConfiguration().setIgnoreBody(property(camelContext, boolean.class, value)); return true;
@@ -217,6 +219,8 @@ public class AWS2S3EndpointConfigurer extends PropertyConfigurerSupport implemen
case "exchangePattern": return org.apache.camel.ExchangePattern.class;
case "filename":
case "fileName": return java.lang.String.class;
+ case "forcepathstyle":
+ case "forcePathStyle": return boolean.class;
case "greedy": return boolean.class;
case "ignorebody":
case "ignoreBody": return boolean.class;
@@ -359,6 +363,8 @@ public class AWS2S3EndpointConfigurer extends PropertyConfigurerSupport implemen
case "exchangePattern": return target.getExchangePattern();
case "filename":
case "fileName": return target.getConfiguration().getFileName();
+ case "forcepathstyle":
+ case "forcePathStyle": return target.getConfiguration().isForcePathStyle();
case "greedy": return target.isGreedy();
case "ignorebody":
case "ignoreBody": return target.getConfiguration().isIgnoreBody();
diff --git a/components/camel-aws/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriFactory.java b/components/camel-aws/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriFactory.java
index 0af4defff2b..8a9340cbbd4 100644
--- a/components/camel-aws/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriFactory.java
+++ b/components/camel-aws/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriFactory.java
@@ -21,7 +21,7 @@ public class AWS2S3EndpointUriFactory extends org.apache.camel.support.component
private static final Set<String> SECRET_PROPERTY_NAMES;
private static final Set<String> MULTI_VALUE_PREFIXES;
static {
- Set<String> props = new HashSet<>(72);
+ Set<String> props = new HashSet<>(73);
props.add("accessKey");
props.add("amazonS3Client");
props.add("amazonS3Presigner");
@@ -49,6 +49,7 @@ public class AWS2S3EndpointUriFactory extends org.apache.camel.support.component
props.add("exceptionHandler");
props.add("exchangePattern");
props.add("fileName");
+ props.add("forcePathStyle");
props.add("greedy");
props.add("ignoreBody");
props.add("includeBody");
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 60835d54f56..27e3213f4a7 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
@@ -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." },
[camel] 04/06: CAMEL-19266 - Camel-AWS2-S3: Add a forcePathStyle option to configuration
Posted by ac...@apache.org.
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 <an...@gmail.com>
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 <an...@gmail.com>
---
.../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.
[camel] 01/06: Regen for commit 646b371c8b8cf6b5887e4c9d56ecda86905f60ec
Posted by ac...@apache.org.
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 410f413a18c85c9f3a87e103c3e580a5a5846951
Author: davsclaus <da...@users.noreply.github.com>
AuthorDate: Fri Apr 14 09:26:30 2023 +0000
Regen for commit 646b371c8b8cf6b5887e4c9d56ecda86905f60ec
Signed-off-by: GitHub <no...@github.com>
---
.../src/main/java/org/apache/camel/support/MessageHelper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
index e903dbdb25a..a66cf555dd6 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
@@ -877,7 +877,8 @@ public final class MessageHelper {
Message message, boolean includeExchangeProperties, boolean includeBody, int indent,
boolean allowCachedStreams, boolean allowStreams, boolean allowFiles, int maxChars, boolean pretty) {
- JsonObject jo = dumpAsJSonObject(message, includeExchangeProperties, includeBody, allowCachedStreams, allowStreams, allowFiles, maxChars);
+ JsonObject jo = dumpAsJSonObject(message, includeExchangeProperties, includeBody, allowCachedStreams, allowStreams,
+ allowFiles, maxChars);
String answer = jo.toJson();
if (pretty) {
if (indent > 0) {
@@ -1072,7 +1073,7 @@ public final class MessageHelper {
/**
* Dumps the exception as a generic JSon object.
*
- * @return the JSon object
+ * @return the JSon object
*/
public static JsonObject dumpExceptionAsJSonObject(Throwable exception) {
JsonObject root = new JsonObject();
[camel] 06/06: Let's deploy also 3.x and 3.20.x
Posted by ac...@apache.org.
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 fde82c6377123de4a291c351576952f4f52dc975
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Apr 14 12:00:37 2023 +0200
Let's deploy also 3.x and 3.20.x
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
Jenkinsfile.deploy | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 7bcba968d10..18ca2c4e456 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -62,6 +62,8 @@ pipeline {
when {
anyOf {
branch 'main'
+ branch 'camel-3.x'
+ branch 'camel-3.20.x'
branch 'camel-3.18.x'
branch 'camel-3.14.x'
}
[camel] 05/06: CAMEL-19266 - Camel-AWS2-S3: Add a forcePathStyle option to configuration
Posted by ac...@apache.org.
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 e9828d25fe0b3dbb125ea1c042d7030c212a6543
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Apr 14 10:52:10 2023 +0200
CAMEL-19266 - Camel-AWS2-S3: Add a forcePathStyle option to configuration
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java | 1 +
1 file changed, 1 insertion(+)
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 06a8f0c7c43..8467947ec36 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
@@ -523,6 +523,7 @@ public class AWS2S3Configuration implements Cloneable {
public boolean isForcePathStyle() {
return forcePathStyle;
}
+
/**
* Set whether the S3 client should use path-style URL instead of virtual-hosted-style
*/