This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new d83e3d2f81 Fix doc links for components with multiple URI schemes
d83e3d2f81 is described below
commit d83e3d2f81c7ae07cdf1fda122656420f9d4c7fe
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Tue Apr 2 15:50:01 2024 +0100
Fix doc links for components with multiple URI schemes
---
docs/modules/ROOT/pages/reference/extensions/coap.adoc | 6 +++---
docs/modules/ROOT/pages/reference/extensions/cometd.adoc | 2 +-
docs/modules/ROOT/pages/reference/extensions/disruptor.adoc | 2 +-
docs/modules/ROOT/pages/reference/extensions/http.adoc | 2 +-
docs/modules/ROOT/pages/reference/extensions/mail.adoc | 10 +++++-----
docs/modules/ROOT/pages/reference/extensions/smpp.adoc | 2 +-
.../main/java/org/apache/camel/quarkus/maven/CqCatalog.java | 10 +++++-----
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/coap.adoc
b/docs/modules/ROOT/pages/reference/extensions/coap.adoc
index 2cf160eb12..cb93fced51 100644
--- a/docs/modules/ROOT/pages/reference/extensions/coap.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/coap.adoc
@@ -23,9 +23,9 @@ Send and receive messages to/from COAP capable devices.
== What's inside
* xref:{cq-camel-components}::coap-component.adoc[CoAP component], URI syntax:
`coap:uri`
-* xref:{cq-camel-components}::coap+tcp-component.adoc[CoAP component], URI
syntax: `coap+tcp:uri`
-* xref:{cq-camel-components}::coaps+tcp-component.adoc[CoAP component], URI
syntax: `coaps+tcp:uri`
-* xref:{cq-camel-components}::coaps-component.adoc[CoAP (Secure) component],
URI syntax: `coaps:uri`
+* xref:{cq-camel-components}::coap-component.adoc[CoAP component], URI syntax:
`coap+tcp:uri`
+* xref:{cq-camel-components}::coap-component.adoc[CoAP component], URI syntax:
`coaps+tcp:uri`
+* xref:{cq-camel-components}::coap-component.adoc[CoAP (Secure) component],
URI syntax: `coaps:uri`
Please refer to the above links for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/cometd.adoc
b/docs/modules/ROOT/pages/reference/extensions/cometd.adoc
index e929f31f88..fd6fe09660 100644
--- a/docs/modules/ROOT/pages/reference/extensions/cometd.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/cometd.adoc
@@ -23,7 +23,7 @@ Offers publish/subscribe, peer-to-peer (via a server), and
RPC style messaging u
== What's inside
* xref:{cq-camel-components}::cometd-component.adoc[CometD component], URI
syntax: `cometd:host:port/channelName`
-* xref:{cq-camel-components}::cometds-component.adoc[CometD (Secure)
component], URI syntax: `cometds:host:port/channelName`
+* xref:{cq-camel-components}::cometd-component.adoc[CometD (Secure)
component], URI syntax: `cometds:host:port/channelName`
Please refer to the above links for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/disruptor.adoc
b/docs/modules/ROOT/pages/reference/extensions/disruptor.adoc
index 920c9fece7..454f58093c 100644
--- a/docs/modules/ROOT/pages/reference/extensions/disruptor.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/disruptor.adoc
@@ -23,7 +23,7 @@ Provides asynchronous SEDA behavior using LMAX Disruptor.
== What's inside
* xref:{cq-camel-components}::disruptor-component.adoc[Disruptor component],
URI syntax: `disruptor:name`
-* xref:{cq-camel-components}::disruptor-vm-component.adoc[Disruptor VM
component], URI syntax: `disruptor-vm:name`
+* xref:{cq-camel-components}::disruptor-component.adoc[Disruptor VM
component], URI syntax: `disruptor-vm:name`
Please refer to the above links for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/http.adoc
b/docs/modules/ROOT/pages/reference/extensions/http.adoc
index eea83457a4..80ed30d934 100644
--- a/docs/modules/ROOT/pages/reference/extensions/http.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/http.adoc
@@ -24,7 +24,7 @@ Send requests to external HTTP servers using Apache HTTP
Client 5.x.
== What's inside
* xref:{cq-camel-components}::http-component.adoc[HTTP component], URI syntax:
`http://httpUri`
-* xref:{cq-camel-components}::https-component.adoc[HTTPS (Secure) component],
URI syntax: `https://httpUri`
+* xref:{cq-camel-components}::http-component.adoc[HTTPS (Secure) component],
URI syntax: `https://httpUri`
Please refer to the above links for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/mail.adoc
b/docs/modules/ROOT/pages/reference/extensions/mail.adoc
index c4d697f242..e28df0135f 100644
--- a/docs/modules/ROOT/pages/reference/extensions/mail.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/mail.adoc
@@ -24,12 +24,12 @@ Send and receive emails using imap, pop3 and smtp
protocols. Marshal Camel messa
== What's inside
* xref:{cq-camel-components}::mail-component.adoc[IMAP component], URI syntax:
`imap:host:port`
-* xref:{cq-camel-components}::imaps-component.adoc[IMAPS (Secure) component],
URI syntax: `imaps:host:port`
+* xref:{cq-camel-components}::mail-component.adoc[IMAPS (Secure) component],
URI syntax: `imaps:host:port`
* xref:{cq-camel-components}:dataformats:mimeMultipart-dataformat.adoc[MIME
Multipart data format]
-* xref:{cq-camel-components}::pop3-component.adoc[POP3 component], URI syntax:
`pop3:host:port`
-* xref:{cq-camel-components}::pop3s-component.adoc[POP3S component], URI
syntax: `pop3s:host:port`
-* xref:{cq-camel-components}::smtp-component.adoc[SMTP component], URI syntax:
`smtp:host:port`
-* xref:{cq-camel-components}::smtps-component.adoc[SMTPS component], URI
syntax: `smtps:host:port`
+* xref:{cq-camel-components}::mail-component.adoc[POP3 component], URI syntax:
`pop3:host:port`
+* xref:{cq-camel-components}::mail-component.adoc[POP3S component], URI
syntax: `pop3s:host:port`
+* xref:{cq-camel-components}::mail-component.adoc[SMTP component], URI syntax:
`smtp:host:port`
+* xref:{cq-camel-components}::mail-component.adoc[SMTPS component], URI
syntax: `smtps:host:port`
Please refer to the above links for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/smpp.adoc
b/docs/modules/ROOT/pages/reference/extensions/smpp.adoc
index 21c6d9e9b6..dcdc9d68d7 100644
--- a/docs/modules/ROOT/pages/reference/extensions/smpp.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/smpp.adoc
@@ -23,7 +23,7 @@ Send and receive SMS messages using a SMSC (Short Message
Service Center).
== What's inside
* xref:{cq-camel-components}::smpp-component.adoc[SMPP component], URI syntax:
`smpp:host:port`
-* xref:{cq-camel-components}::smpps-component.adoc[SMPP (Secure) component],
URI syntax: `smpps:host:port`
+* xref:{cq-camel-components}::smpp-component.adoc[SMPP (Secure) component],
URI syntax: `smpps:host:port`
Please refer to the above links for usage and configuration details.
diff --git
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqCatalog.java
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqCatalog.java
index 8a0e548e41..912b1463d7 100644
---
a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqCatalog.java
+++
b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqCatalog.java
@@ -228,7 +228,7 @@ public class CqCatalog {
}
public static boolean isFirstScheme(ArtifactModel<?> model) {
- if (model.getKind().equals("component")) {
+ if (model.getKind().equals(Kind.component)) {
final String altSchemes = ((ComponentModel)
model).getAlternativeSchemes();
if (altSchemes == null || altSchemes.isEmpty()) {
return true;
@@ -244,7 +244,7 @@ public class CqCatalog {
public static boolean hasAlternativeScheme(ArtifactModel<?> model, String
scheme) {
if (scheme.equals(model.getName())) {
return true;
- } else if (model.getKind().equals("component")) {
+ } else if (model.getKind().equals(Kind.component)) {
final String altSchemes = ((ComponentModel)
model).getAlternativeSchemes();
if (altSchemes == null || altSchemes.isEmpty()) {
return false;
@@ -257,14 +257,14 @@ public class CqCatalog {
}
public static ArtifactModel<?> findFirstSchemeModel(ArtifactModel<?>
model, List<ArtifactModel<?>> models) {
- if (model.getKind().equals("component")) {
+ if (model.getKind().equals(Kind.component)) {
final String altSchemes = ((ComponentModel)
model).getAlternativeSchemes();
if (altSchemes == null || altSchemes.isEmpty()) {
return model;
} else {
final String scheme = model.getName();
return models.stream()
- .filter(m -> "component".equals(m.getKind()))
+ .filter(m -> Kind.component.equals(m.getKind()))
.filter(CqCatalog::isFirstScheme)
.filter(m -> CqCatalog.hasAlternativeScheme(m, scheme))
.findFirst()
@@ -286,7 +286,7 @@ public class CqCatalog {
.collect(Collectors.toList());
if (models.size() > 1) {
List<ArtifactModel<?>> componentModels = models.stream()
- .filter(m -> m.getKind().equals("component"))
+ .filter(m -> m.getKind().equals(Kind.component))
.collect(Collectors.toList());
if (componentModels.size() == 1) {
/* If there is only one component take that one */
