You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/08/09 10:19:45 UTC
(camel) branch doc-lab created (now 1e5570eb0d9)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch doc-lab
in repository https://gitbox.apache.org/repos/asf/camel.git
at 1e5570eb0d9 CAMEL-21055: camel-core-model - Adjust label on EIP nodes so they are more accurte and we have marshal/unmarshal as EIPs
This branch includes the following new commits:
new 1e5570eb0d9 CAMEL-21055: camel-core-model - Adjust label on EIP nodes so they are more accurte and we have marshal/unmarshal as EIPs
The 1 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.
(camel) 01/01: CAMEL-21055: camel-core-model - Adjust label on EIP nodes so they are more accurte and we have marshal/unmarshal as EIPs
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch doc-lab
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1e5570eb0d9686f60ac7c401939578ebc2ae7be8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Aug 9 12:18:26 2024 +0200
CAMEL-21055: camel-core-model - Adjust label on EIP nodes so they are more accurte and we have marshal/unmarshal as EIPs
---
.../org/apache/camel/catalog/models/circuitBreaker.json | 2 +-
.../resources/org/apache/camel/catalog/models/doTry.json | 2 +-
.../camel/catalog/models/faultToleranceConfiguration.json | 2 +-
.../org/apache/camel/catalog/models/langChain4j.json | 4 ++--
.../resources/org/apache/camel/catalog/models/marshal.json | 2 +-
.../org/apache/camel/catalog/models/onFallback.json | 2 +-
.../camel/catalog/models/resilience4jConfiguration.json | 2 +-
.../org/apache/camel/catalog/models/routeTemplates.json | 2 +-
.../resources/org/apache/camel/catalog/models/sort.json | 2 +-
.../org/apache/camel/catalog/models/unmarshal.json | 2 +-
.../org/apache/camel/catalog/schemas/camel-spring.xsd | 14 +++++++-------
.../src/main/docs/modules/eips/examples/json/doTry.json | 1 +
.../eips/examples/json/faultToleranceConfiguration.json | 1 -
.../main/docs/modules/eips/examples/json/langChain4j.json | 1 +
.../src/main/docs/modules/eips/examples/json/marshal.json | 1 +
.../main/docs/modules/eips/examples/json/onFallback.json | 1 -
.../eips/examples/json/resilience4jConfiguration.json | 1 -
.../main/docs/modules/eips/examples/json/unmarshal.json | 1 +
core/camel-core-engine/src/main/docs/modules/eips/nav.adoc | 4 ++--
.../src/main/docs/modules/eips/pages/marshal-eip.adoc | 6 +++++-
.../src/main/docs/modules/eips/pages/unmarshal-eip.adoc | 5 +++++
.../META-INF/org/apache/camel/model/circuitBreaker.json | 2 +-
.../resources/META-INF/org/apache/camel/model/doTry.json | 2 +-
.../apache/camel/model/faultToleranceConfiguration.json | 2 +-
.../resources/META-INF/org/apache/camel/model/marshal.json | 2 +-
.../META-INF/org/apache/camel/model/onFallback.json | 2 +-
.../org/apache/camel/model/resilience4jConfiguration.json | 2 +-
.../META-INF/org/apache/camel/model/routeTemplates.json | 2 +-
.../resources/META-INF/org/apache/camel/model/sort.json | 2 +-
.../org/apache/camel/model/tokenizer/langChain4j.json | 4 ++--
.../META-INF/org/apache/camel/model/unmarshal.json | 2 +-
.../org/apache/camel/model/CircuitBreakerDefinition.java | 2 +-
.../camel/model/FaultToleranceConfigurationDefinition.java | 2 +-
.../java/org/apache/camel/model/MarshalDefinition.java | 2 +-
.../java/org/apache/camel/model/OnFallbackDefinition.java | 2 +-
.../main/java/org/apache/camel/model/OutputDefinition.java | 2 --
.../java/org/apache/camel/model/PropertyDefinitions.java | 2 ++
.../camel/model/Resilience4jConfigurationDefinition.java | 2 +-
.../org/apache/camel/model/RouteTemplatesDefinition.java | 2 +-
.../main/java/org/apache/camel/model/SortDefinition.java | 2 +-
.../java/org/apache/camel/model/TokenizerDefinition.java | 5 ++---
.../main/java/org/apache/camel/model/TryDefinition.java | 2 +-
.../java/org/apache/camel/model/UnmarshalDefinition.java | 2 +-
.../model/tokenizer/LangChain4jTokenizerDefinition.java | 6 ++----
.../camel/dsl/yaml/deserializers/ModelDeserializers.java | 2 +-
.../src/generated/resources/schema/camelYamlDsl.json | 2 +-
46 files changed, 62 insertions(+), 55 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/circuitBreaker.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/circuitBreaker.json
index 1e0ead30245..0988fe8be5f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/circuitBreaker.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/circuitBreaker.json
@@ -5,7 +5,7 @@
"title": "Circuit Breaker",
"description": "Route messages in a fault tolerance way using Circuit Breaker",
"deprecated": false,
- "label": "eip,routing",
+ "label": "eip,routing,error",
"javaType": "org.apache.camel.model.CircuitBreakerDefinition",
"abstract": false,
"input": true,
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/doTry.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/doTry.json
index db7fd3a740e..312cd3e9f02 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/doTry.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/doTry.json
@@ -5,7 +5,7 @@
"title": "Do Try",
"description": "Marks the beginning of a try, catch, finally block",
"deprecated": false,
- "label": "error",
+ "label": "eip,routing,error",
"javaType": "org.apache.camel.model.TryDefinition",
"abstract": false,
"input": true,
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json
index 6c15b680640..167680c801b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json
@@ -5,7 +5,7 @@
"title": "Fault Tolerance Configuration",
"description": "MicroProfile Fault Tolerance Circuit Breaker EIP configuration",
"deprecated": false,
- "label": "configuration,eip",
+ "label": "configuration,error",
"javaType": "org.apache.camel.model.FaultToleranceConfigurationDefinition",
"abstract": false,
"input": false,
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/langChain4j.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/langChain4j.json
index cec86e6a5ff..058b23baf82 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/langChain4j.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/langChain4j.json
@@ -3,10 +3,10 @@
"kind": "model",
"name": "langChain4j",
"title": "LangChain4J Tokenizer",
- "description": "Represents a tokenizer that uses LangChain4j for tokenization",
+ "description": "Tokenizer that uses LangChain4j for tokenization.",
"deprecated": false,
"firstVersion": "4.8.0",
- "label": "tokenizer,transformation,ai",
+ "label": "eip,transformation,ai",
"javaType": "org.apache.camel.model.tokenizer.LangChain4jTokenizerDefinition",
"abstract": false,
"input": true,
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json
index a7c6c2c18ad..12580b489be 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/marshal.json
@@ -5,7 +5,7 @@
"title": "Marshal",
"description": "Marshals data into a specified format for transmission over a transport or component",
"deprecated": false,
- "label": "dataformat,transformation",
+ "label": "eip,dataformat,transformation",
"javaType": "org.apache.camel.model.MarshalDefinition",
"abstract": false,
"input": true,
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onFallback.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onFallback.json
index 7e8b787f47e..4ad122be0f5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onFallback.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onFallback.json
@@ -5,7 +5,7 @@
"title": "On Fallback",
"description": "Route to be executed when Circuit Breaker EIP executes fallback",
"deprecated": false,
- "label": "eip,routing",
+ "label": "error",
"javaType": "org.apache.camel.model.OnFallbackDefinition",
"abstract": false,
"input": true,
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/resilience4jConfiguration.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/resilience4jConfiguration.json
index 26b6bdaf870..7a8667b9dcc 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/resilience4jConfiguration.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/resilience4jConfiguration.json
@@ -5,7 +5,7 @@
"title": "Resilience4j Configuration",
"description": "Resilience4j Circuit Breaker EIP configuration",
"deprecated": false,
- "label": "configuration,eip",
+ "label": "configuration,error",
"javaType": "org.apache.camel.model.Resilience4jConfigurationDefinition",
"abstract": false,
"input": false,
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplates.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplates.json
index ec69c7c1313..afe4f687d34 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplates.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplates.json
@@ -5,7 +5,7 @@
"title": "Route Templates",
"description": "A series of route templates",
"deprecated": false,
- "label": "routeTemplates",
+ "label": "configuration",
"javaType": "org.apache.camel.model.RouteTemplatesDefinition",
"abstract": false,
"input": false,
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sort.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sort.json
index d49a98c3b10..5b9e9325422 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sort.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sort.json
@@ -5,7 +5,7 @@
"title": "Sort",
"description": "Sorts the contents of the message",
"deprecated": false,
- "label": "eip,routing",
+ "label": "eip,transformation",
"javaType": "org.apache.camel.model.SortDefinition",
"abstract": false,
"input": true,
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json
index a2a1afbe660..dced9540ac1 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/unmarshal.json
@@ -5,7 +5,7 @@
"title": "Unmarshal",
"description": "Converts the message data received from the wire into a format that Apache Camel processors can consume",
"deprecated": false,
- "label": "dataformat,transformation",
+ "label": "eip,dataformat,transformation",
"javaType": "org.apache.camel.model.UnmarshalDefinition",
"abstract": false,
"input": true,
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index c5cac9d9a5f..1c90bd9c629 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -861,7 +861,7 @@ Deprecated: null
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Represents a tokenizer that uses LangChain4j for tokenization
+Tokenizer that uses LangChain4j for tokenization.
]]>
</xs:documentation>
</xs:annotation>
@@ -17283,29 +17283,29 @@ Sets the component name that this definition will apply to.
<xs:complexContent>
<xs:extension base="tns:tokenizerDefinition">
<xs:sequence/>
- <xs:attribute name="maxTokens" type="xs:string" use="required">
+ <xs:attribute name="tokenizerType" type="xs:string" use="required">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Sets the maximum number of tokens on each segment. Default value: 1024
+Sets the tokenizer type.
]]>
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="maxOverlap" type="xs:string" use="required">
+ <xs:attribute name="maxTokens" type="xs:string" use="required">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Sets the maximum number of tokens that can overlap in each segment. Default value: 0
+Sets the maximum number of tokens on each segment.
]]>
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="tokenizerType" type="xs:string" use="required">
+ <xs:attribute name="maxOverlap" type="xs:string" use="required">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Sets the tokenizer type. Default value: OPEN_AI
+Sets the maximum number of tokens that can overlap in each segment.
]]>
</xs:documentation>
</xs:annotation>
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/doTry.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/doTry.json
new file mode 120000
index 00000000000..f26f3d40c9a
--- /dev/null
+++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/doTry.json
@@ -0,0 +1 @@
+../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/doTry.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/faultToleranceConfiguration.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/faultToleranceConfiguration.json
deleted file mode 120000
index e40c4225f8e..00000000000
--- a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/faultToleranceConfiguration.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/faultToleranceConfiguration.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/langChain4j.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/langChain4j.json
new file mode 120000
index 00000000000..ec32999be9b
--- /dev/null
+++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/langChain4j.json
@@ -0,0 +1 @@
+../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/tokenizer/langChain4j.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/marshal.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/marshal.json
new file mode 120000
index 00000000000..e4c1ed3d563
--- /dev/null
+++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/marshal.json
@@ -0,0 +1 @@
+../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/marshal.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/onFallback.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/onFallback.json
deleted file mode 120000
index 334a8e1ee43..00000000000
--- a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/onFallback.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onFallback.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/resilience4jConfiguration.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/resilience4jConfiguration.json
deleted file mode 120000
index 45e40e50921..00000000000
--- a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/resilience4jConfiguration.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/resilience4jConfiguration.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/json/unmarshal.json b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/unmarshal.json
new file mode 120000
index 00000000000..b40fd3fcac2
--- /dev/null
+++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/json/unmarshal.json
@@ -0,0 +1 @@
+../../../../../../../../camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/unmarshal.json
\ No newline at end of file
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc b/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc
index 6d1dee3e69e..74bb7994e45 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc
@@ -38,7 +38,7 @@
** xref:loadBalance-eip.adoc[Load Balance]
** xref:log-eip.adoc[Logger]
** xref:loop-eip.adoc[Loop]
-** xref:marshal-eip.adoc[Marshal EIP]
+** xref:marshal-eip.adoc[Marshal]
** xref:message.adoc[Message]
** xref:message-broker.adoc[Message Broker]
** xref:message-bus.adoc[Message Bus]
@@ -104,7 +104,7 @@
** xref:topicLoadBalancer-eip.adoc[Topic Load Balancer]
** xref:transactional-client.adoc[Transactional Client]
** xref:transform-eip.adoc[Transform]
-** xref:unmarshal-eip.adoc[Unmarshal EIP]
+** xref:unmarshal-eip.adoc[Unmarshal]
** xref:validate-eip.adoc[Validate]
** xref:weightedLoadBalancer-eip.adoc[Weighted Load Balancer]
** xref:wireTap-eip.adoc[Wire Tap]
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/marshal-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/marshal-eip.adoc
index 6a905e338e5..80b42151bcf 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/marshal-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/marshal-eip.adoc
@@ -1,4 +1,9 @@
= Marshal EIP
+:doctitle: Marshal
+:shortname: marshal
+:description: Marshals data into a specified format for transmission over a transport or component
+:since:
+:supportlevel: Stable
:tabs-sync-option:
The xref:marshal-eip.adoc[Marshal] and xref:unmarshal-eip.adoc[Unmarshal] EIPs are used
@@ -70,4 +75,3 @@ YAML::
uri: jms:queue:order
----
====
-
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/unmarshal-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/unmarshal-eip.adoc
index a1384c5797f..baaf626f5c7 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/unmarshal-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/unmarshal-eip.adoc
@@ -1,4 +1,9 @@
= Unmarshal EIP
+:doctitle: Unmarshal
+:shortname: unmarshal
+:description: Converts the message data received from the wire into a format that Apache Camel processors can consume
+:since:
+:supportlevel: Stable
:tabs-sync-option:
The xref:marshal-eip.adoc[Marshal] and xref:unmarshal-eip.adoc[Unmarshal] EIPs are used
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/circuitBreaker.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/circuitBreaker.json
index 1e0ead30245..0988fe8be5f 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/circuitBreaker.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/circuitBreaker.json
@@ -5,7 +5,7 @@
"title": "Circuit Breaker",
"description": "Route messages in a fault tolerance way using Circuit Breaker",
"deprecated": false,
- "label": "eip,routing",
+ "label": "eip,routing,error",
"javaType": "org.apache.camel.model.CircuitBreakerDefinition",
"abstract": false,
"input": true,
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/doTry.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/doTry.json
index db7fd3a740e..312cd3e9f02 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/doTry.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/doTry.json
@@ -5,7 +5,7 @@
"title": "Do Try",
"description": "Marks the beginning of a try, catch, finally block",
"deprecated": false,
- "label": "error",
+ "label": "eip,routing,error",
"javaType": "org.apache.camel.model.TryDefinition",
"abstract": false,
"input": true,
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/faultToleranceConfiguration.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/faultToleranceConfiguration.json
index 6c15b680640..167680c801b 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/faultToleranceConfiguration.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/faultToleranceConfiguration.json
@@ -5,7 +5,7 @@
"title": "Fault Tolerance Configuration",
"description": "MicroProfile Fault Tolerance Circuit Breaker EIP configuration",
"deprecated": false,
- "label": "configuration,eip",
+ "label": "configuration,error",
"javaType": "org.apache.camel.model.FaultToleranceConfigurationDefinition",
"abstract": false,
"input": false,
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/marshal.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/marshal.json
index a7c6c2c18ad..12580b489be 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/marshal.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/marshal.json
@@ -5,7 +5,7 @@
"title": "Marshal",
"description": "Marshals data into a specified format for transmission over a transport or component",
"deprecated": false,
- "label": "dataformat,transformation",
+ "label": "eip,dataformat,transformation",
"javaType": "org.apache.camel.model.MarshalDefinition",
"abstract": false,
"input": true,
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onFallback.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onFallback.json
index 7e8b787f47e..4ad122be0f5 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onFallback.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/onFallback.json
@@ -5,7 +5,7 @@
"title": "On Fallback",
"description": "Route to be executed when Circuit Breaker EIP executes fallback",
"deprecated": false,
- "label": "eip,routing",
+ "label": "error",
"javaType": "org.apache.camel.model.OnFallbackDefinition",
"abstract": false,
"input": true,
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/resilience4jConfiguration.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/resilience4jConfiguration.json
index 26b6bdaf870..7a8667b9dcc 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/resilience4jConfiguration.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/resilience4jConfiguration.json
@@ -5,7 +5,7 @@
"title": "Resilience4j Configuration",
"description": "Resilience4j Circuit Breaker EIP configuration",
"deprecated": false,
- "label": "configuration,eip",
+ "label": "configuration,error",
"javaType": "org.apache.camel.model.Resilience4jConfigurationDefinition",
"abstract": false,
"input": false,
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/routeTemplates.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/routeTemplates.json
index ec69c7c1313..afe4f687d34 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/routeTemplates.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/routeTemplates.json
@@ -5,7 +5,7 @@
"title": "Route Templates",
"description": "A series of route templates",
"deprecated": false,
- "label": "routeTemplates",
+ "label": "configuration",
"javaType": "org.apache.camel.model.RouteTemplatesDefinition",
"abstract": false,
"input": false,
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/sort.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/sort.json
index d49a98c3b10..5b9e9325422 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/sort.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/sort.json
@@ -5,7 +5,7 @@
"title": "Sort",
"description": "Sorts the contents of the message",
"deprecated": false,
- "label": "eip,routing",
+ "label": "eip,transformation",
"javaType": "org.apache.camel.model.SortDefinition",
"abstract": false,
"input": true,
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/tokenizer/langChain4j.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/tokenizer/langChain4j.json
index cec86e6a5ff..058b23baf82 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/tokenizer/langChain4j.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/tokenizer/langChain4j.json
@@ -3,10 +3,10 @@
"kind": "model",
"name": "langChain4j",
"title": "LangChain4J Tokenizer",
- "description": "Represents a tokenizer that uses LangChain4j for tokenization",
+ "description": "Tokenizer that uses LangChain4j for tokenization.",
"deprecated": false,
"firstVersion": "4.8.0",
- "label": "tokenizer,transformation,ai",
+ "label": "eip,transformation,ai",
"javaType": "org.apache.camel.model.tokenizer.LangChain4jTokenizerDefinition",
"abstract": false,
"input": true,
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/unmarshal.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/unmarshal.json
index a2a1afbe660..dced9540ac1 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/unmarshal.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/unmarshal.json
@@ -5,7 +5,7 @@
"title": "Unmarshal",
"description": "Converts the message data received from the wire into a format that Apache Camel processors can consume",
"deprecated": false,
- "label": "dataformat,transformation",
+ "label": "eip,dataformat,transformation",
"javaType": "org.apache.camel.model.UnmarshalDefinition",
"abstract": false,
"input": true,
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java
index 4d3bbaa6093..667a7779151 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java
@@ -31,7 +31,7 @@ import org.apache.camel.spi.Metadata;
/**
* Route messages in a fault tolerance way using Circuit Breaker
*/
-@Metadata(label = "eip,routing")
+@Metadata(label = "eip,routing,error")
@XmlRootElement(name = "circuitBreaker")
@XmlAccessorType(XmlAccessType.FIELD)
public class CircuitBreakerDefinition extends OutputDefinition<CircuitBreakerDefinition> {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java
index 5bc67098c85..5754541829c 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
/**
* MicroProfile Fault Tolerance Circuit Breaker EIP configuration
*/
-@Metadata(label = "configuration,eip")
+@Metadata(label = "configuration,error")
@XmlRootElement(name = "faultToleranceConfiguration")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java
index 1504c09e386..1acac01b5b0 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/MarshalDefinition.java
@@ -69,7 +69,7 @@ import org.apache.camel.spi.Metadata;
/**
* Marshals data into a specified format for transmission over a transport or component
*/
-@Metadata(label = "dataformat,transformation")
+@Metadata(label = "eip,dataformat,transformation")
@XmlRootElement(name = "marshal")
@XmlAccessorType(XmlAccessType.FIELD)
public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> implements DataFormatDefinitionAware {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/OnFallbackDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
index 6bd6bd06226..361670d8ef6 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
@@ -31,7 +31,7 @@ import org.apache.camel.spi.Metadata;
/**
* Route to be executed when Circuit Breaker EIP executes fallback
*/
-@Metadata(label = "eip,routing")
+@Metadata(label = "error")
@XmlRootElement(name = "onFallback")
@XmlAccessorType(XmlAccessType.FIELD)
public class OnFallbackDefinition extends ProcessorDefinition<OnFallbackDefinition> implements OutputNode {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/OutputDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OutputDefinition.java
index 57d85d7b51e..68f6cedf18d 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/OutputDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/OutputDefinition.java
@@ -33,8 +33,6 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.NONE)
public class OutputDefinition<Type extends ProcessorDefinition<Type>> extends ProcessorDefinition<Type> implements OutputNode {
- // TODO: copyDefinition return value to be class type itself and not generic
-
protected List<ProcessorDefinition<?>> outputs = new ArrayList<>();
public OutputDefinition() {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinitions.java b/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinitions.java
index ed6ef30b2af..2b11accbdad 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinitions.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinitions.java
@@ -23,7 +23,9 @@ import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlType;
+import org.apache.camel.spi.Metadata;
+@Metadata(label = "configuration")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
public class PropertyDefinitions {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java
index 7260438edd3..ac8ab25a075 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java
@@ -29,7 +29,7 @@ import org.apache.camel.spi.Metadata;
/**
* Resilience4j Circuit Breaker EIP configuration
*/
-@Metadata(label = "configuration,eip")
+@Metadata(label = "configuration,error")
@XmlRootElement(name = "resilience4jConfiguration")
@XmlAccessorType(XmlAccessType.FIELD)
@Configurer(extended = true)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplatesDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplatesDefinition.java
index a50d583b3eb..6ae8d9eca0e 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplatesDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplatesDefinition.java
@@ -35,7 +35,7 @@ import org.apache.camel.spi.ResourceAware;
/**
* A series of route templates
*/
-@Metadata(label = "routeTemplates")
+@Metadata(label = "configuration")
@XmlRootElement(name = "routeTemplates")
@XmlAccessorType(XmlAccessType.FIELD)
public class RouteTemplatesDefinition extends OptionalIdentifiedDefinition<RouteTemplatesDefinition>
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/SortDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SortDefinition.java
index 15a9308316b..f0bb48075bc 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/SortDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/SortDefinition.java
@@ -31,7 +31,7 @@ import org.apache.camel.spi.Metadata;
/**
* Sorts the contents of the message
*/
-@Metadata(label = "eip,routing")
+@Metadata(label = "eip,transformation")
@XmlRootElement(name = "sort")
@XmlAccessorType(XmlAccessType.FIELD)
public class SortDefinition<T> extends ExpressionNode {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/TokenizerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/TokenizerDefinition.java
index 56721a66ea5..31e73bede0f 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/TokenizerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/TokenizerDefinition.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.model;
import jakarta.xml.bind.annotation.XmlTransient;
@@ -22,12 +21,12 @@ import jakarta.xml.bind.annotation.XmlTransient;
import org.apache.camel.spi.Tokenizer;
/**
- * Represents a Camel tokenizer
+ * Represents a Camel tokenizer for AI.
*/
public abstract class TokenizerDefinition extends NoOutputDefinition<TokenizerDefinition> {
+
@XmlTransient
private String tokenizerName;
-
@XmlTransient
private Tokenizer.Configuration configuration;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/TryDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/TryDefinition.java
index 05e574553f8..a172e6f54b2 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/TryDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/TryDefinition.java
@@ -35,7 +35,7 @@ import org.apache.camel.spi.annotations.DslProperty;
/**
* Marks the beginning of a try, catch, finally block
*/
-@Metadata(label = "error")
+@Metadata(label = "eip,routing,error")
@XmlRootElement(name = "doTry")
@XmlAccessorType(XmlAccessType.FIELD)
public class TryDefinition extends OutputDefinition<TryDefinition> {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
index 74cd888ec5d..050e629f4fe 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
@@ -69,7 +69,7 @@ import org.apache.camel.spi.Metadata;
/**
* Converts the message data received from the wire into a format that Apache Camel processors can consume
*/
-@Metadata(label = "dataformat,transformation")
+@Metadata(label = "eip,dataformat,transformation")
@XmlRootElement(name = "unmarshal")
@XmlAccessorType(XmlAccessType.FIELD)
public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition> implements DataFormatDefinitionAware {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/tokenizer/LangChain4jTokenizerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/tokenizer/LangChain4jTokenizerDefinition.java
index 4e48fdeab2b..0c184798b9d 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/tokenizer/LangChain4jTokenizerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/tokenizer/LangChain4jTokenizerDefinition.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.model.tokenizer;
import jakarta.xml.bind.annotation.XmlAccessType;
@@ -29,9 +28,9 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.Tokenizer;
/**
- * Represents a tokenizer that uses LangChain4j for tokenization
+ * Tokenizer that uses LangChain4j for tokenization.
*/
-@Metadata(firstVersion = "4.8.0", label = "tokenizer,transformation,ai", title = "LangChain4J Tokenizer")
+@Metadata(firstVersion = "4.8.0", label = "eip,transformation,ai", title = "LangChain4J Tokenizer")
@XmlRootElement(name = "langChain4j")
@XmlAccessorType(XmlAccessType.FIELD)
public class LangChain4jTokenizerDefinition extends TokenizerDefinition {
@@ -50,7 +49,6 @@ public class LangChain4jTokenizerDefinition extends TokenizerDefinition {
private String maxOverlap;
public LangChain4jTokenizerDefinition() {
-
}
public LangChain4jTokenizerDefinition(LangChain4jTokenizerDefinition source) {
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 4eb8bcd2365..7ebf1f4483e 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -8819,7 +8819,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
types = org.apache.camel.model.tokenizer.LangChain4jTokenizerDefinition.class,
order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
displayName = "LangChain4J Tokenizer",
- description = "Represents a tokenizer that uses LangChain4j for tokenization",
+ description = "Tokenizer that uses LangChain4j for tokenization.",
deprecated = false,
properties = {
@YamlProperty(name = "description", type = "string", description = "Sets the description of this node", displayName = "Description"),
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index 1c392cb4219..651baeab570 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -15698,7 +15698,7 @@
},
"org.apache.camel.model.tokenizer.LangChain4jTokenizerDefinition" : {
"title" : "LangChain4J Tokenizer",
- "description" : "Represents a tokenizer that uses LangChain4j for tokenization",
+ "description" : "Tokenizer that uses LangChain4j for tokenization.",
"type" : "object",
"additionalProperties" : false,
"properties" : {