From 67962fa4f00a418d573cd4ca53c74e2e6f483b12 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:16:40 +0100 Subject: [PATCH 01/15] Use only camelCase in kamelets yaml - Has Header Filter Action Kamelet Signed-off-by: Andrea Cosentino --- kamelets/has-header-filter-action.kamelet.yaml | 2 +- .../resources/kamelets/has-header-filter-action.kamelet.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kamelets/has-header-filter-action.kamelet.yaml b/kamelets/has-header-filter-action.kamelet.yaml index c29fa9de7..cbbd0f2fa 100644 --- a/kamelets/has-header-filter-action.kamelet.yaml +++ b/kamelets/has-header-filter-action.kamelet.yaml @@ -52,7 +52,7 @@ spec: from: uri: kamelet:source steps: - - set-property: + - setProperty: name: hasHeaderFilterActionValue constant: "{{value:}}" - choice: diff --git a/library/camel-kamelets/src/main/resources/kamelets/has-header-filter-action.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/has-header-filter-action.kamelet.yaml index c29fa9de7..cbbd0f2fa 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/has-header-filter-action.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/has-header-filter-action.kamelet.yaml @@ -52,7 +52,7 @@ spec: from: uri: kamelet:source steps: - - set-property: + - setProperty: name: hasHeaderFilterActionValue constant: "{{value:}}" - choice: From c54f96de8e30923caf6fa676ffd708e1fafb5c5f Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:17:56 +0100 Subject: [PATCH 02/15] Use only camelCase in kamelets yaml - Infinispan Kamelets Signed-off-by: Andrea Cosentino --- kamelets/infinispan-sink.kamelet.yaml | 8 ++++---- kamelets/infinispan-source.kamelet.yaml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kamelets/infinispan-sink.kamelet.yaml b/kamelets/infinispan-sink.kamelet.yaml index a8328f043..5eb38ecb8 100644 --- a/kamelets/infinispan-sink.kamelet.yaml +++ b/kamelets/infinispan-sink.kamelet.yaml @@ -104,20 +104,20 @@ spec: when: - simple: "${header[key]}" steps: - - set-header: + - setHeader: name: CamelInfinispanKey simple: "${header[key]}" - simple: "${header[ce-key]}" steps: - - set-header: + - setHeader: name: CamelInfinispanKey simple: "${header[ce-key]}" otherwise: steps: - - set-header: + - setHeader: name: CamelInfinispanKey simple: "${exchangeId}" - - set-header: + - setHeader: name: CamelInfinispanValue simple: "${body}" - to: diff --git a/kamelets/infinispan-source.kamelet.yaml b/kamelets/infinispan-source.kamelet.yaml index 868ecdb95..f98fd0b53 100644 --- a/kamelets/infinispan-source.kamelet.yaml +++ b/kamelets/infinispan-source.kamelet.yaml @@ -110,28 +110,28 @@ spec: securityServerName: "{{securityServerName}}" eventTypes: "{{eventTypes}}" steps: - - set-header: + - setHeader: name: infinispan-cache-name simple: "${header[CamelInfinispanCacheName]}" - - set-header: + - setHeader: name: ce-infinispancachename simple: "${header[CamelInfinispanCacheName]}" - - set-header: + - setHeader: name: infinispan-entry-version simple: "${header[CamelInfinispanEntryVersion]}" - - set-header: + - setHeader: name: ce-infinispanentryversion simple: "${header[CamelInfinispanEntryVersion]}" - - set-header: + - setHeader: name: infinispan-event-type simple: "${header[CamelInfinispanEventType]}" - - set-header: + - setHeader: name: ce-infinispaneventtype simple: "${header[CamelInfinispanEventType]}" - - set-header: + - setHeader: name: infinispan-key simple: "${header[CamelInfinispanKey]}" - - set-header: + - setHeader: name: ce-infinispankey simple: "${header[CamelInfinispanKey]}" - to: kamelet:sink From 104c3eba2e4fff1cc2da9727094a8130064dda51 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:19:13 +0100 Subject: [PATCH 03/15] Use only camelCase in kamelets yaml - Infinispan Kamelets Signed-off-by: Andrea Cosentino --- .../kamelets/infinispan-sink.kamelet.yaml | 8 ++++---- .../kamelets/infinispan-source.kamelet.yaml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/library/camel-kamelets/src/main/resources/kamelets/infinispan-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/infinispan-sink.kamelet.yaml index a8328f043..5eb38ecb8 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/infinispan-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/infinispan-sink.kamelet.yaml @@ -104,20 +104,20 @@ spec: when: - simple: "${header[key]}" steps: - - set-header: + - setHeader: name: CamelInfinispanKey simple: "${header[key]}" - simple: "${header[ce-key]}" steps: - - set-header: + - setHeader: name: CamelInfinispanKey simple: "${header[ce-key]}" otherwise: steps: - - set-header: + - setHeader: name: CamelInfinispanKey simple: "${exchangeId}" - - set-header: + - setHeader: name: CamelInfinispanValue simple: "${body}" - to: diff --git a/library/camel-kamelets/src/main/resources/kamelets/infinispan-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/infinispan-source.kamelet.yaml index 868ecdb95..f98fd0b53 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/infinispan-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/infinispan-source.kamelet.yaml @@ -110,28 +110,28 @@ spec: securityServerName: "{{securityServerName}}" eventTypes: "{{eventTypes}}" steps: - - set-header: + - setHeader: name: infinispan-cache-name simple: "${header[CamelInfinispanCacheName]}" - - set-header: + - setHeader: name: ce-infinispancachename simple: "${header[CamelInfinispanCacheName]}" - - set-header: + - setHeader: name: infinispan-entry-version simple: "${header[CamelInfinispanEntryVersion]}" - - set-header: + - setHeader: name: ce-infinispanentryversion simple: "${header[CamelInfinispanEntryVersion]}" - - set-header: + - setHeader: name: infinispan-event-type simple: "${header[CamelInfinispanEventType]}" - - set-header: + - setHeader: name: ce-infinispaneventtype simple: "${header[CamelInfinispanEventType]}" - - set-header: + - setHeader: name: infinispan-key simple: "${header[CamelInfinispanKey]}" - - set-header: + - setHeader: name: ce-infinispankey simple: "${header[CamelInfinispanKey]}" - to: kamelet:sink From a42a3cd3c3d8790dca868ab095cab54c4d925960 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:20:22 +0100 Subject: [PATCH 04/15] Use only camelCase in kamelets yaml - Insert Field Kamelet Signed-off-by: Andrea Cosentino --- kamelets/insert-field-action.kamelet.yaml | 4 ++-- .../main/resources/kamelets/insert-field-action.kamelet.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kamelets/insert-field-action.kamelet.yaml b/kamelets/insert-field-action.kamelet.yaml index 331f46b07..364c7f028 100644 --- a/kamelets/insert-field-action.kamelet.yaml +++ b/kamelets/insert-field-action.kamelet.yaml @@ -68,7 +68,7 @@ spec: when: - simple: "${header[Content-Type]} == 'application/json'" steps: - - set-property: + - setProperty: name: deserialized constant: "true" - unmarshal: @@ -85,6 +85,6 @@ spec: json: library: Jackson unmarshalType: com.fasterxml.jackson.databind.JsonNode - - set-header: + - setHeader: name: "Content-Type" constant: "application/json" diff --git a/library/camel-kamelets/src/main/resources/kamelets/insert-field-action.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/insert-field-action.kamelet.yaml index 331f46b07..364c7f028 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/insert-field-action.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/insert-field-action.kamelet.yaml @@ -68,7 +68,7 @@ spec: when: - simple: "${header[Content-Type]} == 'application/json'" steps: - - set-property: + - setProperty: name: deserialized constant: "true" - unmarshal: @@ -85,6 +85,6 @@ spec: json: library: Jackson unmarshalType: com.fasterxml.jackson.databind.JsonNode - - set-header: + - setHeader: name: "Content-Type" constant: "application/json" From 67f7e83b8285e5757deca13322e70484ff448971 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:21:37 +0100 Subject: [PATCH 05/15] +Use only camelCase in kamelets yaml - Insert Header Action Kamelet Signed-off-by: Andrea Cosentino --- kamelets/insert-header-action.kamelet.yaml | 2 +- .../main/resources/kamelets/insert-header-action.kamelet.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kamelets/insert-header-action.kamelet.yaml b/kamelets/insert-header-action.kamelet.yaml index 5a55d30b3..b73852ac7 100644 --- a/kamelets/insert-header-action.kamelet.yaml +++ b/kamelets/insert-header-action.kamelet.yaml @@ -52,6 +52,6 @@ spec: from: uri: kamelet:source steps: - - set-header: + - setHeader: name: "{{name}}" simple: "{{value}}" diff --git a/library/camel-kamelets/src/main/resources/kamelets/insert-header-action.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/insert-header-action.kamelet.yaml index 5a55d30b3..b73852ac7 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/insert-header-action.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/insert-header-action.kamelet.yaml @@ -52,6 +52,6 @@ spec: from: uri: kamelet:source steps: - - set-header: + - setHeader: name: "{{name}}" simple: "{{value}}" From 205bc1f0631f2b5daebfacbf10696fc94bb92daf Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:23:54 +0100 Subject: [PATCH 06/15] Use only camelCase in kamelets yaml - Mail Kamelets Signed-off-by: Andrea Cosentino --- kamelets/mail-imap-source.kamelet.yaml | 8 ++++---- kamelets/mail-sink.kamelet.yaml | 10 +++++----- .../resources/kamelets/mail-imap-source.kamelet.yaml | 8 ++++---- .../src/main/resources/kamelets/mail-sink.kamelet.yaml | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/kamelets/mail-imap-source.kamelet.yaml b/kamelets/mail-imap-source.kamelet.yaml index 68c885c76..768ba1292 100644 --- a/kamelets/mail-imap-source.kamelet.yaml +++ b/kamelets/mail-imap-source.kamelet.yaml @@ -97,16 +97,16 @@ spec: fetchSize: "{{fetchSize}}" delay: "{{delay}}" steps: - - set-header: + - setHeader: name: "ce-subject" simple: "${header.Subject}" - - set-header: + - setHeader: name: "ce-from" simple: "${header.From}" - - set-header: + - setHeader: name: "ce-to" simple: "${header.To}" - - set-header: + - setHeader: name: "ce-cc" simple: "${header.Cc}" - convert-body-to: diff --git a/kamelets/mail-sink.kamelet.yaml b/kamelets/mail-sink.kamelet.yaml index 0f39bcb2e..7a6a2907e 100644 --- a/kamelets/mail-sink.kamelet.yaml +++ b/kamelets/mail-sink.kamelet.yaml @@ -85,31 +85,31 @@ spec: when: - simple: "${header[ce-subject]}" steps: - - set-header: + - setHeader: name: Subject simple: "${header[ce-subject]}" - choice: when: - simple: "${header[ce-from]}" steps: - - set-header: + - setHeader: name: From simple: "${header[ce-from]}" - choice: when: - simple: "${header[ce-to]}" steps: - - set-header: + - setHeader: name: To simple: "${header[ce-to]}" - choice: when: - simple: "${header[ce-cc]}" steps: - - set-header: + - setHeader: name: Cc simple: "${header[ce-cc]}" - - remove-headers: + - removeHeaders: pattern: "ce-*" - to: uri: "smtp:{{connectionHost}}:{{connectionPort}}" diff --git a/library/camel-kamelets/src/main/resources/kamelets/mail-imap-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/mail-imap-source.kamelet.yaml index 68c885c76..768ba1292 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/mail-imap-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/mail-imap-source.kamelet.yaml @@ -97,16 +97,16 @@ spec: fetchSize: "{{fetchSize}}" delay: "{{delay}}" steps: - - set-header: + - setHeader: name: "ce-subject" simple: "${header.Subject}" - - set-header: + - setHeader: name: "ce-from" simple: "${header.From}" - - set-header: + - setHeader: name: "ce-to" simple: "${header.To}" - - set-header: + - setHeader: name: "ce-cc" simple: "${header.Cc}" - convert-body-to: diff --git a/library/camel-kamelets/src/main/resources/kamelets/mail-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/mail-sink.kamelet.yaml index 0f39bcb2e..7a6a2907e 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/mail-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/mail-sink.kamelet.yaml @@ -85,31 +85,31 @@ spec: when: - simple: "${header[ce-subject]}" steps: - - set-header: + - setHeader: name: Subject simple: "${header[ce-subject]}" - choice: when: - simple: "${header[ce-from]}" steps: - - set-header: + - setHeader: name: From simple: "${header[ce-from]}" - choice: when: - simple: "${header[ce-to]}" steps: - - set-header: + - setHeader: name: To simple: "${header[ce-to]}" - choice: when: - simple: "${header[ce-cc]}" steps: - - set-header: + - setHeader: name: Cc simple: "${header[ce-cc]}" - - remove-headers: + - removeHeaders: pattern: "ce-*" - to: uri: "smtp:{{connectionHost}}:{{connectionPort}}" From d30feef3841a3e0da407f578e91926fc0e1dbd2f Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:25:44 +0100 Subject: [PATCH 07/15] Use only camelCase in kamelets yaml - Mask Field Action Kamelet Signed-off-by: Andrea Cosentino --- kamelets/mask-field-action.kamelet.yaml | 8 ++++---- .../resources/kamelets/mask-field-action.kamelet.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kamelets/mask-field-action.kamelet.yaml b/kamelets/mask-field-action.kamelet.yaml index cb7ddac50..bb809276f 100644 --- a/kamelets/mask-field-action.kamelet.yaml +++ b/kamelets/mask-field-action.kamelet.yaml @@ -57,17 +57,17 @@ spec: when: - simple: "${header[Content-Type]} == 'application/json'" steps: - - set-property: + - setProperty: name: deserialized constant: "true" - unmarshal: json: library: Jackson unmarshalType: com.fasterxml.jackson.databind.JsonNode - - set-property: + - setProperty: name: "fields" constant: "{{fields}}" - - set-property: + - setProperty: name: "replacement" constant: "{{replacement}}" - bean: "org.apache.camel.kamelets.utils.transform.MaskField" @@ -79,6 +79,6 @@ spec: json: library: Jackson unmarshalType: com.fasterxml.jackson.databind.JsonNode - - set-header: + - setHeader: name: "Content-Type" constant: "application/json" diff --git a/library/camel-kamelets/src/main/resources/kamelets/mask-field-action.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/mask-field-action.kamelet.yaml index cb7ddac50..bb809276f 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/mask-field-action.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/mask-field-action.kamelet.yaml @@ -57,17 +57,17 @@ spec: when: - simple: "${header[Content-Type]} == 'application/json'" steps: - - set-property: + - setProperty: name: deserialized constant: "true" - unmarshal: json: library: Jackson unmarshalType: com.fasterxml.jackson.databind.JsonNode - - set-property: + - setProperty: name: "fields" constant: "{{fields}}" - - set-property: + - setProperty: name: "replacement" constant: "{{replacement}}" - bean: "org.apache.camel.kamelets.utils.transform.MaskField" @@ -79,6 +79,6 @@ spec: json: library: Jackson unmarshalType: com.fasterxml.jackson.databind.JsonNode - - set-header: + - setHeader: name: "Content-Type" constant: "application/json" From 1de494dcade973116c60844ce522c02ba50e08df Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:26:58 +0100 Subject: [PATCH 08/15] Use only camelCase in kamelets yaml - Message Timestamp Router Action Kamelet Signed-off-by: Andrea Cosentino --- kamelets/message-timestamp-router-action.kamelet.yaml | 10 +++++----- .../message-timestamp-router-action.kamelet.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kamelets/message-timestamp-router-action.kamelet.yaml b/kamelets/message-timestamp-router-action.kamelet.yaml index ae0bc7218..ff773c461 100644 --- a/kamelets/message-timestamp-router-action.kamelet.yaml +++ b/kamelets/message-timestamp-router-action.kamelet.yaml @@ -71,16 +71,16 @@ spec: json: library: Jackson unmarshalType: com.fasterxml.jackson.databind.JsonNode - - set-property: + - setProperty: name: "topicFormat" constant: "{{topicFormat}}" - - set-property: + - setProperty: name: "timestampFormat" constant: "{{timestampFormat}}" - - set-property: + - setProperty: name: "timestampKeys" constant: "{{timestampKeys}}" - - set-property: + - setProperty: name: "timestampKeyFormat" constant: "{{timestampKeyFormat}}" - bean: "org.apache.camel.kamelets.utils.transform.MessageTimestampRouter" @@ -88,6 +88,6 @@ spec: json: library: Jackson unmarshalType: com.fasterxml.jackson.databind.JsonNode - - set-header: + - setHeader: name: "Content-Type" constant: "application/json" diff --git a/library/camel-kamelets/src/main/resources/kamelets/message-timestamp-router-action.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/message-timestamp-router-action.kamelet.yaml index ae0bc7218..ff773c461 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/message-timestamp-router-action.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/message-timestamp-router-action.kamelet.yaml @@ -71,16 +71,16 @@ spec: json: library: Jackson unmarshalType: com.fasterxml.jackson.databind.JsonNode - - set-property: + - setProperty: name: "topicFormat" constant: "{{topicFormat}}" - - set-property: + - setProperty: name: "timestampFormat" constant: "{{timestampFormat}}" - - set-property: + - setProperty: name: "timestampKeys" constant: "{{timestampKeys}}" - - set-property: + - setProperty: name: "timestampKeyFormat" constant: "{{timestampKeyFormat}}" - bean: "org.apache.camel.kamelets.utils.transform.MessageTimestampRouter" @@ -88,6 +88,6 @@ spec: json: library: Jackson unmarshalType: com.fasterxml.jackson.databind.JsonNode - - set-header: + - setHeader: name: "Content-Type" constant: "application/json" From 700bb848bc1ad3f58efb3f0ef637a07bf60bc6d7 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:28:14 +0100 Subject: [PATCH 09/15] Use only camelCase in kamelets yaml - Minio Sink Kamelet Signed-off-by: Andrea Cosentino --- kamelets/minio-sink.kamelet.yaml | 6 +++--- .../src/main/resources/kamelets/minio-sink.kamelet.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kamelets/minio-sink.kamelet.yaml b/kamelets/minio-sink.kamelet.yaml index fe3692afb..554c31203 100644 --- a/kamelets/minio-sink.kamelet.yaml +++ b/kamelets/minio-sink.kamelet.yaml @@ -96,17 +96,17 @@ spec: when: - simple: "${header[file]}" steps: - - set-header: + - setHeader: name: CamelMinioObjectName simple: "${header[file]}" - simple: "${header[ce-file]}" steps: - - set-header: + - setHeader: name: CamelMinioObjectName simple: "${header[ce-file]}" otherwise: steps: - - set-header: + - setHeader: name: CamelMinioObjectName simple: "${exchangeId}" - to: diff --git a/library/camel-kamelets/src/main/resources/kamelets/minio-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/minio-sink.kamelet.yaml index fe3692afb..554c31203 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/minio-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/minio-sink.kamelet.yaml @@ -96,17 +96,17 @@ spec: when: - simple: "${header[file]}" steps: - - set-header: + - setHeader: name: CamelMinioObjectName simple: "${header[file]}" - simple: "${header[ce-file]}" steps: - - set-header: + - setHeader: name: CamelMinioObjectName simple: "${header[ce-file]}" otherwise: steps: - - set-header: + - setHeader: name: CamelMinioObjectName simple: "${exchangeId}" - to: From 30c3f170c5bbd0a902c78508139be1a622b6d1cc Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:30:38 +0100 Subject: [PATCH 10/15] Use only camelCase in kamelets yaml - Mongodb Sink Kamelet Signed-off-by: Andrea Cosentino --- kamelets/mongodb-sink.kamelet.yaml | 4 ++-- .../src/main/resources/kamelets/mongodb-sink.kamelet.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kamelets/mongodb-sink.kamelet.yaml b/kamelets/mongodb-sink.kamelet.yaml index 250cee228..ae4d2c8ca 100644 --- a/kamelets/mongodb-sink.kamelet.yaml +++ b/kamelets/mongodb-sink.kamelet.yaml @@ -122,12 +122,12 @@ spec: when: - simple: "${header[db-upsert]}" steps: - - set-header: + - setHeader: name: CamelMongoDbUpsert simple: "${header[db-upsert]}" - simple: "${header[ce-dbupsert]}" steps: - - set-header: + - setHeader: name: CamelMongoDbUpsert simple: "${header[ce-dbupsert]}" - to: diff --git a/library/camel-kamelets/src/main/resources/kamelets/mongodb-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/mongodb-sink.kamelet.yaml index 250cee228..ae4d2c8ca 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/mongodb-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/mongodb-sink.kamelet.yaml @@ -122,12 +122,12 @@ spec: when: - simple: "${header[db-upsert]}" steps: - - set-header: + - setHeader: name: CamelMongoDbUpsert simple: "${header[db-upsert]}" - simple: "${header[ce-dbupsert]}" steps: - - set-header: + - setHeader: name: CamelMongoDbUpsert simple: "${header[ce-dbupsert]}" - to: From dfa6e6cd5abcd9796c403258aa793a1281a57fd3 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:32:57 +0100 Subject: [PATCH 11/15] Use only camelCase in kamelets yaml - Nominatim Geo Kamelet Signed-off-by: Andrea Cosentino --- kamelets/nominatim-geocode-action.kamelet.yaml | 2 +- .../resources/kamelets/nominatim-geocode-action.kamelet.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kamelets/nominatim-geocode-action.kamelet.yaml b/kamelets/nominatim-geocode-action.kamelet.yaml index 6da3c16f2..98cca04ee 100644 --- a/kamelets/nominatim-geocode-action.kamelet.yaml +++ b/kamelets/nominatim-geocode-action.kamelet.yaml @@ -97,7 +97,7 @@ spec: from: uri: "kamelet:source" steps: - - set-header: + - setHeader: name: CamelGeoCoderAddress simple: "${body}" - to: diff --git a/library/camel-kamelets/src/main/resources/kamelets/nominatim-geocode-action.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/nominatim-geocode-action.kamelet.yaml index 6da3c16f2..98cca04ee 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/nominatim-geocode-action.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/nominatim-geocode-action.kamelet.yaml @@ -97,7 +97,7 @@ spec: from: uri: "kamelet:source" steps: - - set-header: + - setHeader: name: CamelGeoCoderAddress simple: "${body}" - to: From 302fa2b9fdcc7a0ef02a400aa6a47908c4eb35ee Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:34:40 +0100 Subject: [PATCH 12/15] Use only camelCase in kamelets yaml - OGC Api Features Action Kamelet Signed-off-by: Andrea Cosentino --- kamelets/ogcapi-features-action.kamelet.yaml | 12 ++++++------ .../kamelets/ogcapi-features-action.kamelet.yaml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kamelets/ogcapi-features-action.kamelet.yaml b/kamelets/ogcapi-features-action.kamelet.yaml index 4c4ca5bb6..6aa161fd5 100644 --- a/kamelets/ogcapi-features-action.kamelet.yaml +++ b/kamelets/ogcapi-features-action.kamelet.yaml @@ -91,21 +91,21 @@ spec: from: uri: "kamelet:source" steps: - - set-header: + - setHeader: name: "Accept" constant: "application/geo+json" - - set-header: + - setHeader: name: "CamelHttpQuery" simple: "limit={{limit}}&bbox={{bbox}}&{{?query}}&${body}" - - set-body: + - setBody: simple: "" - to: uri: "{{url}}/collections/{{collection}}/items" - - remove-header: + - removeHeader: name: "Accept" - - remove-header: + - removeHeader: name: "CamelHttpQuery" - - convert-body-to: + - convertBodyTo: type: "java.lang.String" - choice: when: diff --git a/library/camel-kamelets/src/main/resources/kamelets/ogcapi-features-action.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/ogcapi-features-action.kamelet.yaml index 4c4ca5bb6..6aa161fd5 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/ogcapi-features-action.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/ogcapi-features-action.kamelet.yaml @@ -91,21 +91,21 @@ spec: from: uri: "kamelet:source" steps: - - set-header: + - setHeader: name: "Accept" constant: "application/geo+json" - - set-header: + - setHeader: name: "CamelHttpQuery" simple: "limit={{limit}}&bbox={{bbox}}&{{?query}}&${body}" - - set-body: + - setBody: simple: "" - to: uri: "{{url}}/collections/{{collection}}/items" - - remove-header: + - removeHeader: name: "Accept" - - remove-header: + - removeHeader: name: "CamelHttpQuery" - - convert-body-to: + - convertBodyTo: type: "java.lang.String" - choice: when: From 7b0f375d71beda0a1d4caf409bfa09b6e859efda Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:36:39 +0100 Subject: [PATCH 13/15] Use only camelCase in kamelets yaml - OpenAI classification Kamelet Signed-off-by: Andrea Cosentino --- .../openai-classification-action.kamelet.yaml | 22 +++++++++---------- .../openai-classification-action.kamelet.yaml | 22 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/kamelets/openai-classification-action.kamelet.yaml b/kamelets/openai-classification-action.kamelet.yaml index b47f92d54..c1d36550c 100644 --- a/kamelets/openai-classification-action.kamelet.yaml +++ b/kamelets/openai-classification-action.kamelet.yaml @@ -89,7 +89,7 @@ spec: when: - simple: "${header[Content-Type]} == null || ${header[Content-Type]} == 'text/plain'" steps: - - convert-body-to: + - convertBodyTo: type: "java.lang.String" - transform: simple: "${bean:type:java.util.Map?method=of('query', ${body})}" @@ -103,39 +103,39 @@ spec: when: - simple: "${body.has('model')} == false" steps: - - set-property: + - setProperty: name: "field" constant: "model" - - set-property: + - setProperty: name: "value" constant: "{{engine}}" - bean: "org.apache.camel.kamelets.utils.transform.InsertField" - - set-property: + - setProperty: name: "file" constant: "{{file:}}" - choice: when: - simple: "${body.has('file')} == false && ${exchangeProperty.file} != null" steps: - - set-property: + - setProperty: name: "field" constant: "file" - - set-property: + - setProperty: name: "value" simple: "${exchangeProperty.file}" - bean: "org.apache.camel.kamelets.utils.transform.InsertField" - marshal: json: {} - - set-header: + - setHeader: name: "Authorization" simple: "Bearer {{authorizationToken}}" - - set-header: + - setHeader: name: "Content-Type" constant: "application/json" - to: "https://api.openai.com/v1/classifications" - - remove-header: + - removeHeader: name: "Authorization" - - set-property: + - setProperty: name: format constant: "{{format}}" - choice: @@ -144,6 +144,6 @@ spec: steps: - transform: jsonpath: "$.label" - - set-header: + - setHeader: name: "Content-Type" constant: "text/plain" diff --git a/library/camel-kamelets/src/main/resources/kamelets/openai-classification-action.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/openai-classification-action.kamelet.yaml index b47f92d54..c1d36550c 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/openai-classification-action.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/openai-classification-action.kamelet.yaml @@ -89,7 +89,7 @@ spec: when: - simple: "${header[Content-Type]} == null || ${header[Content-Type]} == 'text/plain'" steps: - - convert-body-to: + - convertBodyTo: type: "java.lang.String" - transform: simple: "${bean:type:java.util.Map?method=of('query', ${body})}" @@ -103,39 +103,39 @@ spec: when: - simple: "${body.has('model')} == false" steps: - - set-property: + - setProperty: name: "field" constant: "model" - - set-property: + - setProperty: name: "value" constant: "{{engine}}" - bean: "org.apache.camel.kamelets.utils.transform.InsertField" - - set-property: + - setProperty: name: "file" constant: "{{file:}}" - choice: when: - simple: "${body.has('file')} == false && ${exchangeProperty.file} != null" steps: - - set-property: + - setProperty: name: "field" constant: "file" - - set-property: + - setProperty: name: "value" simple: "${exchangeProperty.file}" - bean: "org.apache.camel.kamelets.utils.transform.InsertField" - marshal: json: {} - - set-header: + - setHeader: name: "Authorization" simple: "Bearer {{authorizationToken}}" - - set-header: + - setHeader: name: "Content-Type" constant: "application/json" - to: "https://api.openai.com/v1/classifications" - - remove-header: + - removeHeader: name: "Authorization" - - set-property: + - setProperty: name: format constant: "{{format}}" - choice: @@ -144,6 +144,6 @@ spec: steps: - transform: jsonpath: "$.label" - - set-header: + - setHeader: name: "Content-Type" constant: "text/plain" From 5929ca236bf7a0413424a5cfae18249a0ef6b573 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:38:00 +0100 Subject: [PATCH 14/15] Use only camelCase in kamelets yaml - OpenAI completion Kamelet Signed-off-by: Andrea Cosentino --- kamelets/openai-completion-action.kamelet.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kamelets/openai-completion-action.kamelet.yaml b/kamelets/openai-completion-action.kamelet.yaml index 91f156a46..0edc24289 100644 --- a/kamelets/openai-completion-action.kamelet.yaml +++ b/kamelets/openai-completion-action.kamelet.yaml @@ -81,22 +81,22 @@ spec: when: - simple: "${header[Content-Type]} == null || ${header[Content-Type]} == 'text/plain'" steps: - - convert-body-to: + - convertBodyTo: type: "java.lang.String" - transform: simple: "${bean:type:java.util.Map?method=of('prompt', ${body})}" - marshal: json: {} - - set-header: + - setHeader: name: "Authorization" simple: "Bearer {{authorizationToken}}" - - set-header: + - setHeader: name: "Content-Type" constant: "application/json" - to: "https://api.openai.com/v1/engines/{{engine}}/completions" - - remove-header: + - removeHeader: name: "Authorization" - - set-property: + - setProperty: name: format constant: "{{format}}" - choice: @@ -105,6 +105,6 @@ spec: steps: - transform: jsonpath: "$.choices[0].text" - - set-header: + - setHeader: name: "Content-Type" constant: "text/plain" From 061fa77697d5ffb32002aeb1620bb4e20917588e Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Mon, 13 Nov 2023 10:39:44 +0100 Subject: [PATCH 15/15] Use only camelCase in kamelets yaml - OpenSearch Kamelets Signed-off-by: Andrea Cosentino --- kamelets/opensearch-index-sink.kamelet.yaml | 8 ++++---- kamelets/opensearch-search-source.kamelet.yaml | 2 +- .../kamelets/openai-completion-action.kamelet.yaml | 12 ++++++------ .../kamelets/opensearch-index-sink.kamelet.yaml | 8 ++++---- .../kamelets/opensearch-search-source.kamelet.yaml | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/kamelets/opensearch-index-sink.kamelet.yaml b/kamelets/opensearch-index-sink.kamelet.yaml index 1a1d2a133..bb6f38969 100644 --- a/kamelets/opensearch-index-sink.kamelet.yaml +++ b/kamelets/opensearch-index-sink.kamelet.yaml @@ -115,24 +115,24 @@ spec: when: - simple: "${header[indexId]}" steps: - - set-header: + - setHeader: name: "indexId" simple: "${header[indexId]}" - simple: "${header[ce-indexid]}" steps: - - set-header: + - setHeader: name: "indexId" simple: "${header[ce-indexid]}" - choice: when: - simple: "${header[indexName]}" steps: - - set-header: + - setHeader: name: "indexName" simple: "${header[indexName]}" - simple: "${header[ce-indexname]}" steps: - - set-header: + - setHeader: name: "indexName" simple: "${header[ce-indexname]}" - unmarshal: diff --git a/kamelets/opensearch-search-source.kamelet.yaml b/kamelets/opensearch-search-source.kamelet.yaml index fa914c73b..58cf0172d 100644 --- a/kamelets/opensearch-search-source.kamelet.yaml +++ b/kamelets/opensearch-search-source.kamelet.yaml @@ -110,7 +110,7 @@ spec: parameters: period: "{{period}}" steps: - - set-body: + - setBody: constant: "{{query?nested=false}}" - to: uri: "{{local-opensearch}}:{{clusterName}}" diff --git a/library/camel-kamelets/src/main/resources/kamelets/openai-completion-action.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/openai-completion-action.kamelet.yaml index 91f156a46..0edc24289 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/openai-completion-action.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/openai-completion-action.kamelet.yaml @@ -81,22 +81,22 @@ spec: when: - simple: "${header[Content-Type]} == null || ${header[Content-Type]} == 'text/plain'" steps: - - convert-body-to: + - convertBodyTo: type: "java.lang.String" - transform: simple: "${bean:type:java.util.Map?method=of('prompt', ${body})}" - marshal: json: {} - - set-header: + - setHeader: name: "Authorization" simple: "Bearer {{authorizationToken}}" - - set-header: + - setHeader: name: "Content-Type" constant: "application/json" - to: "https://api.openai.com/v1/engines/{{engine}}/completions" - - remove-header: + - removeHeader: name: "Authorization" - - set-property: + - setProperty: name: format constant: "{{format}}" - choice: @@ -105,6 +105,6 @@ spec: steps: - transform: jsonpath: "$.choices[0].text" - - set-header: + - setHeader: name: "Content-Type" constant: "text/plain" diff --git a/library/camel-kamelets/src/main/resources/kamelets/opensearch-index-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/opensearch-index-sink.kamelet.yaml index 1a1d2a133..bb6f38969 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/opensearch-index-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/opensearch-index-sink.kamelet.yaml @@ -115,24 +115,24 @@ spec: when: - simple: "${header[indexId]}" steps: - - set-header: + - setHeader: name: "indexId" simple: "${header[indexId]}" - simple: "${header[ce-indexid]}" steps: - - set-header: + - setHeader: name: "indexId" simple: "${header[ce-indexid]}" - choice: when: - simple: "${header[indexName]}" steps: - - set-header: + - setHeader: name: "indexName" simple: "${header[indexName]}" - simple: "${header[ce-indexname]}" steps: - - set-header: + - setHeader: name: "indexName" simple: "${header[ce-indexname]}" - unmarshal: diff --git a/library/camel-kamelets/src/main/resources/kamelets/opensearch-search-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/opensearch-search-source.kamelet.yaml index fa914c73b..58cf0172d 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/opensearch-search-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/opensearch-search-source.kamelet.yaml @@ -110,7 +110,7 @@ spec: parameters: period: "{{period}}" steps: - - set-body: + - setBody: constant: "{{query?nested=false}}" - to: uri: "{{local-opensearch}}:{{clusterName}}"