Skip to content

Commit a31399c

Browse files
oscerdclaude
andauthored
Fix #2828: Consolidate JMS AMQP 10 SSL variants into single kamelets (#2831)
Remove separate jms-amqp-10-ssl-source and jms-amqp-10-ssl-sink kamelets and consolidate SSL/TLS support into the existing jms-amqp-10-source and jms-amqp-10-sink kamelets. SSL is handled by the Qpid JMS client via the amqps:// URI scheme, so separate kamelets are unnecessary. Signed-off-by: Andrea Cosentino <ancosen@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent ba9c53c commit a31399c

17 files changed

Lines changed: 8 additions & 427 deletions

docs/modules/ROOT/nav.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@
130130
* xref:jira-update-issue-sink.adoc[]
131131
* xref:jms-amqp-10-sink.adoc[]
132132
* xref:jms-amqp-10-source.adoc[]
133-
* xref:jms-amqp-10-ssl-sink.adoc[]
134-
* xref:jms-amqp-10-ssl-source.adoc[]
135133
* xref:jms-apache-artemis-sink.adoc[]
136134
* xref:jms-apache-artemis-source.adoc[]
137135
* xref:jms-ibm-mq-sink.adoc[]

docs/modules/ROOT/partials/jms-amqp-10-ssl-sink-description.adoc

Lines changed: 0 additions & 24 deletions
This file was deleted.

docs/modules/ROOT/partials/jms-amqp-10-ssl-source-description.adoc

Lines changed: 0 additions & 53 deletions
This file was deleted.

kamelets/jms-amqp-10-sink.kamelet.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ metadata:
3131
spec:
3232
definition:
3333
title: "JMS - AMQP 1.0 Sink"
34-
description: "Send data to any AMQP 1.0 compliant message broker by using the Apache Qpid JMS client."
34+
description: "Send data to any AMQP 1.0 compliant message broker by using the Apache Qpid JMS client. For SSL/TLS connections, use the amqps:// scheme in the remoteURI and configure SSL transport options as query parameters (e.g. transport.trustStoreLocation, transport.trustStorePassword, transport.keyStoreLocation, transport.keyStorePassword, transport.verifyHost, transport.trustAll)."
3535
required:
3636
- destinationName
3737
- remoteURI
@@ -48,7 +48,7 @@ spec:
4848
type: string
4949
remoteURI:
5050
title: "Broker URL"
51-
description: "The JMS URL."
51+
description: "The JMS URL. Use the amqps:// scheme for SSL/TLS connections."
5252
type: string
5353
example: "amqp://my-host:31616"
5454
dependencies:

kamelets/jms-amqp-10-source.kamelet.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ metadata:
3131
spec:
3232
definition:
3333
title: "JMS - AMQP 1.0 Source"
34-
description: "Consume data from any AMQP 1.0 compliant message broker by using the Apache Qpid JMS client."
34+
description: "Consume data from any AMQP 1.0 compliant message broker by using the Apache Qpid JMS client. For SSL/TLS connections, use the amqps:// scheme in the remoteURI and configure SSL transport options as query parameters (e.g. transport.trustStoreLocation, transport.trustStorePassword, transport.keyStoreLocation, transport.keyStorePassword, transport.verifyHost, transport.trustAll)."
3535
required:
3636
- destinationName
3737
- remoteURI
@@ -48,7 +48,7 @@ spec:
4848
type: string
4949
remoteURI:
5050
title: "Broker URL"
51-
description: "The JMS URL."
51+
description: "The JMS URL. Use the amqps:// scheme for SSL/TLS connections."
5252
type: string
5353
example: "amqp://my-host:31616"
5454
dependencies:

kamelets/jms-amqp-10-ssl-sink.kamelet.yaml

Lines changed: 0 additions & 70 deletions
This file was deleted.

kamelets/jms-amqp-10-ssl-source.kamelet.yaml

Lines changed: 0 additions & 70 deletions
This file was deleted.

library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ public enum KameletPrefixSchemeEnum {
7878
jira_transition_issue("jira-transition-issue", "jira"),
7979
jira_update_issue("jira-update-issue", "jira"),
8080
jms_amqp_10("jms-amqp-10", "jms"),
81-
jms_amqp_10_ssl("jms-amqp-10-ssl", "jms"),
8281
jms_apache_artemis("jms-apache-artemis", "jms"),
8382
jms_ibm_mq("jms-ibm-mq", "jms"),
8483
kafka("kafka", "kafka"),

library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ void testSupportedHeaders() throws Exception {
209209
verifyHeaders("jira-oauth-source", 3);
210210
verifyHeaders("jms-amqp-10-source", 15);
211211
verifyHeaders("jms-amqp-10-sink", 18);
212-
verifyHeaders("jms-amqp-10-ssl-source", 15);
213-
verifyHeaders("jms-amqp-10-ssl-sink", 18);
214212
verifyHeaders("jms-apache-artemis-source", 15);
215213
verifyHeaders("jms-apache-artemis-sink", 18);
216214
verifyHeaders("jms-ibm-mq-source", 15);

library/camel-kamelets/src/main/resources/kamelets/jms-amqp-10-sink.kamelet.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ metadata:
3131
spec:
3232
definition:
3333
title: "JMS - AMQP 1.0 Sink"
34-
description: "Send data to any AMQP 1.0 compliant message broker by using the Apache Qpid JMS client."
34+
description: "Send data to any AMQP 1.0 compliant message broker by using the Apache Qpid JMS client. For SSL/TLS connections, use the amqps:// scheme in the remoteURI and configure SSL transport options as query parameters (e.g. transport.trustStoreLocation, transport.trustStorePassword, transport.keyStoreLocation, transport.keyStorePassword, transport.verifyHost, transport.trustAll)."
3535
required:
3636
- destinationName
3737
- remoteURI
@@ -48,7 +48,7 @@ spec:
4848
type: string
4949
remoteURI:
5050
title: "Broker URL"
51-
description: "The JMS URL."
51+
description: "The JMS URL. Use the amqps:// scheme for SSL/TLS connections."
5252
type: string
5353
example: "amqp://my-host:31616"
5454
dependencies:

0 commit comments

Comments
 (0)