Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bean: Use properties instead of property with key and value #1485

Merged
merged 12 commits into from
May 24, 2023
Merged

Bean: Use properties instead of property with key and value #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
46bc886
Bean: Use properties instead of property with key and value - JMS Art…
oscerd May 24, 2023
b0743b3
Bean: Use properties instead of property with key and value - JMS Art…
oscerd May 24, 2023
382dceb
Bean: Use properties instead of property with key and value - JMS Art…
oscerd May 24, 2023
9ffd429
Bean: Use properties instead of property with key and value - JMS Art…
oscerd May 24, 2023
faeb0e3
Bean: Use properties instead of property with key and value - IBM MQ …
oscerd May 24, 2023
53a9db1
Bean: Use properties instead of property with key and value - IBM MQ …
oscerd May 24, 2023
7f61b8d
Bean: Use properties instead of property with key and value - IBM MQ …
oscerd May 24, 2023
626fa3f
Bean: Use properties instead of property with key and value - IBM MQ …
oscerd May 24, 2023
447453e
Bean: Use properties instead of property with key and value - Kafka n…
oscerd May 24, 2023
af88ebd
Bean: Use properties instead of property with key and value - Kafka n…
oscerd May 24, 2023
4853b96
Bean: Use properties instead of property with key and value - Kafka n…
oscerd May 24, 2023
4226663
Bean: Use properties instead of property with key and value - Kafka n…
oscerd May 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions kamelets/jms-apache-artemis-sink.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ spec:
beans:
- name: connectionFactoryBean
type: "#class:org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory"
property:
- key: brokerURL
value: '{{brokerURL}}'
properties:
brokerURL: '{{brokerURL}}'
from:
uri: "kamelet:source"
steps:
Expand Down
5 changes: 2 additions & 3 deletions kamelets/jms-apache-artemis-source.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ spec:
beans:
- name: connectionFactoryBean
type: "#class:org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory"
property:
- key: brokerURL
value: '{{brokerURL}}'
properties:
brokerURL: '{{brokerURL}}'
from:
uri: "jms:{{destinationType}}:{{destinationName}}"
parameters:
Expand Down
29 changes: 10 additions & 19 deletions kamelets/jms-ibm-mq-sink.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,25 +101,16 @@ spec:
beans:
- name: wmqConnectionFactory
type: "#class:com.ibm.mq.jms.MQConnectionFactory"
property:
- key: XMSC_WMQ_HOST_NAME
value: '{{serverName}}'
- key: XMSC_WMQ_PORT
value: '{{serverPort}}'
- key: XMSC_WMQ_CHANNEL
value: '{{channel}}'
- key: XMSC_WMQ_QUEUE_MANAGER
value: '{{queueManager}}'
- key: XMSC_WMQ_CONNECTION_MODE
value: 1
- key: XMSC_USERID
value: '{{username}}'
- key: XMSC_PASSWORD
value: '{{password}}'
- key: XMSC_CLIENT_ID
value: '{{?clientId}}'
- key: XMSC_WMQ_SSL_CIPHER_SUITE
value: '{{?sslCipherSuite}}'
properties:
XMSC_WMQ_HOST_NAME: '{{serverName}}'
XMSC_WMQ_PORT: '{{serverPort}}'
XMSC_WMQ_CHANNEL: '{{channel}}'
XMSC_WMQ_QUEUE_MANAGER: '{{queueManager}}'
XMSC_WMQ_CONNECTION_MODE: 1
XMSC_USERID: '{{username}}'
XMSC_PASSWORD: '{{password}}'
XMSC_CLIENT_ID: '{{?clientId}}'
XMSC_WMQ_SSL_CIPHER_SUITE: '{{?sslCipherSuite}}'
from:
uri: "kamelet:source"
steps:
Expand Down
29 changes: 10 additions & 19 deletions kamelets/jms-ibm-mq-source.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,25 +101,16 @@ spec:
beans:
- name: wmqConnectionFactory
type: "#class:com.ibm.mq.jms.MQConnectionFactory"
property:
- key: XMSC_WMQ_HOST_NAME
value: '{{serverName}}'
- key: XMSC_WMQ_PORT
value: '{{serverPort}}'
- key: XMSC_WMQ_CHANNEL
value: '{{channel}}'
- key: XMSC_WMQ_QUEUE_MANAGER
value: '{{queueManager}}'
- key: XMSC_WMQ_CONNECTION_MODE
value: 1
- key: XMSC_USERID
value: '{{username}}'
- key: XMSC_PASSWORD
value: '{{password}}'
- key: XMSC_CLIENT_ID
value: '{{?clientId}}'
- key: XMSC_WMQ_SSL_CIPHER_SUITE
value: '{{?sslCipherSuite}}'
properties:
XMSC_WMQ_HOST_NAME: '{{serverName}}'
XMSC_WMQ_PORT: '{{serverPort}}'
XMSC_WMQ_CHANNEL: '{{channel}}'
XMSC_WMQ_QUEUE_MANAGER: '{{queueManager}}'
XMSC_WMQ_CONNECTION_MODE: 1
XMSC_USERID: '{{username}}'
XMSC_PASSWORD: '{{password}}'
XMSC_CLIENT_ID: '{{?clientId}}'
XMSC_WMQ_SSL_CIPHER_SUITE: '{{?sslCipherSuite}}'
from:
uri: "jms:{{destinationType}}:{{destinationName}}"
parameters:
Expand Down
14 changes: 5 additions & 9 deletions kamelets/kafka-not-secured-sink.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,11 @@ spec:
beans:
- name: deDuplicateHeaders
type: "#class:org.apache.camel.kamelets.utils.headers.DeDuplicateNamingHeaders"
property:
- key: prefix
value: 'kafka.'
- key: renamingPrefix
value: 'kafka.'
- key: mode
value: 'filtering'
- key: selectedHeaders
value: 'kafka.key,kafka.topic,kafka.override_topic'
properties:
prefix: 'kafka.'
renamingPrefix: 'kafka.'
mode: 'filtering'
selectedHeaders: 'kafka.key,kafka.topic,kafka.override_topic'
from:
uri: "kamelet:source"
steps:
Expand Down
5 changes: 2 additions & 3 deletions kamelets/kafka-not-secured-source.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,8 @@ spec:
beans:
- name: kafkaHeaderDeserializer
type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
property:
- key: enabled
value: '{{deserializeHeaders}}'
properties:
enabled: '{{deserializeHeaders}}'
from:
uri: "kafka:{{topic}}"
parameters:
Expand Down
5 changes: 2 additions & 3 deletions library/camel-kamelets/src/main/resources/kamelets/jms-apache-artemis-sink.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ spec:
beans:
- name: connectionFactoryBean
type: "#class:org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory"
property:
- key: brokerURL
value: '{{brokerURL}}'
properties:
brokerURL: '{{brokerURL}}'
from:
uri: "kamelet:source"
steps:
Expand Down
5 changes: 2 additions & 3 deletions library/camel-kamelets/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ spec:
beans:
- name: connectionFactoryBean
type: "#class:org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory"
property:
- key: brokerURL
value: '{{brokerURL}}'
properties:
brokerURL: '{{brokerURL}}'
from:
uri: "jms:{{destinationType}}:{{destinationName}}"
parameters:
Expand Down
29 changes: 10 additions & 19 deletions library/camel-kamelets/src/main/resources/kamelets/jms-ibm-mq-sink.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,25 +101,16 @@ spec:
beans:
- name: wmqConnectionFactory
type: "#class:com.ibm.mq.jms.MQConnectionFactory"
property:
- key: XMSC_WMQ_HOST_NAME
value: '{{serverName}}'
- key: XMSC_WMQ_PORT
value: '{{serverPort}}'
- key: XMSC_WMQ_CHANNEL
value: '{{channel}}'
- key: XMSC_WMQ_QUEUE_MANAGER
value: '{{queueManager}}'
- key: XMSC_WMQ_CONNECTION_MODE
value: 1
- key: XMSC_USERID
value: '{{username}}'
- key: XMSC_PASSWORD
value: '{{password}}'
- key: XMSC_CLIENT_ID
value: '{{?clientId}}'
- key: XMSC_WMQ_SSL_CIPHER_SUITE
value: '{{?sslCipherSuite}}'
properties:
XMSC_WMQ_HOST_NAME: '{{serverName}}'
XMSC_WMQ_PORT: '{{serverPort}}'
XMSC_WMQ_CHANNEL: '{{channel}}'
XMSC_WMQ_QUEUE_MANAGER: '{{queueManager}}'
XMSC_WMQ_CONNECTION_MODE: 1
XMSC_USERID: '{{username}}'
XMSC_PASSWORD: '{{password}}'
XMSC_CLIENT_ID: '{{?clientId}}'
XMSC_WMQ_SSL_CIPHER_SUITE: '{{?sslCipherSuite}}'
from:
uri: "kamelet:source"
steps:
Expand Down
29 changes: 10 additions & 19 deletions library/camel-kamelets/src/main/resources/kamelets/jms-ibm-mq-source.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,25 +101,16 @@ spec:
beans:
- name: wmqConnectionFactory
type: "#class:com.ibm.mq.jms.MQConnectionFactory"
property:
- key: XMSC_WMQ_HOST_NAME
value: '{{serverName}}'
- key: XMSC_WMQ_PORT
value: '{{serverPort}}'
- key: XMSC_WMQ_CHANNEL
value: '{{channel}}'
- key: XMSC_WMQ_QUEUE_MANAGER
value: '{{queueManager}}'
- key: XMSC_WMQ_CONNECTION_MODE
value: 1
- key: XMSC_USERID
value: '{{username}}'
- key: XMSC_PASSWORD
value: '{{password}}'
- key: XMSC_CLIENT_ID
value: '{{?clientId}}'
- key: XMSC_WMQ_SSL_CIPHER_SUITE
value: '{{?sslCipherSuite}}'
properties:
XMSC_WMQ_HOST_NAME: '{{serverName}}'
XMSC_WMQ_PORT: '{{serverPort}}'
XMSC_WMQ_CHANNEL: '{{channel}}'
XMSC_WMQ_QUEUE_MANAGER: '{{queueManager}}'
XMSC_WMQ_CONNECTION_MODE: 1
XMSC_USERID: '{{username}}'
XMSC_PASSWORD: '{{password}}'
XMSC_CLIENT_ID: '{{?clientId}}'
XMSC_WMQ_SSL_CIPHER_SUITE: '{{?sslCipherSuite}}'
from:
uri: "jms:{{destinationType}}:{{destinationName}}"
parameters:
Expand Down
14 changes: 5 additions & 9 deletions library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,11 @@ spec:
beans:
- name: deDuplicateHeaders
type: "#class:org.apache.camel.kamelets.utils.headers.DeDuplicateNamingHeaders"
property:
- key: prefix
value: 'kafka.'
- key: renamingPrefix
value: 'kafka.'
- key: mode
value: 'filtering'
- key: selectedHeaders
value: 'kafka.key,kafka.topic,kafka.override_topic'
properties:
prefix: 'kafka.'
renamingPrefix: 'kafka.'
mode: 'filtering'
selectedHeaders: 'kafka.key,kafka.topic,kafka.override_topic'
from:
uri: "kamelet:source"
steps:
Expand Down
5 changes: 2 additions & 3 deletions library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-source.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,8 @@ spec:
beans:
- name: kafkaHeaderDeserializer
type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
property:
- key: enabled
value: '{{deserializeHeaders}}'
properties:
enabled: '{{deserializeHeaders}}'
from:
uri: "kafka:{{topic}}"
parameters:
Expand Down