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 2025/05/15 08:18:31 UTC

(camel) 13/17: CAMEL-22064: camel-xml-io - Generate XSD schema

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch xmlio
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 1634c8fe68e746198748922c247a44fb78014fbd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu May 15 08:46:33 2025 +0200

    CAMEL-22064: camel-xml-io - Generate XSD schema
---
 .../org/apache/camel/catalog/schemas/camel-spring.xsd    | 16 ++++++++--------
 .../java/org/apache/camel/model/TokenizerDefinition.java |  4 ++--
 .../java/org/apache/camel/xml/in/ModelParser.java        |  2 +-
 .../java/org/apache/camel/xml/out/ModelWriter.java       |  2 +-
 .../java/org/apache/camel/yaml/out/ModelWriter.java      |  2 +-
 .../camel/dsl/yaml/deserializers/ModelDeserializers.java |  4 ++--
 .../src/generated/resources/schema/camelYamlDsl.json     |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

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 d556f843fdf..66e6dabae28 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
@@ -14395,7 +14395,7 @@ Whether to auto startup components when toD is starting up. Default value: true
         <xs:sequence>
           <xs:choice minOccurs="0">
             <xs:element ref="tns:langChain4jCharacterTokenizer"/>
-            <xs:element name="langChain4jLineTokenizer" type="tns:langChain4jTokenizerImplementation"/>
+            <xs:element ref="tns:langChain4jLineTokenizer"/>
             <xs:element ref="tns:langChain4jParagraphTokenizer"/>
             <xs:element ref="tns:langChain4jSentenceTokenizer"/>
             <xs:element ref="tns:langChain4jWordTokenizer"/>
@@ -14452,6 +14452,13 @@ Sets the maximum number of tokens that can overlap in each segment.
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  <xs:complexType name="langChain4JLineTokenizerDefinition">
+    <xs:complexContent>
+      <xs:extension base="tns:langChain4jTokenizerImplementation">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
   <xs:complexType name="langChain4JParagraphTokenizerDefinition">
     <xs:complexContent>
       <xs:extension base="tns:langChain4jTokenizerImplementation">
@@ -17682,13 +17689,6 @@ Sets the component name that this definition will apply to.
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  <xs:complexType name="langChain4JLineTokenizerDefinition">
-    <xs:complexContent>
-      <xs:extension base="tns:langChain4jTokenizerImplementation">
-        <xs:sequence/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
   <xs:complexType name="customTransformer">
     <xs:complexContent>
       <xs:extension base="tns:transformer">
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 8637be524e1..ae6d6ebacff 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
@@ -24,9 +24,9 @@ import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlTransient;
 
 import org.apache.camel.model.tokenizer.LangChain4jCharacterTokenizerDefinition;
+import org.apache.camel.model.tokenizer.LangChain4jLineTokenizerDefinition;
 import org.apache.camel.model.tokenizer.LangChain4jParagraphTokenizerDefinition;
 import org.apache.camel.model.tokenizer.LangChain4jSentenceTokenizerDefinition;
-import org.apache.camel.model.tokenizer.LangChain4jTokenizerDefinition;
 import org.apache.camel.model.tokenizer.LangChain4jWordTokenizerDefinition;
 import org.apache.camel.spi.Metadata;
 
