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 f137ea6487de5152700ac14ee66f30de42643c24 Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Oct 12 18:14:36 2020 +0200 CAMEL-15647 - Camel-AWS2-Kinesis-*: Added a CborEnabled option explicitly, kinesis-firehose --- .../aws2/firehose/KinesisFirehose2Configuration.java | 11 +++++++++++ .../component/aws2/firehose/KinesisFirehose2Endpoint.java | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java index 2317d12..292a3b2 100644 --- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java +++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java @@ -54,6 +54,9 @@ public class KinesisFirehose2Configuration implements Cloneable { description = "Setting the autoDiscoverClient mechanism, if true, the component will " + " look for a client instance in the registry automatically otherwise it will skip that checking") private boolean autoDiscoverClient = true; + @UriParam(label = "common", defaultValue = "true", + description = "This option will set the CBOR_ENABLED property during the execution") + private boolean cborEnabled = true; public void setAmazonKinesisFirehoseClient(FirehoseClient client) { this.amazonKinesisFirehoseClient = client; @@ -142,6 +145,14 @@ public class KinesisFirehose2Configuration implements Cloneable { public void setAutoDiscoverClient(boolean autoDiscoverClient) { this.autoDiscoverClient = autoDiscoverClient; } + + public boolean isCborEnabled() { + return cborEnabled; + } + + public void setCborEnabled(boolean cborEnabled) { + this.cborEnabled = cborEnabled; + } // ************************************************* // diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java index 757542a..96a8a0a 100644 --- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java +++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java @@ -16,6 +16,8 @@ */ package org.apache.camel.component.aws2.firehose; +import static software.amazon.awssdk.core.SdkSystemSetting.CBOR_ENABLED; + import java.net.URI; import org.apache.camel.Category; @@ -70,6 +72,9 @@ public class KinesisFirehose2Endpoint extends DefaultEndpoint { @Override protected void doStart() throws Exception { super.doStart(); + if (!configuration.isCborEnabled()) { + System.setProperty(CBOR_ENABLED.property(), "false"); + } kinesisFirehoseClient = configuration.getAmazonKinesisFirehoseClient() != null ? configuration.getAmazonKinesisFirehoseClient() : createKinesisFirehoseClient(); @@ -82,6 +87,9 @@ public class KinesisFirehose2Endpoint extends DefaultEndpoint { kinesisFirehoseClient.close(); } } + if (!configuration.isCborEnabled()) { + System.clearProperty(CBOR_ENABLED.property()); + } super.doStop(); }
