This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 1898 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 20f3c6d8a675f4c3a6617a46617d12d558d56112 Author: Andrea Cosentino <[email protected]> AuthorDate: Thu Feb 15 09:30:15 2024 +0100 Remove DuplicateNamingHeaders and DeDuplicateNamingHeaders from utils Signed-off-by: Andrea Cosentino <[email protected]> --- kamelets/aws-kinesis-source.kamelet.yaml | 10 -- kamelets/aws-s3-source.kamelet.yaml | 10 -- kamelets/aws-sqs-source.kamelet.yaml | 10 -- kamelets/azure-storage-blob-source.kamelet.yaml | 10 -- kamelets/azure-storage-queue-source.kamelet.yaml | 10 -- kamelets/kafka-not-secured-sink.kamelet.yaml | 10 -- .../utils/headers/DeDuplicateNamingHeaders.java | 108 --------------------- .../utils/headers/DuplicateNamingHeaders.java | 108 --------------------- .../utils/headers/DeDuplicateHeadersTest.java | 96 ------------------ .../utils/headers/DuplicateHeadersTest.java | 75 -------------- .../kamelets/aws-kinesis-source.kamelet.yaml | 10 -- .../resources/kamelets/aws-s3-source.kamelet.yaml | 10 -- .../resources/kamelets/aws-sqs-source.kamelet.yaml | 10 -- .../azure-storage-blob-source.kamelet.yaml | 10 -- .../azure-storage-queue-source.kamelet.yaml | 10 -- .../kamelets/kafka-not-secured-sink.kamelet.yaml | 10 -- 16 files changed, 507 deletions(-) diff --git a/kamelets/aws-kinesis-source.kamelet.yaml b/kamelets/aws-kinesis-source.kamelet.yaml index da9b0d67..c2c7a3a9 100644 --- a/kamelets/aws-kinesis-source.kamelet.yaml +++ b/kamelets/aws-kinesis-source.kamelet.yaml @@ -95,14 +95,6 @@ spec: - "camel:core" - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT" template: - beans: - - name: duplicateHeaders - type: "#class:org.apache.camel.kamelets.utils.headers.DuplicateNamingHeaders" - properties: - prefix: 'CamelAwsKinesis' - renamingPrefix: 'aws.kinesis.' - mode: 'filtering' - selectedHeaders: 'CamelAwsKinesisPartitionKey,CamelAwsKinesisSequenceNumber' from: uri: aws2-kinesis:{{stream}} parameters: @@ -114,6 +106,4 @@ spec: overrideEndpoint: "{{overrideEndpoint}}" delay: "{{delay}}" steps: - - process: - ref: "{{duplicateHeaders}}" - to: "kamelet:sink" diff --git a/kamelets/aws-s3-source.kamelet.yaml b/kamelets/aws-s3-source.kamelet.yaml index 4b2e165f..2b22c701 100644 --- a/kamelets/aws-s3-source.kamelet.yaml +++ b/kamelets/aws-s3-source.kamelet.yaml @@ -160,14 +160,6 @@ spec: - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT" - "camel:kamelet" template: - beans: - - name: renameHeaders - type: "#class:org.apache.camel.kamelets.utils.headers.DuplicateNamingHeaders" - properties: - prefix: 'CamelAwsS3' - renamingPrefix: 'aws.s3.' - mode: 'filtering' - selectedHeaders: 'CamelAwsS3Key,CamelAwsS3BucketName' from: uri: "aws2-s3:{{bucketNameOrArn}}" parameters: @@ -185,6 +177,4 @@ spec: delay: "{{delay}}" maxMessagesPerPoll: "{{maxMessagesPerPoll}}" steps: - - process: - ref: "{{renameHeaders}}" - to: "kamelet:sink" diff --git a/kamelets/aws-sqs-source.kamelet.yaml b/kamelets/aws-sqs-source.kamelet.yaml index 6e4e8e69..95aa282b 100644 --- a/kamelets/aws-sqs-source.kamelet.yaml +++ b/kamelets/aws-sqs-source.kamelet.yaml @@ -192,14 +192,6 @@ spec: - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT" - "camel:kamelet" template: - beans: - - name: renameHeaders - type: "#class:org.apache.camel.kamelets.utils.headers.DuplicateNamingHeaders" - properties: - prefix: 'CamelAwsSqs' - renamingPrefix: 'aws.sqs.' - mode: 'filtering' - selectedHeaders: 'CamelAwsSqsReceiptHandle,CamelAwsSqsMessageId' from: uri: "aws2-sqs:{{queueNameOrArn}}" parameters: @@ -216,6 +208,4 @@ spec: delay: "{{delay}}" greedy: "{{greedy}}" steps: - - process: - ref: "{{renameHeaders}}" - to: "kamelet:sink" diff --git a/kamelets/azure-storage-blob-source.kamelet.yaml b/kamelets/azure-storage-blob-source.kamelet.yaml index 73799fef..2eb26cde 100644 --- a/kamelets/azure-storage-blob-source.kamelet.yaml +++ b/kamelets/azure-storage-blob-source.kamelet.yaml @@ -151,14 +151,6 @@ spec: - "camel:timer" - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT" template: - beans: - - name: duplicateHeaders - type: "#class:org.apache.camel.kamelets.utils.headers.DuplicateNamingHeaders" - properties: - prefix: 'CamelAzureStorageBlob' - renamingPrefix: 'azure.storage.blob.' - mode: 'filtering' - selectedHeaders: 'CamelAzureStorageBlobETag,CamelAzureStorageBlobBlobSize' from: uri: "azure-storage-blob:{{accountName}}/{{containerName}}" parameters: @@ -166,8 +158,6 @@ spec: credentialType: "{{credentialType}}" delay: "{{delay}}" steps: - - process: - ref: "{{duplicateHeaders}}" - to: "kamelet:sink" - choice: precondition: true diff --git a/kamelets/azure-storage-queue-source.kamelet.yaml b/kamelets/azure-storage-queue-source.kamelet.yaml index e04ad20f..fca3925d 100644 --- a/kamelets/azure-storage-queue-source.kamelet.yaml +++ b/kamelets/azure-storage-queue-source.kamelet.yaml @@ -136,14 +136,6 @@ spec: - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT" - "camel:core" template: - beans: - - name: renameHeaders - type: "#class:org.apache.camel.kamelets.utils.headers.DuplicateNamingHeaders" - properties: - prefix: 'CamelAzureStorageQueue' - renamingPrefix: 'azure.storage.queue.' - mode: 'filtering' - selectedHeaders: 'CamelAzureStorageQueueMessageId' from: uri: "azure-storage-queue://{{accountName}}/{{queueName}}" parameters: @@ -151,6 +143,4 @@ spec: maxMessages: "{{maxMessages}}" credentialType: "{{credentialType}}" steps: - - process: - ref: "{{renameHeaders}}" - to: "kamelet:sink" diff --git a/kamelets/kafka-not-secured-sink.kamelet.yaml b/kamelets/kafka-not-secured-sink.kamelet.yaml index 6f6d84d0..b63f5d5b 100644 --- a/kamelets/kafka-not-secured-sink.kamelet.yaml +++ b/kamelets/kafka-not-secured-sink.kamelet.yaml @@ -61,19 +61,9 @@ spec: - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT" - "camel:kamelet" template: - beans: - - name: deDuplicateHeaders - type: "#class:org.apache.camel.kamelets.utils.headers.DeDuplicateNamingHeaders" - properties: - prefix: 'kafka.' - renamingPrefix: 'kafka.' - mode: 'filtering' - selectedHeaders: 'kafka.key,kafka.topic,kafka.override_topic' from: uri: "kamelet:source" steps: - - process: - ref: "{{deDuplicateHeaders}}" - choice: when: - simple: "${header[key]}" diff --git a/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/headers/DeDuplicateNamingHeaders.java b/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/headers/DeDuplicateNamingHeaders.java deleted file mode 100644 index f7f53ca2..00000000 --- a/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/headers/DeDuplicateNamingHeaders.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.kamelets.utils.headers; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.apache.camel.Exchange; -import org.apache.camel.InvalidPayloadException; -import org.apache.camel.Processor; - -public class DeDuplicateNamingHeaders implements Processor { - - String prefix; - String renamingPrefix; - String selectedHeaders; - String mode = "all"; - - /** - * Default constructor. - */ - public DeDuplicateNamingHeaders() { - } - - /** - * Constructor using fields. - * - * @param prefix a prefix to find all the headers to rename. - * @param renamingPrefix the renaming prefix to use on all the matching headers - */ - public DeDuplicateNamingHeaders(String prefix, String renamingPrefix, String selectedHeaders, String mode) { - this.prefix = prefix; - this.renamingPrefix = renamingPrefix; - this.selectedHeaders = selectedHeaders; - this.mode = mode; - } - - public void process(Exchange ex) throws InvalidPayloadException { - Map<String, Object> originalHeaders = ex.getMessage().getHeaders(); - Map<String, Object> newHeaders = new HashMap<>(); - Iterator<Map.Entry<String, Object>> iterator = originalHeaders.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry<String, Object> entry = iterator.next(); - String key = entry.getKey(); - Object val = entry.getValue(); - if (prefix != null && mode.equalsIgnoreCase("all")) { - if (key.startsWith(prefix)) { - String newKey = key.replaceFirst(prefix, renamingPrefix); - String subKey = newKey.substring(renamingPrefix.length()); - String suffix = subKey.toUpperCase(); - newHeaders.put(renamingPrefix + suffix, val); - iterator.remove(); - } - } else { - if (selectedHeaders != null && mode.equalsIgnoreCase("filtering")) { - List<String> headerList = Arrays.asList(selectedHeaders.split(",")); - for (Iterator<String> iteratorHeader = headerList.iterator(); iteratorHeader.hasNext();) { - String header = iteratorHeader.next(); - if (key.equalsIgnoreCase(header)) { - String newKey = key.replaceFirst(prefix, renamingPrefix); - String subKey = newKey.substring(renamingPrefix.length()); - String suffix = subKey.toUpperCase(); - newHeaders.put(renamingPrefix + suffix, val); - iterator.remove(); - } - } - - } - } - } - originalHeaders.putAll(newHeaders); - ex.getMessage().setHeaders(originalHeaders); - } - - public void setPrefix(String prefix) { - this.prefix = prefix; - } - - public void setRenamingPrefix(String renamingPrefix) { - this.renamingPrefix = renamingPrefix; - } - - public void setSelectedHeaders(String selectedHeaders) { - this.selectedHeaders = selectedHeaders; - } - - public void setMode(String mode) { - this.mode = mode; - } - -} diff --git a/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/headers/DuplicateNamingHeaders.java b/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/headers/DuplicateNamingHeaders.java deleted file mode 100644 index 85323644..00000000 --- a/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/headers/DuplicateNamingHeaders.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.kamelets.utils.headers; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.apache.camel.Exchange; -import org.apache.camel.InvalidPayloadException; -import org.apache.camel.Processor; - -public class DuplicateNamingHeaders implements Processor { - - String prefix; - String renamingPrefix; - String selectedHeaders; - String mode = "all"; - - /** - * Default constructor. - */ - public DuplicateNamingHeaders() { - } - - /** - * Constructor using fields. - * - * @param prefix a prefix to find all the headers to rename. - * @param renamingPrefix the renaming prefix to use on all the matching headers - */ - public DuplicateNamingHeaders(String prefix, String renamingPrefix, String selectedHeaders, String mode) { - this.prefix = prefix; - this.renamingPrefix = renamingPrefix; - this.selectedHeaders = selectedHeaders; - this.mode = mode; - } - - public void process(Exchange ex) throws InvalidPayloadException { - Map<String, Object> originalHeaders = ex.getMessage().getHeaders(); - Map<String, Object> newHeaders = new HashMap<>(); - for (Map.Entry<String, Object> entry : originalHeaders.entrySet()) { - String key = entry.getKey(); - Object val = entry.getValue(); - if (prefix != null && mode.equalsIgnoreCase("all")) { - if (key.startsWith(prefix)) { - String newKey = key.replaceFirst(prefix, renamingPrefix); - String subKey = newKey.substring(renamingPrefix.length()); - String suffix = subKey.replaceAll(String.format("%s|%s|%s", "(?<=[A-Z])(?=[A-Z][a-z])", - "(?<=[^A-Z])(?=[A-Z])", "(?<=[A-Za-z])(?=[^A-Za-z])"), ".").toLowerCase(); - newHeaders.put(renamingPrefix + suffix, val); - } - } else { - if (selectedHeaders != null && mode.equalsIgnoreCase("filtering")) { - List<String> headerList = Arrays.asList(selectedHeaders.split(",")); - for (Iterator<String> iterator = headerList.iterator(); iterator.hasNext();) { - String header = iterator.next(); - if (key.equalsIgnoreCase(header)) { - String newKey = key.replaceFirst(prefix, renamingPrefix); - String subKey = newKey.substring(renamingPrefix.length()); - String suffix = subKey - .replaceAll(String.format("%s|%s|%s", "(?<=[A-Z])(?=[A-Z][a-z])", - "(?<=[^A-Z])(?=[A-Z])", "(?<=[A-Za-z])(?=[^A-Za-z])"), ".") - .toLowerCase(); - newHeaders.put(renamingPrefix + suffix, val); - } - } - - } - } - } - originalHeaders.putAll(newHeaders); - ex.getMessage().setHeaders(originalHeaders); - } - - public void setPrefix(String prefix) { - this.prefix = prefix; - } - - public void setRenamingPrefix(String renamingPrefix) { - this.renamingPrefix = renamingPrefix; - } - - public void setSelectedHeaders(String selectedHeaders) { - this.selectedHeaders = selectedHeaders; - } - - public void setMode(String mode) { - this.mode = mode; - } - -} diff --git a/library/camel-kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/headers/DeDuplicateHeadersTest.java b/library/camel-kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/headers/DeDuplicateHeadersTest.java deleted file mode 100644 index ca675a7e..00000000 --- a/library/camel-kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/headers/DeDuplicateHeadersTest.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.kamelets.utils.headers; - -import org.apache.camel.Exchange; -import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.support.DefaultExchange; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -class DeDuplicateHeadersTest { - - private DefaultCamelContext camelContext; - - private DeDuplicateNamingHeaders processor; - - @BeforeEach - void setup() { - camelContext = new DefaultCamelContext(); - } - - @Test - void shouldDuplicateHeaders() throws Exception { - Exchange exchange = new DefaultExchange(camelContext); - - exchange.getMessage().setHeader("kafka.topic", "peppe"); - exchange.getMessage().setHeader("kafka.key", "peppe"); - exchange.getMessage().setHeader("kafka.override_topic", "peppe"); - exchange.getMessage().setHeader("my-header", "header"); - - processor = new DeDuplicateNamingHeaders(); - processor.setPrefix("kafka."); - processor.setRenamingPrefix("kafka."); - processor.process(exchange); - - Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey("kafka.KEY")); - Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey("kafka.TOPIC")); - Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey("kafka.OVERRIDE_TOPIC")); - Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey("my-header")); - } - - @Test - void shouldDuplicateSelectedHeaders() throws Exception { - Exchange exchange = new DefaultExchange(camelContext); - - exchange.getMessage().setHeader("kafka.TOPIC", "peppe"); - exchange.getMessage().setHeader("kafka.KEY", "peppe"); - exchange.getMessage().setHeader("my-header", "header"); - exchange.getMessage().setHeader("kafka.override_topic", "peppe"); - - processor = new DeDuplicateNamingHeaders(); - processor.setPrefix("kafka."); - processor.setRenamingPrefix("kafka."); - processor.setSelectedHeaders("kafka.TOPIC,kafka.KEY"); - processor.setMode("filtering"); - processor.process(exchange); - - Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey("kafka.KEY")); - Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey("kafka.TOPIC")); - Assertions.assertFalse(exchange.getMessage().getHeaders().containsKey("kafka.OVERRIDE_TOPIC")); - Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey("my-header")); - } - - @Test - void shouldDeDuplicateSelectedHeaders() throws Exception { - Exchange exchange = new DefaultExchange(camelContext); - - exchange.getMessage().setHeader("kafka.override_topic", "peppe"); - - processor = new DeDuplicateNamingHeaders(); - processor.setPrefix("kafka."); - processor.setRenamingPrefix("kafka."); - processor.setSelectedHeaders("kafka.topic,kafka.key"); - processor.setMode("filtering"); - processor.process(exchange); - - Assertions.assertFalse(exchange.getMessage().getHeaders().containsKey("kafka.OVERRIDE_TOPIC")); - - } - -} diff --git a/library/camel-kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/headers/DuplicateHeadersTest.java b/library/camel-kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/headers/DuplicateHeadersTest.java deleted file mode 100644 index 3cb3ca87..00000000 --- a/library/camel-kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/headers/DuplicateHeadersTest.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.kamelets.utils.headers; - -import org.apache.camel.Exchange; -import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.support.DefaultExchange; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -class DuplicateHeadersTest { - - private DefaultCamelContext camelContext; - - private DuplicateNamingHeaders processor; - - @BeforeEach - void setup() { - camelContext = new DefaultCamelContext(); - } - - @Test - void shouldDuplicateHeaders() throws Exception { - Exchange exchange = new DefaultExchange(camelContext); - - exchange.getMessage().setHeader("CamelAwsS3Key", "test.txt"); - exchange.getMessage().setHeader("CamelAwsS3BucketName", "kamelets-demo"); - exchange.getMessage().setHeader("my-header", "header"); - - processor = new DuplicateNamingHeaders(); - processor.setPrefix("CamelAwsS3"); - processor.setRenamingPrefix("aws.s3."); - processor.process(exchange); - - Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey("aws.s3.key")); - Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey("aws.s3.bucket.name")); - Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey("my-header")); - } - - @Test - void shouldDuplicateSelectedHeaders() throws Exception { - Exchange exchange = new DefaultExchange(camelContext); - - exchange.getMessage().setHeader("CamelAwsS3Key", "test.txt"); - exchange.getMessage().setHeader("CamelAwsS3BucketName", "kamelets-demo"); - exchange.getMessage().setHeader("my-header", "header"); - - processor = new DuplicateNamingHeaders(); - processor.setPrefix("CamelAwsS3"); - processor.setRenamingPrefix("aws.s3."); - processor.setMode("filtering"); - processor.setSelectedHeaders("CamelAwsS3Key,CamelAwsS3BucketName"); - processor.process(exchange); - - Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey("aws.s3.key")); - Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey("aws.s3.bucket.name")); - Assertions.assertTrue(exchange.getMessage().getHeaders().containsKey("my-header")); - } - -} diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml index da9b0d67..c2c7a3a9 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml @@ -95,14 +95,6 @@ spec: - "camel:core" - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT" template: - beans: - - name: duplicateHeaders - type: "#class:org.apache.camel.kamelets.utils.headers.DuplicateNamingHeaders" - properties: - prefix: 'CamelAwsKinesis' - renamingPrefix: 'aws.kinesis.' - mode: 'filtering' - selectedHeaders: 'CamelAwsKinesisPartitionKey,CamelAwsKinesisSequenceNumber' from: uri: aws2-kinesis:{{stream}} parameters: @@ -114,6 +106,4 @@ spec: overrideEndpoint: "{{overrideEndpoint}}" delay: "{{delay}}" steps: - - process: - ref: "{{duplicateHeaders}}" - to: "kamelet:sink" diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-source.kamelet.yaml index 4b2e165f..2b22c701 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-source.kamelet.yaml @@ -160,14 +160,6 @@ spec: - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT" - "camel:kamelet" template: - beans: - - name: renameHeaders - type: "#class:org.apache.camel.kamelets.utils.headers.DuplicateNamingHeaders" - properties: - prefix: 'CamelAwsS3' - renamingPrefix: 'aws.s3.' - mode: 'filtering' - selectedHeaders: 'CamelAwsS3Key,CamelAwsS3BucketName' from: uri: "aws2-s3:{{bucketNameOrArn}}" parameters: @@ -185,6 +177,4 @@ spec: delay: "{{delay}}" maxMessagesPerPoll: "{{maxMessagesPerPoll}}" steps: - - process: - ref: "{{renameHeaders}}" - to: "kamelet:sink" diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml index 6e4e8e69..95aa282b 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml @@ -192,14 +192,6 @@ spec: - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT" - "camel:kamelet" template: - beans: - - name: renameHeaders - type: "#class:org.apache.camel.kamelets.utils.headers.DuplicateNamingHeaders" - properties: - prefix: 'CamelAwsSqs' - renamingPrefix: 'aws.sqs.' - mode: 'filtering' - selectedHeaders: 'CamelAwsSqsReceiptHandle,CamelAwsSqsMessageId' from: uri: "aws2-sqs:{{queueNameOrArn}}" parameters: @@ -216,6 +208,4 @@ spec: delay: "{{delay}}" greedy: "{{greedy}}" steps: - - process: - ref: "{{renameHeaders}}" - to: "kamelet:sink" diff --git a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml index 73799fef..2eb26cde 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml @@ -151,14 +151,6 @@ spec: - "camel:timer" - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT" template: - beans: - - name: duplicateHeaders - type: "#class:org.apache.camel.kamelets.utils.headers.DuplicateNamingHeaders" - properties: - prefix: 'CamelAzureStorageBlob' - renamingPrefix: 'azure.storage.blob.' - mode: 'filtering' - selectedHeaders: 'CamelAzureStorageBlobETag,CamelAzureStorageBlobBlobSize' from: uri: "azure-storage-blob:{{accountName}}/{{containerName}}" parameters: @@ -166,8 +158,6 @@ spec: credentialType: "{{credentialType}}" delay: "{{delay}}" steps: - - process: - ref: "{{duplicateHeaders}}" - to: "kamelet:sink" - choice: precondition: true diff --git a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-queue-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-queue-source.kamelet.yaml index e04ad20f..fca3925d 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-queue-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-queue-source.kamelet.yaml @@ -136,14 +136,6 @@ spec: - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT" - "camel:core" template: - beans: - - name: renameHeaders - type: "#class:org.apache.camel.kamelets.utils.headers.DuplicateNamingHeaders" - properties: - prefix: 'CamelAzureStorageQueue' - renamingPrefix: 'azure.storage.queue.' - mode: 'filtering' - selectedHeaders: 'CamelAzureStorageQueueMessageId' from: uri: "azure-storage-queue://{{accountName}}/{{queueName}}" parameters: @@ -151,6 +143,4 @@ spec: maxMessages: "{{maxMessages}}" credentialType: "{{credentialType}}" steps: - - process: - ref: "{{renameHeaders}}" - to: "kamelet:sink" diff --git a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml index 6f6d84d0..b63f5d5b 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml @@ -61,19 +61,9 @@ spec: - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT" - "camel:kamelet" template: - beans: - - name: deDuplicateHeaders - type: "#class:org.apache.camel.kamelets.utils.headers.DeDuplicateNamingHeaders" - properties: - prefix: 'kafka.' - renamingPrefix: 'kafka.' - mode: 'filtering' - selectedHeaders: 'kafka.key,kafka.topic,kafka.override_topic' from: uri: "kamelet:source" steps: - - process: - ref: "{{deDuplicateHeaders}}" - choice: when: - simple: "${header[key]}"