@@ -40,7 +40,7 @@ public class TokenizerDefinition extends NoOutputDefinition<TokenizerDefinition>
 
     @XmlElements({
             @XmlElement(name = "langChain4jCharacterTokenizer", type = LangChain4jCharacterTokenizerDefinition.class),
-            @XmlElement(name = "langChain4jLineTokenizer", type = LangChain4jTokenizerDefinition.class),
+            @XmlElement(name = "langChain4jLineTokenizer", type = LangChain4jLineTokenizerDefinition.class),
             @XmlElement(name = "langChain4jParagraphTokenizer", type = LangChain4jParagraphTokenizerDefinition.class),
             @XmlElement(name = "langChain4jSentenceTokenizer", type = LangChain4jSentenceTokenizerDefinition.class),
             @XmlElement(name = "langChain4jWordTokenizer", type = LangChain4jWordTokenizerDefinition.class),
diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index d2b12d1c686..2cf0eedd5a2 100644
--- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -1278,7 +1278,7 @@ public class ModelParser extends BaseParser {
     protected TokenizerDefinition doParseTokenizerDefinition() throws IOException, XmlPullParserException {
         return doParse(new TokenizerDefinition(), processorDefinitionAttributeHandler(), (def, key) -> switch (key) {
                 case "langChain4jCharacterTokenizer": def.setTokenizerImplementation(doParseLangChain4jCharacterTokenizerDefinition()); yield true;
-                case "langChain4jLineTokenizer": def.setTokenizerImplementation(doParseLangChain4jTokenizerDefinition()); yield true;
+                case "langChain4jLineTokenizer": def.setTokenizerImplementation(doParseLangChain4jLineTokenizerDefinition()); yield true;
                 case "langChain4jParagraphTokenizer": def.setTokenizerImplementation(doParseLangChain4jParagraphTokenizerDefinition()); yield true;
                 case "langChain4jSentenceTokenizer": def.setTokenizerImplementation(doParseLangChain4jSentenceTokenizerDefinition()); yield true;
                 case "langChain4jWordTokenizer": def.setTokenizerImplementation(doParseLangChain4jWordTokenizerDefinition()); yield true;
diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
index 98936e8807d..fece6320ea7 100644
--- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
+++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
@@ -1896,7 +1896,7 @@ public class ModelWriter extends BaseWriter {
         doWriteElement(null, def.getTokenizerImplementation(), (n, v) -> {
             switch (v.getClass().getSimpleName()) {
                 case "LangChain4jCharacterTokenizerDefinition" -> doWriteLangChain4jCharacterTokenizerDefinition("langChain4jCharacterTokenizer", (LangChain4jCharacterTokenizerDefinition) v);
-                case "LangChain4jTokenizerDefinition" -> doWriteLangChain4jTokenizerDefinition("langChain4jLineTokenizer", (LangChain4jTokenizerDefinition) v);
+                case "LangChain4jLineTokenizerDefinition" -> doWriteLangChain4jLineTokenizerDefinition("langChain4jLineTokenizer", (LangChain4jLineTokenizerDefinition) v);
                 case "LangChain4jParagraphTokenizerDefinition" -> doWriteLangChain4jParagraphTokenizerDefinition("langChain4jParagraphTokenizer", (LangChain4jParagraphTokenizerDefinition) v);
                 case "LangChain4jSentenceTokenizerDefinition" -> doWriteLangChain4jSentenceTokenizerDefinition("langChain4jSentenceTokenizer", (LangChain4jSentenceTokenizerDefinition) v);
                 case "LangChain4jWordTokenizerDefinition" -> doWriteLangChain4jWordTokenizerDefinition("langChain4jWordTokenizer", (LangChain4jWordTokenizerDefinition) v);
diff --git a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
index 1300b73b2ce..2a54d21d23c 100644
--- a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
+++ b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
@@ -1896,7 +1896,7 @@ public class ModelWriter extends BaseWriter {
         doWriteElement(null, def.getTokenizerImplementation(), (n, v) -> {
             switch (v.getClass().getSimpleName()) {
                 case "LangChain4jCharacterTokenizerDefinition" -> doWriteLangChain4jCharacterTokenizerDefinition("langChain4jCharacterTokenizer", (LangChain4jCharacterTokenizerDefinition) v);
-                case "LangChain4jTokenizerDefinition" -> doWriteLangChain4jTokenizerDefinition("langChain4jLineTokenizer", (LangChain4jTokenizerDefinition) v);
+                case "LangChain4jLineTokenizerDefinition" -> doWriteLangChain4jLineTokenizerDefinition("langChain4jLineTokenizer", (LangChain4jLineTokenizerDefinition) v);
                 case "LangChain4jParagraphTokenizerDefinition" -> doWriteLangChain4jParagraphTokenizerDefinition("langChain4jParagraphTokenizer", (LangChain4jParagraphTokenizerDefinition) v);
                 case "LangChain4jSentenceTokenizerDefinition" -> doWriteLangChain4jSentenceTokenizerDefinition("langChain4jSentenceTokenizer", (LangChain4jSentenceTokenizerDefinition) v);
                 case "LangChain4jWordTokenizerDefinition" -> doWriteLangChain4jWordTokenizerDefinition("langChain4jWordTokenizer", (LangChain4jWordTokenizerDefinition) v);
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 413641d18b7..9406b99a9ae 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
@@ -19025,7 +19025,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     @YamlProperty(name = "disabled", type = "boolean", description = "Whether to disable this EIP from the route during build time. Once an EIP has been disabled then it cannot be enabled later at runtime.", displayName = "Disabled"),
                     @YamlProperty(name = "id", type = "string", description = "Sets the id of this node", displayName = "Id"),
                     @YamlProperty(name = "langChain4jCharacterTokenizer", type = "object:org.apache.camel.model.tokenizer.LangChain4jCharacterTokenizerDefinition", oneOf = "tokenizerImplementation"),
-                    @YamlProperty(name = "langChain4jLineTokenizer", type = "object:org.apache.camel.model.tokenizer.LangChain4jTokenizerDefinition", oneOf = "tokenizerImplementation"),
+                    @YamlProperty(name = "langChain4jLineTokenizer", type = "object:org.apache.camel.model.tokenizer.LangChain4jLineTokenizerDefinition", oneOf = "tokenizerImplementation"),
                     @YamlProperty(name = "langChain4jParagraphTokenizer", type = "object:org.apache.camel.model.tokenizer.LangChain4jParagraphTokenizerDefinition", oneOf = "tokenizerImplementation"),
                     @YamlProperty(name = "langChain4jSentenceTokenizer", type = "object:org.apache.camel.model.tokenizer.LangChain4jSentenceTokenizerDefinition", oneOf = "tokenizerImplementation"),
                     @YamlProperty(name = "langChain4jWordTokenizer", type = "object:org.apache.camel.model.tokenizer.LangChain4jWordTokenizerDefinition", oneOf = "tokenizerImplementation")
@@ -19062,7 +19062,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     break;
                 }
                 case "langChain4jLineTokenizer": {
-                    org.apache.camel.model.tokenizer.LangChain4jTokenizerDefinition val = asType(node, org.apache.camel.model.tokenizer.LangChain4jTokenizerDefinition.class);
+                    org.apache.camel.model.tokenizer.LangChain4jLineTokenizerDefinition val = asType(node, org.apache.camel.model.tokenizer.LangChain4jLineTokenizerDefinition.class);
                     target.setTokenizerImplementation(val);
                     break;
                 }
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 0b7d93de324..1f32e52b89a 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
@@ -7483,7 +7483,7 @@
             "required" : [ "langChain4jLineTokenizer" ],
             "properties" : {
               "langChain4jLineTokenizer" : {
-                "$ref" : "#/items/definitions/org.apache.camel.model.tokenizer.LangChain4jTokenizerDefinition"
+                "$ref" : "#/items/definitions/org.apache.camel.model.tokenizer.LangChain4jLineTokenizerDefinition"
               }
             }
           }, {