You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2020/11/05 11:37:41 UTC
[camel-spring-boot] branch master updated (04b7bc9 -> bb9ed4f)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.
from 04b7bc9 [create-pull-request] automated change
new 6f98200 fix: xref for component modules naming
new bb9ed4f fix: xref link for local components
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components-starter/README.adoc | 134 ++++++++++-----------
docs/modules/ROOT/pages/list.adoc | 134 ++++++++++-----------
.../camel/springboot/maven/ExtMvelHelper.java | 57 +++------
.../maven/UpdateDocComponentsListMojo.java | 3 +-
4 files changed, 154 insertions(+), 174 deletions(-)
[camel-spring-boot] 02/02: fix: xref link for local components
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit bb9ed4f4e84e64eb1512165f84be7fc7cd7d6056
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Thu Nov 5 11:54:37 2020 +0100
fix: xref link for local components
We have the components from `core` module in the Camel catalog so when
generating the list of starters they get pulled in and linked to the
(main) Camel components reference where they do not exist.
Logic for detecting such components by looking if the `.adoc` files are
present looked at `component-starters` subdirectory of
`docs/modules/ROOT/pages` and did not detect them as local components.
This fixes that as all `.adoc` files are placed within
`docs/modules/ROOT/pages`.
Also cleans up the logic a bit.
---
components-starter/README.adoc | 8 +--
docs/modules/ROOT/pages/list.adoc | 8 +--
.../camel/springboot/maven/ExtMvelHelper.java | 57 ++++++++--------------
.../maven/UpdateDocComponentsListMojo.java | 3 +-
4 files changed, 28 insertions(+), 48 deletions(-)
diff --git a/components-starter/README.adoc b/components-starter/README.adoc
index fcd493e..f301bff 100644
--- a/components-starter/README.adoc
+++ b/components-starter/README.adoc
@@ -885,13 +885,13 @@ Number of miscellaneous extensions: 25 in 25 JAR artifacts (2 deprecated)
| xref:latest@components:others:shiro.adoc[Shiro] | camel-shiro-starter | Stable | 2.5 | Security using Shiro
-| xref:latest@components:others:spring-cloud.adoc[Spring Cloud] | camel-spring-cloud-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud
+| xref:spring-cloud.adoc[Spring Cloud] | camel-spring-cloud-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud
-| xref:latest@components:others:spring-cloud-consul.adoc[Spring Cloud Consul] | camel-spring-cloud-consul-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud Consul
+| xref:spring-cloud-consul.adoc[Spring Cloud Consul] | camel-spring-cloud-consul-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud Consul
-| xref:latest@components:others:spring-cloud-netflix.adoc[Spring Cloud Netflix] | camel-spring-cloud-netflix-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud Netflix
+| xref:spring-cloud-netflix.adoc[Spring Cloud Netflix] | camel-spring-cloud-netflix-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud Netflix
-| xref:latest@components:others:spring-cloud-zookeeper.adoc[Spring Cloud Zookeeper] | camel-spring-cloud-zookeeper-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud Zookeeper
+| xref:spring-cloud-zookeeper.adoc[Spring Cloud Zookeeper] | camel-spring-cloud-zookeeper-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud Zookeeper
| xref:latest@components:others:spring-javaconfig.adoc[Spring Java Configuration] | camel-spring-javaconfig-starter | Stable | 2.0 | *deprecated* Using Camel with Spring Java Configuration
diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc
index fcd493e..f301bff 100644
--- a/docs/modules/ROOT/pages/list.adoc
+++ b/docs/modules/ROOT/pages/list.adoc
@@ -885,13 +885,13 @@ Number of miscellaneous extensions: 25 in 25 JAR artifacts (2 deprecated)
| xref:latest@components:others:shiro.adoc[Shiro] | camel-shiro-starter | Stable | 2.5 | Security using Shiro
-| xref:latest@components:others:spring-cloud.adoc[Spring Cloud] | camel-spring-cloud-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud
+| xref:spring-cloud.adoc[Spring Cloud] | camel-spring-cloud-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud
-| xref:latest@components:others:spring-cloud-consul.adoc[Spring Cloud Consul] | camel-spring-cloud-consul-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud Consul
+| xref:spring-cloud-consul.adoc[Spring Cloud Consul] | camel-spring-cloud-consul-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud Consul
-| xref:latest@components:others:spring-cloud-netflix.adoc[Spring Cloud Netflix] | camel-spring-cloud-netflix-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud Netflix
+| xref:spring-cloud-netflix.adoc[Spring Cloud Netflix] | camel-spring-cloud-netflix-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud Netflix
-| xref:latest@components:others:spring-cloud-zookeeper.adoc[Spring Cloud Zookeeper] | camel-spring-cloud-zookeeper-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud Zookeeper
+| xref:spring-cloud-zookeeper.adoc[Spring Cloud Zookeeper] | camel-spring-cloud-zookeeper-starter | Stable | 2.19 | Camel Cloud integration with Spring Cloud Zookeeper
| xref:latest@components:others:spring-javaconfig.adoc[Spring Java Configuration] | camel-spring-javaconfig-starter | Stable | 2.0 | *deprecated* Using Camel with Spring Java Configuration
diff --git a/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java b/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java
index 208d514..bd5b3a3 100644
--- a/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java
+++ b/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java
@@ -16,16 +16,17 @@
*/
package org.apache.camel.springboot.maven;
+import java.nio.file.Files;
import java.nio.file.Path;
import org.apache.camel.maven.packaging.MvelHelper;
import org.apache.camel.tooling.model.ArtifactModel;
+import org.apache.camel.tooling.model.BaseModel;
import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.model.DataFormatModel;
import org.apache.camel.tooling.model.LanguageModel;
import org.apache.camel.tooling.model.OtherModel;
import org.apache.camel.tooling.model.SupportLevel;
-import org.apache.camel.tooling.util.Strings;
public class ExtMvelHelper {
@@ -39,58 +40,38 @@ public class ExtMvelHelper {
return MvelHelper.escape(raw);
}
- public String getFirstVersionShort(Object model) {
- String version = (String) invokeGetter(model, "getFirstVersion");
+ public String getFirstVersionShort(BaseModel<?> model) {
+ String version = model.getFirstVersion();
return org.apache.camel.tooling.model.Strings.cutLastZeroDigit(version);
}
- public String getSupportLevel(Object model) {
- if (model instanceof ArtifactModel) {
- ArtifactModel am = (ArtifactModel) model;
- if (am.getSupportLevel() != null) {
- return am.getSupportLevel().name();
- } else {
- return SupportLevel.Preview.name();
- }
+ public String getSupportLevel(ArtifactModel<?> model) {
+ final SupportLevel supportLevel = model.getSupportLevel();
+ if (supportLevel != null) {
+ return model.getSupportLevel().name();
}
- return null;
+
+ return SupportLevel.Preview.name();
}
- public String getDocLink(Object model) {
- if (localDocExists(model)) {
- return getLocalDocLink(model);
+ public String getDocLink(ArtifactModel<?> model) {
+ if (isLocalComponent(model)) {
+ return String.format("xref:%s.adoc", ((ArtifactModel<?>) model).getName());
} else if (model instanceof ComponentModel) {
- return String.format("xref:latest@components::%s-component.adoc", invokeGetter(model, "getScheme"));
+ return String.format("xref:latest@components::%s-component.adoc", ((ComponentModel) model).getScheme());
} else if (model instanceof DataFormatModel) {
- return String.format("xref:latest@components:dataformats:%s-dataformat.adoc", invokeGetter(model, "getName"));
+ return String.format("xref:latest@components:dataformats:%s-dataformat.adoc", ((DataFormatModel) model).getName());
} else if (model instanceof LanguageModel) {
- return String.format("xref:latest@components:languages:%s-language.adoc", invokeGetter(model, "getName"));
+ return String.format("xref:latest@components:languages:%s-language.adoc", ((LanguageModel) model).getName());
} else if (model instanceof OtherModel) {
- return String.format("xref:latest@components:others:%s.adoc", invokeGetter(model, "getName"));
+ return String.format("xref:latest@components:others:%s.adoc", ((OtherModel) model).getName());
} else {
return null;
}
}
- private Object invokeGetter(Object model, String method) {
- try {
- return model.getClass().getMethod(method)
- .invoke(model);
- } catch (Exception e) {
- throw new RuntimeException("Unable to access " + method + " from " + model, e);
- }
- }
-
- private boolean localDocExists(Object model) {
- Path path = extensionsDocPath.resolve(getSpringBootDocName(model));
- return path.toFile().exists();
+ private boolean isLocalComponent(ArtifactModel<?> model) {
+ return Files.exists(extensionsDocPath.resolve(((ArtifactModel<?>) model).getName() + ".adoc"));
}
- private String getLocalDocLink(Object model) {
- return "xref:components-starter/" + getSpringBootDocName(model);
- }
-
- private String getSpringBootDocName(Object model) {
- return Strings.after((String) invokeGetter(model, "getArtifactId"), "camel-") + ".adoc";
- }
}
diff --git a/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateDocComponentsListMojo.java b/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateDocComponentsListMojo.java
index 9bc9f8c..0312ded 100644
--- a/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateDocComponentsListMojo.java
+++ b/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateDocComponentsListMojo.java
@@ -20,7 +20,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -628,7 +627,7 @@ public class UpdateDocComponentsListMojo extends AbstractMojo {
}
private Path getComponentsStarterDocPath() {
- return Paths.get(websiteDocBaseDir.toString(), "components-starter");
+ return websiteDocBaseDir.toPath();
}
}
[camel-spring-boot] 01/02: fix: xref for component modules naming
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 6f98200599939f6353d63630e563d33b295aab05
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Nov 4 22:34:44 2020 +0100
fix: xref for component modules naming
Naming of dataformats, languages and other in xrefs was wrong.
---
components-starter/README.adoc | 126 ++++++++++-----------
docs/modules/ROOT/pages/list.adoc | 126 ++++++++++-----------
.../camel/springboot/maven/ExtMvelHelper.java | 4 +-
3 files changed, 128 insertions(+), 128 deletions(-)
diff --git a/components-starter/README.adoc b/components-starter/README.adoc
index 6429ff2..fcd493e 100644
--- a/components-starter/README.adoc
+++ b/components-starter/README.adoc
@@ -704,97 +704,97 @@ Number of Camel data formats: 46 in 38 JAR artifacts (0 deprecated)
|===
| Data Format | Artifact | Support Level | Since | Description
-| xref:latest@components:dataformats:any23.adoc[Any23] | camel-any23-starter | Stable | 3.0 | Extract RDF data from HTML documents.
+| xref:latest@components:dataformats:any23-dataformat.adoc[Any23] | camel-any23-starter | Stable | 3.0 | Extract RDF data from HTML documents.
-| xref:latest@components:dataformats:asn1.adoc[ASN.1 File] | camel-asn1-starter | Stable | 2.20 | Encode and decode data structures using Abstract Syntax Notation One (ASN.1).
+| xref:latest@components:dataformats:asn1-dataformat.adoc[ASN.1 File] | camel-asn1-starter | Stable | 2.20 | Encode and decode data structures using Abstract Syntax Notation One (ASN.1).
-| xref:latest@components:dataformats:avro.adoc[Avro] | camel-avro-starter | Stable | 2.14 | Serialize and deserialize messages using Apache Avro binary data format.
+| xref:latest@components:dataformats:avro-dataformat.adoc[Avro] | camel-avro-starter | Stable | 2.14 | Serialize and deserialize messages using Apache Avro binary data format.
-| xref:latest@components:dataformats:barcode.adoc[Barcode] | camel-barcode-starter | Stable | 2.14 | Transform strings to various 1D/2D barcode bitmap formats and back.
+| xref:latest@components:dataformats:barcode-dataformat.adoc[Barcode] | camel-barcode-starter | Stable | 2.14 | Transform strings to various 1D/2D barcode bitmap formats and back.
-| xref:latest@components:dataformats:base64.adoc[Base64] | camel-base64-starter | Stable | 2.11 | Encode and decode data using Base64.
+| xref:latest@components:dataformats:base64-dataformat.adoc[Base64] | camel-base64-starter | Stable | 2.11 | Encode and decode data using Base64.
-| xref:latest@components:dataformats:beanio.adoc[BeanIO] | camel-beanio-starter | Stable | 2.10 | Marshal and unmarshal Java beans to and from flat files (such as CSV, delimited, or fixed length formats).
+| xref:latest@components:dataformats:beanio-dataformat.adoc[BeanIO] | camel-beanio-starter | Stable | 2.10 | Marshal and unmarshal Java beans to and from flat files (such as CSV, delimited, or fixed length formats).
-| xref:latest@components:dataformats:bindy.adoc[Bindy CSV] | camel-bindy-starter | Stable | 2.0 | Marshal and unmarshal between POJOs and Comma separated values (CSV) format using Camel Bindy
+| xref:latest@components:dataformats:bindy-dataformat.adoc[Bindy CSV] | camel-bindy-starter | Stable | 2.0 | Marshal and unmarshal between POJOs and Comma separated values (CSV) format using Camel Bindy
-| xref:latest@components:dataformats:bindy.adoc[Bindy Fixed Length] | camel-bindy-starter | Stable | 2.0 | Marshal and unmarshal between POJOs and fixed field length format using Camel Bindy
+| xref:latest@components:dataformats:bindy-dataformat.adoc[Bindy Fixed Length] | camel-bindy-starter | Stable | 2.0 | Marshal and unmarshal between POJOs and fixed field length format using Camel Bindy
-| xref:latest@components:dataformats:bindy.adoc[Bindy Key Value Pair] | camel-bindy-starter | Stable | 2.0 | Marshal and unmarshal between POJOs and key-value pair (KVP) format using Camel Bindy
+| xref:latest@components:dataformats:bindy-dataformat.adoc[Bindy Key Value Pair] | camel-bindy-starter | Stable | 2.0 | Marshal and unmarshal between POJOs and key-value pair (KVP) format using Camel Bindy
-| xref:latest@components:dataformats:cbor.adoc[CBOR] | camel-cbor-starter | Stable | 3.0 | Unmarshal a CBOR payload to POJO and back.
+| xref:latest@components:dataformats:cbor-dataformat.adoc[CBOR] | camel-cbor-starter | Stable | 3.0 | Unmarshal a CBOR payload to POJO and back.
-| xref:latest@components:dataformats:crypto.adoc[Crypto (Java Cryptographic Extension)] | camel-crypto-starter | Stable | 2.3 | Encrypt and decrypt messages using Java Cryptography Extension (JCE).
+| xref:latest@components:dataformats:crypto-dataformat.adoc[Crypto (Java Cryptographic Extension)] | camel-crypto-starter | Stable | 2.3 | Encrypt and decrypt messages using Java Cryptography Extension (JCE).
-| xref:latest@components:dataformats:csv.adoc[CSV] | camel-csv-starter | Stable | 1.3 | Handle CSV (Comma Separated Values) payloads.
+| xref:latest@components:dataformats:csv-dataformat.adoc[CSV] | camel-csv-starter | Stable | 1.3 | Handle CSV (Comma Separated Values) payloads.
-| xref:latest@components:dataformats:fhirJson.adoc[FHIR JSon] | camel-fhir-starter | Stable | 2.21 | Marshall and unmarshall FHIR objects to/from JSON.
+| xref:latest@components:dataformats:fhirJson-dataformat.adoc[FHIR JSon] | camel-fhir-starter | Stable | 2.21 | Marshall and unmarshall FHIR objects to/from JSON.
-| xref:latest@components:dataformats:fhirXml.adoc[FHIR XML] | camel-fhir-starter | Stable | 2.21 | Marshall and unmarshall FHIR objects to/from XML.
+| xref:latest@components:dataformats:fhirXml-dataformat.adoc[FHIR XML] | camel-fhir-starter | Stable | 2.21 | Marshall and unmarshall FHIR objects to/from XML.
-| xref:latest@components:dataformats:flatpack.adoc[Flatpack] | camel-flatpack-starter | Stable | 2.1 | Marshal and unmarshal Java lists and maps to/from flat files (such as CSV, delimited, or fixed length formats) using Flatpack library.
+| xref:latest@components:dataformats:flatpack-dataformat.adoc[Flatpack] | camel-flatpack-starter | Stable | 2.1 | Marshal and unmarshal Java lists and maps to/from flat files (such as CSV, delimited, or fixed length formats) using Flatpack library.
-| xref:latest@components:dataformats:grok.adoc[Grok] | camel-grok-starter | Stable | 3.0 | Unmarshal unstructured data to objects using Logstash based Grok patterns.
+| xref:latest@components:dataformats:grok-dataformat.adoc[Grok] | camel-grok-starter | Stable | 3.0 | Unmarshal unstructured data to objects using Logstash based Grok patterns.
-| xref:latest@components:dataformats:gzipdeflater.adoc[GZip Deflater] | camel-zip-deflater-starter | Stable | 2.0 | Compress and decompress messages using java.util.zip.GZIPStream.
+| xref:latest@components:dataformats:gzipdeflater-dataformat.adoc[GZip Deflater] | camel-zip-deflater-starter | Stable | 2.0 | Compress and decompress messages using java.util.zip.GZIPStream.
-| xref:latest@components:dataformats:hl7.adoc[HL7] | camel-hl7-starter | Stable | 2.0 | Marshal and unmarshal HL7 (Health Care) model objects using the HL7 MLLP codec.
+| xref:latest@components:dataformats:hl7-dataformat.adoc[HL7] | camel-hl7-starter | Stable | 2.0 | Marshal and unmarshal HL7 (Health Care) model objects using the HL7 MLLP codec.
-| xref:latest@components:dataformats:ical.adoc[iCal] | camel-ical-starter | Stable | 2.12 | Marshal and unmarshal iCal (.ics) documents to/from model objects provided by the iCal4j library.
+| xref:latest@components:dataformats:ical-dataformat.adoc[iCal] | camel-ical-starter | Stable | 2.12 | Marshal and unmarshal iCal (.ics) documents to/from model objects provided by the iCal4j library.
-| xref:latest@components:dataformats:jacksonxml.adoc[JacksonXML] | camel-jacksonxml-starter | Stable | 2.16 | Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson.
+| xref:latest@components:dataformats:jacksonxml-dataformat.adoc[JacksonXML] | camel-jacksonxml-starter | Stable | 2.16 | Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson.
-| xref:latest@components:dataformats:jaxb.adoc[JAXB] | camel-jaxb-starter | Stable | 1.0 | Unmarshal XML payloads to POJOs and back using JAXB2 XML marshalling standard.
+| xref:latest@components:dataformats:jaxb-dataformat.adoc[JAXB] | camel-jaxb-starter | Stable | 1.0 | Unmarshal XML payloads to POJOs and back using JAXB2 XML marshalling standard.
-| xref:latest@components:dataformats:json-fastjson.adoc[JSON Fastjson] | camel-fastjson-starter | Stable | 2.20 | Marshal POJOs to JSON and back using Fastjson
+| xref:latest@components:dataformats:json-fastjson-dataformat.adoc[JSON Fastjson] | camel-fastjson-starter | Stable | 2.20 | Marshal POJOs to JSON and back using Fastjson
-| xref:latest@components:dataformats:json-gson.adoc[JSON Gson] | camel-gson-starter | Stable | 2.10 | Marshal POJOs to JSON and back using Gson
+| xref:latest@components:dataformats:json-gson-dataformat.adoc[JSON Gson] | camel-gson-starter | Stable | 2.10 | Marshal POJOs to JSON and back using Gson
-| xref:latest@components:dataformats:json-jackson.adoc[JSON Jackson] | camel-jackson-starter | Stable | 2.0 | Marshal POJOs to JSON and back using Jackson
+| xref:latest@components:dataformats:json-jackson-dataformat.adoc[JSON Jackson] | camel-jackson-starter | Stable | 2.0 | Marshal POJOs to JSON and back using Jackson
-| xref:latest@components:dataformats:json-johnzon.adoc[JSON Johnzon] | camel-johnzon-starter | Stable | 2.18 | Marshal POJOs to JSON and back using Johnzon
+| xref:latest@components:dataformats:json-johnzon-dataformat.adoc[JSON Johnzon] | camel-johnzon-starter | Stable | 2.18 | Marshal POJOs to JSON and back using Johnzon
-| xref:latest@components:dataformats:json-jsonb.adoc[JSON JSON-B] | camel-jsonb-starter | Preview | 3.7 | Marshal POJOs to JSON and back using JSON-B.
+| xref:latest@components:dataformats:json-jsonb-dataformat.adoc[JSON JSON-B] | camel-jsonb-starter | Preview | 3.7 | Marshal POJOs to JSON and back using JSON-B.
-| xref:latest@components:dataformats:json-xstream.adoc[JSON XStream] | camel-xstream-starter | Stable | 2.0 | Marshal POJOs to JSON and back using XStream
+| xref:latest@components:dataformats:json-xstream-dataformat.adoc[JSON XStream] | camel-xstream-starter | Stable | 2.0 | Marshal POJOs to JSON and back using XStream
-| xref:latest@components:dataformats:jsonApi.adoc[JSonApi] | camel-jsonapi-starter | Stable | 3.0 | Marshal and unmarshal JSON:API resources using JSONAPI-Converter library.
+| xref:latest@components:dataformats:jsonApi-dataformat.adoc[JSonApi] | camel-jsonapi-starter | Stable | 3.0 | Marshal and unmarshal JSON:API resources using JSONAPI-Converter library.
-| xref:latest@components:dataformats:lzf.adoc[LZF Deflate Compression] | camel-lzf-starter | Stable | 2.17 | Compress and decompress streams using LZF deflate algorithm.
+| xref:latest@components:dataformats:lzf-dataformat.adoc[LZF Deflate Compression] | camel-lzf-starter | Stable | 2.17 | Compress and decompress streams using LZF deflate algorithm.
-| xref:latest@components:dataformats:mime-multipart.adoc[MIME Multipart] | camel-mail-starter | Stable | 2.17 | Marshal Camel messages with attachments into MIME-Multipart messages and back.
+| xref:latest@components:dataformats:mime-multipart-dataformat.adoc[MIME Multipart] | camel-mail-starter | Stable | 2.17 | Marshal Camel messages with attachments into MIME-Multipart messages and back.
-| xref:latest@components:dataformats:pgp.adoc[PGP] | camel-crypto-starter | Stable | 2.9 | Encrypt and decrypt messages using Java Cryptographic Extension (JCE) and PGP.
+| xref:latest@components:dataformats:pgp-dataformat.adoc[PGP] | camel-crypto-starter | Stable | 2.9 | Encrypt and decrypt messages using Java Cryptographic Extension (JCE) and PGP.
-| xref:latest@components:dataformats:protobuf.adoc[Protobuf] | camel-protobuf-starter | Stable | 2.2 | Serialize and deserialize Java objects using Google's Protocol buffers.
+| xref:latest@components:dataformats:protobuf-dataformat.adoc[Protobuf] | camel-protobuf-starter | Stable | 2.2 | Serialize and deserialize Java objects using Google's Protocol buffers.
-| xref:latest@components:dataformats:rss.adoc[RSS] | camel-rss-starter | Stable | 2.1 | Transform from ROME SyndFeed Java Objects to XML and vice-versa.
+| xref:latest@components:dataformats:rss-dataformat.adoc[RSS] | camel-rss-starter | Stable | 2.1 | Transform from ROME SyndFeed Java Objects to XML and vice-versa.
-| xref:latest@components:dataformats:soapjaxb.adoc[SOAP] | camel-soap-starter | Stable | 2.3 | Marshal Java objects to SOAP messages and back.
+| xref:latest@components:dataformats:soapjaxb-dataformat.adoc[SOAP] | camel-soap-starter | Stable | 2.3 | Marshal Java objects to SOAP messages and back.
-| xref:latest@components:dataformats:syslog.adoc[Syslog] | camel-syslog-starter | Stable | 2.6 | Marshall SyslogMessages to RFC3164 and RFC5424 messages and back.
+| xref:latest@components:dataformats:syslog-dataformat.adoc[Syslog] | camel-syslog-starter | Stable | 2.6 | Marshall SyslogMessages to RFC3164 and RFC5424 messages and back.
-| xref:latest@components:dataformats:tarfile.adoc[Tar File] | camel-tarfile-starter | Stable | 2.16 | Archive files into tarballs or extract files from tarballs.
+| xref:latest@components:dataformats:tarfile-dataformat.adoc[Tar File] | camel-tarfile-starter | Stable | 2.16 | Archive files into tarballs or extract files from tarballs.
-| xref:latest@components:dataformats:thrift.adoc[Thrift] | camel-thrift-starter | Stable | 2.20 | Serialize and deserialize messages using Apache Thrift binary data format.
+| xref:latest@components:dataformats:thrift-dataformat.adoc[Thrift] | camel-thrift-starter | Stable | 2.20 | Serialize and deserialize messages using Apache Thrift binary data format.
-| xref:latest@components:dataformats:tidyMarkup.adoc[TidyMarkup] | camel-tagsoup-starter | Stable | 2.0 | Parse (potentially invalid) HTML into valid HTML or DOM.
+| xref:latest@components:dataformats:tidyMarkup-dataformat.adoc[TidyMarkup] | camel-tagsoup-starter | Stable | 2.0 | Parse (potentially invalid) HTML into valid HTML or DOM.
-| xref:latest@components:dataformats:univocity-csv.adoc[uniVocity CSV] | camel-univocity-parsers-starter | Stable | 2.15 | Marshal and unmarshal Java objects from and to CSV (Comma Separated Values) using UniVocity Parsers.
+| xref:latest@components:dataformats:univocity-csv-dataformat.adoc[uniVocity CSV] | camel-univocity-parsers-starter | Stable | 2.15 | Marshal and unmarshal Java objects from and to CSV (Comma Separated Values) using UniVocity Parsers.
-| xref:latest@components:dataformats:univocity-fixed.adoc[uniVocity Fixed Length] | camel-univocity-parsers-starter | Stable | 2.15 | Marshal and unmarshal Java objects from and to fixed length records using UniVocity Parsers.
+| xref:latest@components:dataformats:univocity-fixed-dataformat.adoc[uniVocity Fixed Length] | camel-univocity-parsers-starter | Stable | 2.15 | Marshal and unmarshal Java objects from and to fixed length records using UniVocity Parsers.
-| xref:latest@components:dataformats:univocity-tsv.adoc[uniVocity TSV] | camel-univocity-parsers-starter | Stable | 2.15 | Marshal and unmarshal Java objects from and to TSV (Tab-Separated Values) records using UniVocity Parsers.
+| xref:latest@components:dataformats:univocity-tsv-dataformat.adoc[uniVocity TSV] | camel-univocity-parsers-starter | Stable | 2.15 | Marshal and unmarshal Java objects from and to TSV (Tab-Separated Values) records using UniVocity Parsers.
-| xref:latest@components:dataformats:secureXML.adoc[XML Security] | camel-xmlsecurity-starter | Stable | 2.0 | Encrypt and decrypt XML payloads using Apache Santuario.
+| xref:latest@components:dataformats:secureXML-dataformat.adoc[XML Security] | camel-xmlsecurity-starter | Stable | 2.0 | Encrypt and decrypt XML payloads using Apache Santuario.
-| xref:latest@components:dataformats:xstream.adoc[XStream] | camel-xstream-starter | Stable | 1.3 | Marshal and unmarshal POJOs to/from XML using XStream library.
+| xref:latest@components:dataformats:xstream-dataformat.adoc[XStream] | camel-xstream-starter | Stable | 1.3 | Marshal and unmarshal POJOs to/from XML using XStream library.
-| xref:latest@components:dataformats:yaml-snakeyaml.adoc[YAML SnakeYAML] | camel-snakeyaml-starter | Stable | 2.17 | Marshal and unmarshal Java objects to and from YAML using SnakeYAML
+| xref:latest@components:dataformats:yaml-snakeyaml-dataformat.adoc[YAML SnakeYAML] | camel-snakeyaml-starter | Stable | 2.17 | Marshal and unmarshal Java objects to and from YAML using SnakeYAML
-| xref:latest@components:dataformats:zipdeflater.adoc[Zip Deflate Compression] | camel-zip-deflater-starter | Stable | 2.12 | Compress and decompress streams using java.util.zip.Deflater and java.util.zip.Inflater.
+| xref:latest@components:dataformats:zipdeflater-dataformat.adoc[Zip Deflate Compression] | camel-zip-deflater-starter | Stable | 2.12 | Compress and decompress streams using java.util.zip.Deflater and java.util.zip.Inflater.
-| xref:latest@components:dataformats:zipfile.adoc[Zip File] | camel-zipfile-starter | Stable | 2.11 | Compression and decompress streams using java.util.zip.ZipStream.
+| xref:latest@components:dataformats:zipfile-dataformat.adoc[Zip File] | camel-zipfile-starter | Stable | 2.11 | Compression and decompress streams using java.util.zip.ZipStream.
|===
// dataformats: END
@@ -807,39 +807,39 @@ Number of Camel languages: 17 in 11 JAR artifacts (0 deprecated)
|===
| Language | Artifact | Support Level | Since | Description
-| xref:latest@components:languages:bean.adoc[Bean method] | camel-bean-starter | Stable | 1.3 | Call a method of the specified Java bean passing the Exchange, Body or specific headers to it.
+| xref:latest@components:languages:bean-language.adoc[Bean method] | camel-bean-starter | Stable | 1.3 | Call a method of the specified Java bean passing the Exchange, Body or specific headers to it.
-| xref:latest@components:languages:constant.adoc[Constant] | camel-base | Stable | 1.5 | To use a constant value in Camel expressions or predicates. Important: this is a fixed constant value that is only set once during starting up the route, do not use this if you want dynamic values during routing.
+| xref:latest@components:languages:constant-language.adoc[Constant] | camel-base | Stable | 1.5 | To use a constant value in Camel expressions or predicates. Important: this is a fixed constant value that is only set once during starting up the route, do not use this if you want dynamic values during routing.
-| xref:latest@components:languages:exchangeProperty.adoc[ExchangeProperty] | camel-base | Stable | 2.0 | To use a Camel Exchange property in expressions or predicates.
+| xref:latest@components:languages:exchangeProperty-language.adoc[ExchangeProperty] | camel-base | Stable | 2.0 | To use a Camel Exchange property in expressions or predicates.
-| xref:latest@components:languages:file.adoc[File] | camel-base | Stable | 1.1 | For expressions and predicates using the file/simple language.
+| xref:latest@components:languages:file-language.adoc[File] | camel-base | Stable | 1.1 | For expressions and predicates using the file/simple language.
-| xref:latest@components:languages:groovy.adoc[Groovy] | camel-groovy-starter | Stable | 1.3 | Evaluate a Groovy script.
+| xref:latest@components:languages:groovy-language.adoc[Groovy] | camel-groovy-starter | Stable | 1.3 | Evaluate a Groovy script.
-| xref:latest@components:languages:header.adoc[Header] | camel-base | Stable | 1.5 | To use a Camel Message header in expressions or predicates.
+| xref:latest@components:languages:header-language.adoc[Header] | camel-base | Stable | 1.5 | To use a Camel Message header in expressions or predicates.
-| xref:latest@components:languages:hl7terser.adoc[HL7 Terser] | camel-hl7-starter | Stable | 2.11 | Get the value of an HL7 message field specified by terse location specification syntax.
+| xref:latest@components:languages:hl7terser-language.adoc[HL7 Terser] | camel-hl7-starter | Stable | 2.11 | Get the value of an HL7 message field specified by terse location specification syntax.
-| xref:latest@components:languages:jsonpath.adoc[JsonPath] | camel-jsonpath-starter | Stable | 2.13 | Evaluate a JsonPath expression against a JSON message body.
+| xref:latest@components:languages:jsonpath-language.adoc[JsonPath] | camel-jsonpath-starter | Stable | 2.13 | Evaluate a JsonPath expression against a JSON message body.
-| xref:latest@components:languages:mvel.adoc[MVEL] | camel-mvel-starter | Stable | 2.0 | Evaluate an MVEL template against the Camel Exchange.
+| xref:latest@components:languages:mvel-language.adoc[MVEL] | camel-mvel-starter | Stable | 2.0 | Evaluate an MVEL template against the Camel Exchange.
-| xref:latest@components:languages:ognl.adoc[OGNL] | camel-ognl-starter | Stable | 1.1 | Evaluate an Apache Commons Object Graph Navigation Library (OGNL) expression against the Camel Exchange.
+| xref:latest@components:languages:ognl-language.adoc[OGNL] | camel-ognl-starter | Stable | 1.1 | Evaluate an Apache Commons Object Graph Navigation Library (OGNL) expression against the Camel Exchange.
-| xref:latest@components:languages:ref.adoc[Ref] | camel-base | Stable | 2.8 | Reference to an existing Camel expression or predicate, which is looked up from the Camel registry.
+| xref:latest@components:languages:ref-language.adoc[Ref] | camel-base | Stable | 2.8 | Reference to an existing Camel expression or predicate, which is looked up from the Camel registry.
-| xref:latest@components:languages:simple.adoc[Simple] | camel-base | Stable | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates.
+| xref:latest@components:languages:simple-language.adoc[Simple] | camel-base | Stable | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates.
-| xref:latest@components:languages:spel.adoc[SpEL] | camel-spring-starter | Stable | 2.7 | Evaluate a Spring Expression Language (SpEL) expression against the Camel Exchange.
+| xref:latest@components:languages:spel-language.adoc[SpEL] | camel-spring-starter | Stable | 2.7 | Evaluate a Spring Expression Language (SpEL) expression against the Camel Exchange.
-| xref:latest@components:languages:tokenize.adoc[Tokenize] | camel-base | Stable | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
+| xref:latest@components:languages:tokenize-language.adoc[Tokenize] | camel-base | Stable | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
-| xref:latest@components:languages:xtokenize.adoc[XML Tokenize] | camel-xml-jaxp-starter | Stable | 2.14 | Tokenize XML payloads using the specified path expression.
+| xref:latest@components:languages:xtokenize-language.adoc[XML Tokenize] | camel-xml-jaxp-starter | Stable | 2.14 | Tokenize XML payloads using the specified path expression.
-| xref:latest@components:languages:xpath.adoc[XPath] | camel-xpath-starter | Stable | 1.1 | Evaluate an XPath expression against an XML payload.
+| xref:latest@components:languages:xpath-language.adoc[XPath] | camel-xpath-starter | Stable | 1.1 | Evaluate an XPath expression against an XML payload.
-| xref:latest@components:languages:xquery.adoc[XQuery] | camel-saxon-starter | Stable | 1.0 | Evaluate an XQuery expressions against an XML payload.
+| xref:latest@components:languages:xquery-language.adoc[XQuery] | camel-saxon-starter | Stable | 1.0 | Evaluate an XQuery expressions against an XML payload.
|===
// languages: END
diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc
index 6429ff2..fcd493e 100644
--- a/docs/modules/ROOT/pages/list.adoc
+++ b/docs/modules/ROOT/pages/list.adoc
@@ -704,97 +704,97 @@ Number of Camel data formats: 46 in 38 JAR artifacts (0 deprecated)
|===
| Data Format | Artifact | Support Level | Since | Description
-| xref:latest@components:dataformats:any23.adoc[Any23] | camel-any23-starter | Stable | 3.0 | Extract RDF data from HTML documents.
+| xref:latest@components:dataformats:any23-dataformat.adoc[Any23] | camel-any23-starter | Stable | 3.0 | Extract RDF data from HTML documents.
-| xref:latest@components:dataformats:asn1.adoc[ASN.1 File] | camel-asn1-starter | Stable | 2.20 | Encode and decode data structures using Abstract Syntax Notation One (ASN.1).
+| xref:latest@components:dataformats:asn1-dataformat.adoc[ASN.1 File] | camel-asn1-starter | Stable | 2.20 | Encode and decode data structures using Abstract Syntax Notation One (ASN.1).
-| xref:latest@components:dataformats:avro.adoc[Avro] | camel-avro-starter | Stable | 2.14 | Serialize and deserialize messages using Apache Avro binary data format.
+| xref:latest@components:dataformats:avro-dataformat.adoc[Avro] | camel-avro-starter | Stable | 2.14 | Serialize and deserialize messages using Apache Avro binary data format.
-| xref:latest@components:dataformats:barcode.adoc[Barcode] | camel-barcode-starter | Stable | 2.14 | Transform strings to various 1D/2D barcode bitmap formats and back.
+| xref:latest@components:dataformats:barcode-dataformat.adoc[Barcode] | camel-barcode-starter | Stable | 2.14 | Transform strings to various 1D/2D barcode bitmap formats and back.
-| xref:latest@components:dataformats:base64.adoc[Base64] | camel-base64-starter | Stable | 2.11 | Encode and decode data using Base64.
+| xref:latest@components:dataformats:base64-dataformat.adoc[Base64] | camel-base64-starter | Stable | 2.11 | Encode and decode data using Base64.
-| xref:latest@components:dataformats:beanio.adoc[BeanIO] | camel-beanio-starter | Stable | 2.10 | Marshal and unmarshal Java beans to and from flat files (such as CSV, delimited, or fixed length formats).
+| xref:latest@components:dataformats:beanio-dataformat.adoc[BeanIO] | camel-beanio-starter | Stable | 2.10 | Marshal and unmarshal Java beans to and from flat files (such as CSV, delimited, or fixed length formats).
-| xref:latest@components:dataformats:bindy.adoc[Bindy CSV] | camel-bindy-starter | Stable | 2.0 | Marshal and unmarshal between POJOs and Comma separated values (CSV) format using Camel Bindy
+| xref:latest@components:dataformats:bindy-dataformat.adoc[Bindy CSV] | camel-bindy-starter | Stable | 2.0 | Marshal and unmarshal between POJOs and Comma separated values (CSV) format using Camel Bindy
-| xref:latest@components:dataformats:bindy.adoc[Bindy Fixed Length] | camel-bindy-starter | Stable | 2.0 | Marshal and unmarshal between POJOs and fixed field length format using Camel Bindy
+| xref:latest@components:dataformats:bindy-dataformat.adoc[Bindy Fixed Length] | camel-bindy-starter | Stable | 2.0 | Marshal and unmarshal between POJOs and fixed field length format using Camel Bindy
-| xref:latest@components:dataformats:bindy.adoc[Bindy Key Value Pair] | camel-bindy-starter | Stable | 2.0 | Marshal and unmarshal between POJOs and key-value pair (KVP) format using Camel Bindy
+| xref:latest@components:dataformats:bindy-dataformat.adoc[Bindy Key Value Pair] | camel-bindy-starter | Stable | 2.0 | Marshal and unmarshal between POJOs and key-value pair (KVP) format using Camel Bindy
-| xref:latest@components:dataformats:cbor.adoc[CBOR] | camel-cbor-starter | Stable | 3.0 | Unmarshal a CBOR payload to POJO and back.
+| xref:latest@components:dataformats:cbor-dataformat.adoc[CBOR] | camel-cbor-starter | Stable | 3.0 | Unmarshal a CBOR payload to POJO and back.
-| xref:latest@components:dataformats:crypto.adoc[Crypto (Java Cryptographic Extension)] | camel-crypto-starter | Stable | 2.3 | Encrypt and decrypt messages using Java Cryptography Extension (JCE).
+| xref:latest@components:dataformats:crypto-dataformat.adoc[Crypto (Java Cryptographic Extension)] | camel-crypto-starter | Stable | 2.3 | Encrypt and decrypt messages using Java Cryptography Extension (JCE).
-| xref:latest@components:dataformats:csv.adoc[CSV] | camel-csv-starter | Stable | 1.3 | Handle CSV (Comma Separated Values) payloads.
+| xref:latest@components:dataformats:csv-dataformat.adoc[CSV] | camel-csv-starter | Stable | 1.3 | Handle CSV (Comma Separated Values) payloads.
-| xref:latest@components:dataformats:fhirJson.adoc[FHIR JSon] | camel-fhir-starter | Stable | 2.21 | Marshall and unmarshall FHIR objects to/from JSON.
+| xref:latest@components:dataformats:fhirJson-dataformat.adoc[FHIR JSon] | camel-fhir-starter | Stable | 2.21 | Marshall and unmarshall FHIR objects to/from JSON.
-| xref:latest@components:dataformats:fhirXml.adoc[FHIR XML] | camel-fhir-starter | Stable | 2.21 | Marshall and unmarshall FHIR objects to/from XML.
+| xref:latest@components:dataformats:fhirXml-dataformat.adoc[FHIR XML] | camel-fhir-starter | Stable | 2.21 | Marshall and unmarshall FHIR objects to/from XML.
-| xref:latest@components:dataformats:flatpack.adoc[Flatpack] | camel-flatpack-starter | Stable | 2.1 | Marshal and unmarshal Java lists and maps to/from flat files (such as CSV, delimited, or fixed length formats) using Flatpack library.
+| xref:latest@components:dataformats:flatpack-dataformat.adoc[Flatpack] | camel-flatpack-starter | Stable | 2.1 | Marshal and unmarshal Java lists and maps to/from flat files (such as CSV, delimited, or fixed length formats) using Flatpack library.
-| xref:latest@components:dataformats:grok.adoc[Grok] | camel-grok-starter | Stable | 3.0 | Unmarshal unstructured data to objects using Logstash based Grok patterns.
+| xref:latest@components:dataformats:grok-dataformat.adoc[Grok] | camel-grok-starter | Stable | 3.0 | Unmarshal unstructured data to objects using Logstash based Grok patterns.
-| xref:latest@components:dataformats:gzipdeflater.adoc[GZip Deflater] | camel-zip-deflater-starter | Stable | 2.0 | Compress and decompress messages using java.util.zip.GZIPStream.
+| xref:latest@components:dataformats:gzipdeflater-dataformat.adoc[GZip Deflater] | camel-zip-deflater-starter | Stable | 2.0 | Compress and decompress messages using java.util.zip.GZIPStream.
-| xref:latest@components:dataformats:hl7.adoc[HL7] | camel-hl7-starter | Stable | 2.0 | Marshal and unmarshal HL7 (Health Care) model objects using the HL7 MLLP codec.
+| xref:latest@components:dataformats:hl7-dataformat.adoc[HL7] | camel-hl7-starter | Stable | 2.0 | Marshal and unmarshal HL7 (Health Care) model objects using the HL7 MLLP codec.
-| xref:latest@components:dataformats:ical.adoc[iCal] | camel-ical-starter | Stable | 2.12 | Marshal and unmarshal iCal (.ics) documents to/from model objects provided by the iCal4j library.
+| xref:latest@components:dataformats:ical-dataformat.adoc[iCal] | camel-ical-starter | Stable | 2.12 | Marshal and unmarshal iCal (.ics) documents to/from model objects provided by the iCal4j library.
-| xref:latest@components:dataformats:jacksonxml.adoc[JacksonXML] | camel-jacksonxml-starter | Stable | 2.16 | Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson.
+| xref:latest@components:dataformats:jacksonxml-dataformat.adoc[JacksonXML] | camel-jacksonxml-starter | Stable | 2.16 | Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson.
-| xref:latest@components:dataformats:jaxb.adoc[JAXB] | camel-jaxb-starter | Stable | 1.0 | Unmarshal XML payloads to POJOs and back using JAXB2 XML marshalling standard.
+| xref:latest@components:dataformats:jaxb-dataformat.adoc[JAXB] | camel-jaxb-starter | Stable | 1.0 | Unmarshal XML payloads to POJOs and back using JAXB2 XML marshalling standard.
-| xref:latest@components:dataformats:json-fastjson.adoc[JSON Fastjson] | camel-fastjson-starter | Stable | 2.20 | Marshal POJOs to JSON and back using Fastjson
+| xref:latest@components:dataformats:json-fastjson-dataformat.adoc[JSON Fastjson] | camel-fastjson-starter | Stable | 2.20 | Marshal POJOs to JSON and back using Fastjson
-| xref:latest@components:dataformats:json-gson.adoc[JSON Gson] | camel-gson-starter | Stable | 2.10 | Marshal POJOs to JSON and back using Gson
+| xref:latest@components:dataformats:json-gson-dataformat.adoc[JSON Gson] | camel-gson-starter | Stable | 2.10 | Marshal POJOs to JSON and back using Gson
-| xref:latest@components:dataformats:json-jackson.adoc[JSON Jackson] | camel-jackson-starter | Stable | 2.0 | Marshal POJOs to JSON and back using Jackson
+| xref:latest@components:dataformats:json-jackson-dataformat.adoc[JSON Jackson] | camel-jackson-starter | Stable | 2.0 | Marshal POJOs to JSON and back using Jackson
-| xref:latest@components:dataformats:json-johnzon.adoc[JSON Johnzon] | camel-johnzon-starter | Stable | 2.18 | Marshal POJOs to JSON and back using Johnzon
+| xref:latest@components:dataformats:json-johnzon-dataformat.adoc[JSON Johnzon] | camel-johnzon-starter | Stable | 2.18 | Marshal POJOs to JSON and back using Johnzon
-| xref:latest@components:dataformats:json-jsonb.adoc[JSON JSON-B] | camel-jsonb-starter | Preview | 3.7 | Marshal POJOs to JSON and back using JSON-B.
+| xref:latest@components:dataformats:json-jsonb-dataformat.adoc[JSON JSON-B] | camel-jsonb-starter | Preview | 3.7 | Marshal POJOs to JSON and back using JSON-B.
-| xref:latest@components:dataformats:json-xstream.adoc[JSON XStream] | camel-xstream-starter | Stable | 2.0 | Marshal POJOs to JSON and back using XStream
+| xref:latest@components:dataformats:json-xstream-dataformat.adoc[JSON XStream] | camel-xstream-starter | Stable | 2.0 | Marshal POJOs to JSON and back using XStream
-| xref:latest@components:dataformats:jsonApi.adoc[JSonApi] | camel-jsonapi-starter | Stable | 3.0 | Marshal and unmarshal JSON:API resources using JSONAPI-Converter library.
+| xref:latest@components:dataformats:jsonApi-dataformat.adoc[JSonApi] | camel-jsonapi-starter | Stable | 3.0 | Marshal and unmarshal JSON:API resources using JSONAPI-Converter library.
-| xref:latest@components:dataformats:lzf.adoc[LZF Deflate Compression] | camel-lzf-starter | Stable | 2.17 | Compress and decompress streams using LZF deflate algorithm.
+| xref:latest@components:dataformats:lzf-dataformat.adoc[LZF Deflate Compression] | camel-lzf-starter | Stable | 2.17 | Compress and decompress streams using LZF deflate algorithm.
-| xref:latest@components:dataformats:mime-multipart.adoc[MIME Multipart] | camel-mail-starter | Stable | 2.17 | Marshal Camel messages with attachments into MIME-Multipart messages and back.
+| xref:latest@components:dataformats:mime-multipart-dataformat.adoc[MIME Multipart] | camel-mail-starter | Stable | 2.17 | Marshal Camel messages with attachments into MIME-Multipart messages and back.
-| xref:latest@components:dataformats:pgp.adoc[PGP] | camel-crypto-starter | Stable | 2.9 | Encrypt and decrypt messages using Java Cryptographic Extension (JCE) and PGP.
+| xref:latest@components:dataformats:pgp-dataformat.adoc[PGP] | camel-crypto-starter | Stable | 2.9 | Encrypt and decrypt messages using Java Cryptographic Extension (JCE) and PGP.
-| xref:latest@components:dataformats:protobuf.adoc[Protobuf] | camel-protobuf-starter | Stable | 2.2 | Serialize and deserialize Java objects using Google's Protocol buffers.
+| xref:latest@components:dataformats:protobuf-dataformat.adoc[Protobuf] | camel-protobuf-starter | Stable | 2.2 | Serialize and deserialize Java objects using Google's Protocol buffers.
-| xref:latest@components:dataformats:rss.adoc[RSS] | camel-rss-starter | Stable | 2.1 | Transform from ROME SyndFeed Java Objects to XML and vice-versa.
+| xref:latest@components:dataformats:rss-dataformat.adoc[RSS] | camel-rss-starter | Stable | 2.1 | Transform from ROME SyndFeed Java Objects to XML and vice-versa.
-| xref:latest@components:dataformats:soapjaxb.adoc[SOAP] | camel-soap-starter | Stable | 2.3 | Marshal Java objects to SOAP messages and back.
+| xref:latest@components:dataformats:soapjaxb-dataformat.adoc[SOAP] | camel-soap-starter | Stable | 2.3 | Marshal Java objects to SOAP messages and back.
-| xref:latest@components:dataformats:syslog.adoc[Syslog] | camel-syslog-starter | Stable | 2.6 | Marshall SyslogMessages to RFC3164 and RFC5424 messages and back.
+| xref:latest@components:dataformats:syslog-dataformat.adoc[Syslog] | camel-syslog-starter | Stable | 2.6 | Marshall SyslogMessages to RFC3164 and RFC5424 messages and back.
-| xref:latest@components:dataformats:tarfile.adoc[Tar File] | camel-tarfile-starter | Stable | 2.16 | Archive files into tarballs or extract files from tarballs.
+| xref:latest@components:dataformats:tarfile-dataformat.adoc[Tar File] | camel-tarfile-starter | Stable | 2.16 | Archive files into tarballs or extract files from tarballs.
-| xref:latest@components:dataformats:thrift.adoc[Thrift] | camel-thrift-starter | Stable | 2.20 | Serialize and deserialize messages using Apache Thrift binary data format.
+| xref:latest@components:dataformats:thrift-dataformat.adoc[Thrift] | camel-thrift-starter | Stable | 2.20 | Serialize and deserialize messages using Apache Thrift binary data format.
-| xref:latest@components:dataformats:tidyMarkup.adoc[TidyMarkup] | camel-tagsoup-starter | Stable | 2.0 | Parse (potentially invalid) HTML into valid HTML or DOM.
+| xref:latest@components:dataformats:tidyMarkup-dataformat.adoc[TidyMarkup] | camel-tagsoup-starter | Stable | 2.0 | Parse (potentially invalid) HTML into valid HTML or DOM.
-| xref:latest@components:dataformats:univocity-csv.adoc[uniVocity CSV] | camel-univocity-parsers-starter | Stable | 2.15 | Marshal and unmarshal Java objects from and to CSV (Comma Separated Values) using UniVocity Parsers.
+| xref:latest@components:dataformats:univocity-csv-dataformat.adoc[uniVocity CSV] | camel-univocity-parsers-starter | Stable | 2.15 | Marshal and unmarshal Java objects from and to CSV (Comma Separated Values) using UniVocity Parsers.
-| xref:latest@components:dataformats:univocity-fixed.adoc[uniVocity Fixed Length] | camel-univocity-parsers-starter | Stable | 2.15 | Marshal and unmarshal Java objects from and to fixed length records using UniVocity Parsers.
+| xref:latest@components:dataformats:univocity-fixed-dataformat.adoc[uniVocity Fixed Length] | camel-univocity-parsers-starter | Stable | 2.15 | Marshal and unmarshal Java objects from and to fixed length records using UniVocity Parsers.
-| xref:latest@components:dataformats:univocity-tsv.adoc[uniVocity TSV] | camel-univocity-parsers-starter | Stable | 2.15 | Marshal and unmarshal Java objects from and to TSV (Tab-Separated Values) records using UniVocity Parsers.
+| xref:latest@components:dataformats:univocity-tsv-dataformat.adoc[uniVocity TSV] | camel-univocity-parsers-starter | Stable | 2.15 | Marshal and unmarshal Java objects from and to TSV (Tab-Separated Values) records using UniVocity Parsers.
-| xref:latest@components:dataformats:secureXML.adoc[XML Security] | camel-xmlsecurity-starter | Stable | 2.0 | Encrypt and decrypt XML payloads using Apache Santuario.
+| xref:latest@components:dataformats:secureXML-dataformat.adoc[XML Security] | camel-xmlsecurity-starter | Stable | 2.0 | Encrypt and decrypt XML payloads using Apache Santuario.
-| xref:latest@components:dataformats:xstream.adoc[XStream] | camel-xstream-starter | Stable | 1.3 | Marshal and unmarshal POJOs to/from XML using XStream library.
+| xref:latest@components:dataformats:xstream-dataformat.adoc[XStream] | camel-xstream-starter | Stable | 1.3 | Marshal and unmarshal POJOs to/from XML using XStream library.
-| xref:latest@components:dataformats:yaml-snakeyaml.adoc[YAML SnakeYAML] | camel-snakeyaml-starter | Stable | 2.17 | Marshal and unmarshal Java objects to and from YAML using SnakeYAML
+| xref:latest@components:dataformats:yaml-snakeyaml-dataformat.adoc[YAML SnakeYAML] | camel-snakeyaml-starter | Stable | 2.17 | Marshal and unmarshal Java objects to and from YAML using SnakeYAML
-| xref:latest@components:dataformats:zipdeflater.adoc[Zip Deflate Compression] | camel-zip-deflater-starter | Stable | 2.12 | Compress and decompress streams using java.util.zip.Deflater and java.util.zip.Inflater.
+| xref:latest@components:dataformats:zipdeflater-dataformat.adoc[Zip Deflate Compression] | camel-zip-deflater-starter | Stable | 2.12 | Compress and decompress streams using java.util.zip.Deflater and java.util.zip.Inflater.
-| xref:latest@components:dataformats:zipfile.adoc[Zip File] | camel-zipfile-starter | Stable | 2.11 | Compression and decompress streams using java.util.zip.ZipStream.
+| xref:latest@components:dataformats:zipfile-dataformat.adoc[Zip File] | camel-zipfile-starter | Stable | 2.11 | Compression and decompress streams using java.util.zip.ZipStream.
|===
// dataformats: END
@@ -807,39 +807,39 @@ Number of Camel languages: 17 in 11 JAR artifacts (0 deprecated)
|===
| Language | Artifact | Support Level | Since | Description
-| xref:latest@components:languages:bean.adoc[Bean method] | camel-bean-starter | Stable | 1.3 | Call a method of the specified Java bean passing the Exchange, Body or specific headers to it.
+| xref:latest@components:languages:bean-language.adoc[Bean method] | camel-bean-starter | Stable | 1.3 | Call a method of the specified Java bean passing the Exchange, Body or specific headers to it.
-| xref:latest@components:languages:constant.adoc[Constant] | camel-base | Stable | 1.5 | To use a constant value in Camel expressions or predicates. Important: this is a fixed constant value that is only set once during starting up the route, do not use this if you want dynamic values during routing.
+| xref:latest@components:languages:constant-language.adoc[Constant] | camel-base | Stable | 1.5 | To use a constant value in Camel expressions or predicates. Important: this is a fixed constant value that is only set once during starting up the route, do not use this if you want dynamic values during routing.
-| xref:latest@components:languages:exchangeProperty.adoc[ExchangeProperty] | camel-base | Stable | 2.0 | To use a Camel Exchange property in expressions or predicates.
+| xref:latest@components:languages:exchangeProperty-language.adoc[ExchangeProperty] | camel-base | Stable | 2.0 | To use a Camel Exchange property in expressions or predicates.
-| xref:latest@components:languages:file.adoc[File] | camel-base | Stable | 1.1 | For expressions and predicates using the file/simple language.
+| xref:latest@components:languages:file-language.adoc[File] | camel-base | Stable | 1.1 | For expressions and predicates using the file/simple language.
-| xref:latest@components:languages:groovy.adoc[Groovy] | camel-groovy-starter | Stable | 1.3 | Evaluate a Groovy script.
+| xref:latest@components:languages:groovy-language.adoc[Groovy] | camel-groovy-starter | Stable | 1.3 | Evaluate a Groovy script.
-| xref:latest@components:languages:header.adoc[Header] | camel-base | Stable | 1.5 | To use a Camel Message header in expressions or predicates.
+| xref:latest@components:languages:header-language.adoc[Header] | camel-base | Stable | 1.5 | To use a Camel Message header in expressions or predicates.
-| xref:latest@components:languages:hl7terser.adoc[HL7 Terser] | camel-hl7-starter | Stable | 2.11 | Get the value of an HL7 message field specified by terse location specification syntax.
+| xref:latest@components:languages:hl7terser-language.adoc[HL7 Terser] | camel-hl7-starter | Stable | 2.11 | Get the value of an HL7 message field specified by terse location specification syntax.
-| xref:latest@components:languages:jsonpath.adoc[JsonPath] | camel-jsonpath-starter | Stable | 2.13 | Evaluate a JsonPath expression against a JSON message body.
+| xref:latest@components:languages:jsonpath-language.adoc[JsonPath] | camel-jsonpath-starter | Stable | 2.13 | Evaluate a JsonPath expression against a JSON message body.
-| xref:latest@components:languages:mvel.adoc[MVEL] | camel-mvel-starter | Stable | 2.0 | Evaluate an MVEL template against the Camel Exchange.
+| xref:latest@components:languages:mvel-language.adoc[MVEL] | camel-mvel-starter | Stable | 2.0 | Evaluate an MVEL template against the Camel Exchange.
-| xref:latest@components:languages:ognl.adoc[OGNL] | camel-ognl-starter | Stable | 1.1 | Evaluate an Apache Commons Object Graph Navigation Library (OGNL) expression against the Camel Exchange.
+| xref:latest@components:languages:ognl-language.adoc[OGNL] | camel-ognl-starter | Stable | 1.1 | Evaluate an Apache Commons Object Graph Navigation Library (OGNL) expression against the Camel Exchange.
-| xref:latest@components:languages:ref.adoc[Ref] | camel-base | Stable | 2.8 | Reference to an existing Camel expression or predicate, which is looked up from the Camel registry.
+| xref:latest@components:languages:ref-language.adoc[Ref] | camel-base | Stable | 2.8 | Reference to an existing Camel expression or predicate, which is looked up from the Camel registry.
-| xref:latest@components:languages:simple.adoc[Simple] | camel-base | Stable | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates.
+| xref:latest@components:languages:simple-language.adoc[Simple] | camel-base | Stable | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates.
-| xref:latest@components:languages:spel.adoc[SpEL] | camel-spring-starter | Stable | 2.7 | Evaluate a Spring Expression Language (SpEL) expression against the Camel Exchange.
+| xref:latest@components:languages:spel-language.adoc[SpEL] | camel-spring-starter | Stable | 2.7 | Evaluate a Spring Expression Language (SpEL) expression against the Camel Exchange.
-| xref:latest@components:languages:tokenize.adoc[Tokenize] | camel-base | Stable | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
+| xref:latest@components:languages:tokenize-language.adoc[Tokenize] | camel-base | Stable | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
-| xref:latest@components:languages:xtokenize.adoc[XML Tokenize] | camel-xml-jaxp-starter | Stable | 2.14 | Tokenize XML payloads using the specified path expression.
+| xref:latest@components:languages:xtokenize-language.adoc[XML Tokenize] | camel-xml-jaxp-starter | Stable | 2.14 | Tokenize XML payloads using the specified path expression.
-| xref:latest@components:languages:xpath.adoc[XPath] | camel-xpath-starter | Stable | 1.1 | Evaluate an XPath expression against an XML payload.
+| xref:latest@components:languages:xpath-language.adoc[XPath] | camel-xpath-starter | Stable | 1.1 | Evaluate an XPath expression against an XML payload.
-| xref:latest@components:languages:xquery.adoc[XQuery] | camel-saxon-starter | Stable | 1.0 | Evaluate an XQuery expressions against an XML payload.
+| xref:latest@components:languages:xquery-language.adoc[XQuery] | camel-saxon-starter | Stable | 1.0 | Evaluate an XQuery expressions against an XML payload.
|===
// languages: END
diff --git a/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java b/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java
index 9bced50..208d514 100644
--- a/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java
+++ b/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java
@@ -62,9 +62,9 @@ public class ExtMvelHelper {
} else if (model instanceof ComponentModel) {
return String.format("xref:latest@components::%s-component.adoc", invokeGetter(model, "getScheme"));
} else if (model instanceof DataFormatModel) {
- return String.format("xref:latest@components:dataformats:%s.adoc", invokeGetter(model, "getName"));
+ return String.format("xref:latest@components:dataformats:%s-dataformat.adoc", invokeGetter(model, "getName"));
} else if (model instanceof LanguageModel) {
- return String.format("xref:latest@components:languages:%s.adoc", invokeGetter(model, "getName"));
+ return String.format("xref:latest@components:languages:%s-language.adoc", invokeGetter(model, "getName"));
} else if (model instanceof OtherModel) {
return String.format("xref:latest@components:others:%s.adoc", invokeGetter(model, "getName"));
} else {