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 0aaebd632195429d7622ddec52759686db3331d9 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Fri Feb 19 19:10:09 2021 +0100 CAMEL-16115 - Remove Camel-AWS-* components - AWS-MSK --- .../org/apache/camel/catalog/components.properties | 1 - .../apache/camel/catalog/components/aws-msk.json | 52 ------ .../org/apache/camel/catalog/docs.properties | 1 - .../camel/catalog/docs/aws-msk-component.adoc | 180 -------------------- .../camel/catalog/docs/recipientList-eip.adoc | 14 +- .../component/ComponentsBuilderFactory.java | 2 +- .../src/generated/resources/metadata.json | 23 --- .../builder/endpoint/EndpointBuilderFactory.java | 1 - .../camel/builder/endpoint/EndpointBuilders.java | 1 - .../builder/endpoint/StaticEndpointBuilders.java | 2 +- docs/components/modules/ROOT/nav.adoc | 1 - .../modules/ROOT/pages/aws-msk-component.adoc | 182 --------------------- 12 files changed, 8 insertions(+), 452 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties index b79f8aaa..815c7cc 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties @@ -30,7 +30,6 @@ aws-kinesis-firehose aws-kms aws-lambda aws-mq -aws-msk aws-s3 aws-swf aws2-athena diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-msk.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-msk.json deleted file mode 100644 index 74841e4..0000000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-msk.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "component": { - "kind": "component", - "name": "aws-msk", - "title": "AWS Managed Streaming for Apache Kafka (MSK)", - "description": "Manage AWS MSK instances.", - "deprecated": true, - "deprecatedSince": "3.8.0", - "firstVersion": "3.0.0", - "label": "cloud,messaging", - "javaType": "org.apache.camel.component.aws.msk.MSKComponent", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-aws-msk", - "version": "3.9.0-SNAPSHOT", - "scheme": "aws-msk", - "extendsScheme": "", - "syntax": "aws-msk:label", - "async": false, - "api": false, - "consumerOnly": false, - "producerOnly": true, - "lenientProperties": false - }, - "componentProperties": { - "autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instan [...] - "accessKey": { "kind": "property", "displayName": "Access Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key" }, - "configuration": { "kind": "property", "displayName": "Configuration", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws.msk.MSKConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "The component configuration" }, - "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...] - "mskClient": { "kind": "property", "displayName": "Msk Client", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.amazonaws.services.kafka.AWSKafka", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "To use a existing configured AWS MSK as client" }, - "operation": { "kind": "property", "displayName": "Operation", "group": "producer", "label": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.aws.msk.MSKOperations", "enum": [ "listClusters", "createCluster", "deleteCluster", "describeCluster" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "desc [...] - "proxyHost": { "kind": "property", "displayName": "Proxy Host", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the MSK client" }, - "proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the MSK client" }, - "proxyProtocol": { "kind": "property", "displayName": "Proxy Protocol", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.amazonaws.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the MSK client" }, - "region": { "kind": "property", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "The region in which MSK client needs to work. When using this parameter, the configuration will expect the capitalized name of the region [...] - "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }, - "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...] - }, - "properties": { - "label": { "kind": "path", "displayName": "Label", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "Logical name" }, - "autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client insta [...] - "accessKey": { "kind": "parameter", "displayName": "Access Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key" }, - "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...] - "mskClient": { "kind": "parameter", "displayName": "Msk Client", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.amazonaws.services.kafka.AWSKafka", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "To use a existing configured AWS MSK as client" }, - "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.aws.msk.MSKOperations", "enum": [ "listClusters", "createCluster", "deleteCluster", "describeCluster" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "des [...] - "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the MSK client" }, - "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the MSK client" }, - "proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "com.amazonaws.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the MSK client" }, - "region": { "kind": "parameter", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "The region in which MSK client needs to work. When using this parameter, the configuration will expect the capitalized name of the region [...] - "secretKey": { "kind": "parameter", "displayName": "Secret Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.msk.MSKConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" } - } -} diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties index 4435e07..5c37d1f 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs.properties @@ -34,7 +34,6 @@ aws-kinesis-firehose-component aws-kms-component aws-lambda-component aws-mq-component -aws-msk-component aws-s3-component aws-summary aws-swf-component diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws-msk-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws-msk-component.adoc deleted file mode 100644 index ae94479..0000000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws-msk-component.adoc +++ /dev/null @@ -1,180 +0,0 @@ -[[aws-msk-component]] -= AWS Managed Streaming for Apache Kafka (MSK) Component (deprecated) -:docTitle: AWS Managed Streaming for Apache Kafka (MSK) -:artifactId: camel-aws-msk -:description: Manage AWS MSK instances. -:since: 3.0 -:supportLevel: Stable-deprecated -:deprecated: *deprecated* -:component-header: Only producer is supported -include::{cq-version}@camel-quarkus:ROOT:partial$reference/components/aws-msk.adoc[opts=optional] -//Manually maintained attributes -:group: AWS - -*Since Camel {since}* - -*{component-header}* - -The AWS MSK component supports create, run, start, stop and terminate -https://aws.amazon.com/msk/[AWS MSK] instances. - -Prerequisites - -You must have a valid Amazon Web Services developer account, and be -signed up to use Amazon MSK. More information is available at -https://aws.amazon.com/msk/[Amazon MSK]. - -== URI Format - -[source,java] -------------------------- -aws-msk://label[?options] -------------------------- - -You can append query options to the URI in the following format, -?options=value&option2=value&... - -== URI Options - - -// component options: START -The AWS Managed Streaming for Apache Kafka (MSK) component supports 12 options, which are listed below. - - - -[width="100%",cols="2,5,^1,2",options="header"] -|=== -| Name | Description | Default | Type -| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | boolean -| *accessKey* (producer) | Amazon AWS Access Key | | String -| *configuration* (producer) | The component configuration | | MSKConfiguration -| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] -| *mskClient* (producer) | To use a existing configured AWS MSK as client | | AWSKafka -| *operation* (producer) | *Required* The operation to perform. There are 4 enums and the value can be one of: listClusters, createCluster, deleteCluster, describeCluster | | MSKOperations -| *proxyHost* (producer) | To define a proxy host when instantiating the MSK client | | String -| *proxyPort* (producer) | To define a proxy port when instantiating the MSK client | | Integer -| *proxyProtocol* (producer) | To define a proxy protocol when instantiating the MSK client. There are 2 enums and the value can be one of: HTTP, HTTPS | HTTPS | Protocol -| *region* (producer) | The region in which MSK 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 -| *secretKey* (producer) | Amazon AWS Secret Key | | String -| *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean -|=== -// component options: END - - - - -// endpoint options: START -The AWS Managed Streaming for Apache Kafka (MSK) endpoint is configured using URI syntax: - ----- -aws-msk:label ----- - -with the following path and query parameters: - -=== Path Parameters (1 parameters): - - -[width="100%",cols="2,5,^1,2",options="header"] -|=== -| Name | Description | Default | Type -| *label* | *Required* Logical name | | String -|=== - - -=== Query Parameters (10 parameters): - - -[width="100%",cols="2,5,^1,2",options="header"] -|=== -| Name | Description | Default | Type -| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | boolean -| *accessKey* (producer) | Amazon AWS Access Key | | String -| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] -| *mskClient* (producer) | To use a existing configured AWS MSK as client | | AWSKafka -| *operation* (producer) | *Required* The operation to perform. There are 4 enums and the value can be one of: listClusters, createCluster, deleteCluster, describeCluster | | MSKOperations -| *proxyHost* (producer) | To define a proxy host when instantiating the MSK client | | String -| *proxyPort* (producer) | To define a proxy port when instantiating the MSK client | | Integer -| *proxyProtocol* (producer) | To define a proxy protocol when instantiating the MSK client. There are 2 enums and the value can be one of: HTTP, HTTPS | HTTPS | Protocol -| *region* (producer) | The region in which MSK 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 -| *secretKey* (producer) | Amazon AWS Secret Key | | String -|=== -// endpoint options: END - - - - - -Required MSK component options - -You have to provide the amazonMskClient in the -Registry or your accessKey and secretKey to access -the https://aws.amazon.com/msk/[Amazon MSK] service. - -== Usage - -=== Message headers evaluated by the MSK producer - -[width="100%",cols="10%,10%,80%",options="header",] -|======================================================================= -|Header |Type |Description - -|`CamelAwsMSKOperation` |`String` |The operation to perform - -|`CamelAwsMSKClusterFilter` |`String` |The cluster name filter for list operation - -|`CamelAwsMSKClusterName` |`String` |The cluster name for list and create operation - -|`CamelAwsMSKClusterArn` |`String` |The cluster arn for delete operation - -|`CamelAwsMSKClusterKafkaVersion` |`String` | The Kafka for the cluster during create operation - -|`CamelAwsMSKBrokerNodesNumber` |`Integer`| The number of nodes for the cluster during create operation - -|`CamelAwsMSKBrokerNodesGroupInfo` |`com.amazonaws.services.kafka.model.BrokerNodeGroupInfo`| The Broker nodes group info to provide during the create operation -|======================================================================= - -=== MSK Producer operations - -Camel-AWS MSK component provides the following operation on the producer side: - -- listClusters -- createCluster -- deleteCluster -- describeCluster - -== Producer Examples - -- listBrokers: this operation will list the available MSK Brokers in AWS - -[source,java] --------------------------------------------------------------------------------- -from("direct:listClusters") - .to("aws-msk://test?mskClient=#amazonMskClient&operation=listClusters") --------------------------------------------------------------------------------- - -== Automatic detection of AWSKafka client in registry - -The component is capable of detecting the presence of an AWSKafka bean into the registry. -If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. -This may be really useful for smarter configuration of the endpoint. - -Dependencies - -Maven users will need to add the following dependency to their pom.xml. - -*pom.xml* - -[source,xml] ---------------------------------------- -<dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-aws-msk</artifactId> - <version>${camel-version}</version> -</dependency> ---------------------------------------- - -where `$\{camel-version}` must be replaced by the actual version of Camel. - - -include::camel-spring-boot::page$aws-msk-starter.adoc[] diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/recipientList-eip.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/recipientList-eip.adoc index a74a469..c5cd4ed 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/recipientList-eip.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/recipientList-eip.adoc @@ -327,22 +327,20 @@ from("direct:c").to("mock:C").setBody(constant("C")); ---- [NOTE] -=== -*Timeout in other EIPs* - +.Timeout in other EIPs +==== This timeout feature is also supported by Splitter and both multicast and recipientList. -=== +==== By default if a timeout occurs the `AggregationStrategy` is not invoked. However you can implement the `timeout` method: This allows you to deal with the timeout in the `AggregationStrategy` if you really need to. [NOTE] -=== -*Timeout is total* - +.Timeout is total +==== The timeout is total, which means that after X time, Camel will aggregate the messages which have completed within the timeframe. The remainders will be cancelled. Camel will also only invoke the `timeout` method in the `TimeoutAwareAggregationStrategy` once, for the first index which caused the timeout. -=== +==== == Using onPrepare to execute custom logic when preparing messages See details at the Multicast EIP 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 552bd6d..4cf164c 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 @@ -4862,4 +4862,4 @@ public interface ComponentsBuilderFactory { static org.apache.camel.builder.component.dsl.ZookeeperMasterComponentBuilderFactory.ZookeeperMasterComponentBuilder zookeeperMaster() { return org.apache.camel.builder.component.dsl.ZookeeperMasterComponentBuilderFactory.zookeeperMaster(); } -} +} \ No newline at end of file diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json index 06ee123..cc3fe7b 100644 --- a/core/camel-componentdsl/src/generated/resources/metadata.json +++ b/core/camel-componentdsl/src/generated/resources/metadata.json @@ -1182,29 +1182,6 @@ "producerOnly": true, "lenientProperties": false }, - "AwsMskComponentBuilderFactory": { - "kind": "component", - "name": "aws-msk", - "title": "AWS Managed Streaming for Apache Kafka (MSK)", - "description": "Manage AWS MSK instances.", - "deprecated": true, - "deprecatedSince": "3.8.0", - "firstVersion": "3.0.0", - "label": "cloud,messaging", - "javaType": "org.apache.camel.component.aws.msk.MSKComponent", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-aws-msk", - "version": "3.9.0-SNAPSHOT", - "scheme": "aws-msk", - "extendsScheme": "", - "syntax": "aws-msk:label", - "async": false, - "api": false, - "consumerOnly": false, - "producerOnly": true, - "lenientProperties": false - }, "AwsS3ComponentBuilderFactory": { "kind": "component", "name": "aws-s3", diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java index 57c724e..d323c94 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java @@ -238,7 +238,6 @@ public interface EndpointBuilderFactory org.apache.camel.builder.endpoint.dsl.MQ2EndpointBuilderFactory.MQ2Builders, org.apache.camel.builder.endpoint.dsl.MQEndpointBuilderFactory.MQBuilders, org.apache.camel.builder.endpoint.dsl.MSK2EndpointBuilderFactory.MSK2Builders, - org.apache.camel.builder.endpoint.dsl.MSKEndpointBuilderFactory.MSKBuilders, org.apache.camel.builder.endpoint.dsl.MailEndpointBuilderFactory.MailBuilders, org.apache.camel.builder.endpoint.dsl.MasterEndpointBuilderFactory.MasterBuilders, org.apache.camel.builder.endpoint.dsl.MetricsEndpointBuilderFactory.MetricsBuilders, diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java index f87c798..4343b7a 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java @@ -235,7 +235,6 @@ public interface EndpointBuilders org.apache.camel.builder.endpoint.dsl.MQ2EndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.MQEndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.MSK2EndpointBuilderFactory, - org.apache.camel.builder.endpoint.dsl.MSKEndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.MailEndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.MasterEndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.MetricsEndpointBuilderFactory, diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java index d5fe8fa..738823b 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java @@ -17027,4 +17027,4 @@ public class StaticEndpointBuilders { return org.apache.camel.builder.endpoint.dsl.ZooKeeperMasterEndpointBuilderFactory.endpointBuilder(componentName, path); } } -//CHECKSTYLE:ON +//CHECKSTYLE:ON \ No newline at end of file diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc index 35faec6..74ff8fe 100644 --- a/docs/components/modules/ROOT/nav.adoc +++ b/docs/components/modules/ROOT/nav.adoc @@ -33,7 +33,6 @@ *** xref:aws-kinesis-component.adoc[AWS Kinesis] *** xref:aws-kinesis-firehose-component.adoc[AWS Kinesis Firehose] *** xref:aws-lambda-component.adoc[AWS Lambda] -*** xref:aws-msk-component.adoc[AWS Managed Streaming for Apache Kafka (MSK)] *** xref:aws-mq-component.adoc[AWS MQ] *** xref:aws-s3-component.adoc[AWS S3 Storage Service] *** xref:aws-swf-component.adoc[AWS Simple Workflow (SWF)] diff --git a/docs/components/modules/ROOT/pages/aws-msk-component.adoc b/docs/components/modules/ROOT/pages/aws-msk-component.adoc deleted file mode 100644 index cc49215..0000000 --- a/docs/components/modules/ROOT/pages/aws-msk-component.adoc +++ /dev/null @@ -1,182 +0,0 @@ -[[aws-msk-component]] -= AWS Managed Streaming for Apache Kafka (MSK) Component (deprecated) -//THIS FILE IS COPIED: EDIT THE SOURCE FILE: -:page-source: components/camel-aws-msk/src/main/docs/aws-msk-component.adoc -:docTitle: AWS Managed Streaming for Apache Kafka (MSK) -:artifactId: camel-aws-msk -:description: Manage AWS MSK instances. -:since: 3.0 -:supportLevel: Stable-deprecated -:deprecated: *deprecated* -:component-header: Only producer is supported -include::{cq-version}@camel-quarkus:ROOT:partial$reference/components/aws-msk.adoc[opts=optional] -//Manually maintained attributes -:group: AWS - -*Since Camel {since}* - -*{component-header}* - -The AWS MSK component supports create, run, start, stop and terminate -https://aws.amazon.com/msk/[AWS MSK] instances. - -Prerequisites - -You must have a valid Amazon Web Services developer account, and be -signed up to use Amazon MSK. More information is available at -https://aws.amazon.com/msk/[Amazon MSK]. - -== URI Format - -[source,java] -------------------------- -aws-msk://label[?options] -------------------------- - -You can append query options to the URI in the following format, -?options=value&option2=value&... - -== URI Options - - -// component options: START -The AWS Managed Streaming for Apache Kafka (MSK) component supports 12 options, which are listed below. - - - -[width="100%",cols="2,5,^1,2",options="header"] -|=== -| Name | Description | Default | Type -| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | boolean -| *accessKey* (producer) | Amazon AWS Access Key | | String -| *configuration* (producer) | The component configuration | | MSKConfiguration -| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] -| *mskClient* (producer) | To use a existing configured AWS MSK as client | | AWSKafka -| *operation* (producer) | *Required* The operation to perform. There are 4 enums and the value can be one of: listClusters, createCluster, deleteCluster, describeCluster | | MSKOperations -| *proxyHost* (producer) | To define a proxy host when instantiating the MSK client | | String -| *proxyPort* (producer) | To define a proxy port when instantiating the MSK client | | Integer -| *proxyProtocol* (producer) | To define a proxy protocol when instantiating the MSK client. There are 2 enums and the value can be one of: HTTP, HTTPS | HTTPS | Protocol -| *region* (producer) | The region in which MSK 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 -| *secretKey* (producer) | Amazon AWS Secret Key | | String -| *autowiredEnabled* (advanced) | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | boolean -|=== -// component options: END - - - - -// endpoint options: START -The AWS Managed Streaming for Apache Kafka (MSK) endpoint is configured using URI syntax: - ----- -aws-msk:label ----- - -with the following path and query parameters: - -=== Path Parameters (1 parameters): - - -[width="100%",cols="2,5,^1,2",options="header"] -|=== -| Name | Description | Default | Type -| *label* | *Required* Logical name | | String -|=== - - -=== Query Parameters (10 parameters): - - -[width="100%",cols="2,5,^1,2",options="header"] -|=== -| Name | Description | Default | Type -| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | boolean -| *accessKey* (producer) | Amazon AWS Access Key | | String -| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] -| *mskClient* (producer) | To use a existing configured AWS MSK as client | | AWSKafka -| *operation* (producer) | *Required* The operation to perform. There are 4 enums and the value can be one of: listClusters, createCluster, deleteCluster, describeCluster | | MSKOperations -| *proxyHost* (producer) | To define a proxy host when instantiating the MSK client | | String -| *proxyPort* (producer) | To define a proxy port when instantiating the MSK client | | Integer -| *proxyProtocol* (producer) | To define a proxy protocol when instantiating the MSK client. There are 2 enums and the value can be one of: HTTP, HTTPS | HTTPS | Protocol -| *region* (producer) | The region in which MSK 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 -| *secretKey* (producer) | Amazon AWS Secret Key | | String -|=== -// endpoint options: END - - - - - -Required MSK component options - -You have to provide the amazonMskClient in the -Registry or your accessKey and secretKey to access -the https://aws.amazon.com/msk/[Amazon MSK] service. - -== Usage - -=== Message headers evaluated by the MSK producer - -[width="100%",cols="10%,10%,80%",options="header",] -|======================================================================= -|Header |Type |Description - -|`CamelAwsMSKOperation` |`String` |The operation to perform - -|`CamelAwsMSKClusterFilter` |`String` |The cluster name filter for list operation - -|`CamelAwsMSKClusterName` |`String` |The cluster name for list and create operation - -|`CamelAwsMSKClusterArn` |`String` |The cluster arn for delete operation - -|`CamelAwsMSKClusterKafkaVersion` |`String` | The Kafka for the cluster during create operation - -|`CamelAwsMSKBrokerNodesNumber` |`Integer`| The number of nodes for the cluster during create operation - -|`CamelAwsMSKBrokerNodesGroupInfo` |`com.amazonaws.services.kafka.model.BrokerNodeGroupInfo`| The Broker nodes group info to provide during the create operation -|======================================================================= - -=== MSK Producer operations - -Camel-AWS MSK component provides the following operation on the producer side: - -- listClusters -- createCluster -- deleteCluster -- describeCluster - -== Producer Examples - -- listBrokers: this operation will list the available MSK Brokers in AWS - -[source,java] --------------------------------------------------------------------------------- -from("direct:listClusters") - .to("aws-msk://test?mskClient=#amazonMskClient&operation=listClusters") --------------------------------------------------------------------------------- - -== Automatic detection of AWSKafka client in registry - -The component is capable of detecting the presence of an AWSKafka bean into the registry. -If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. -This may be really useful for smarter configuration of the endpoint. - -Dependencies - -Maven users will need to add the following dependency to their pom.xml. - -*pom.xml* - -[source,xml] ---------------------------------------- -<dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-aws-msk</artifactId> - <version>${camel-version}</version> -</dependency> ---------------------------------------- - -where `$\{camel-version}` must be replaced by the actual version of Camel. - - -include::camel-spring-boot::page$aws-msk-starter.adoc[]