This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ab921bbe7d9 CAMEL-20986: a few minor improvements for consistency
ab921bbe7d9 is described below
commit ab921bbe7d94edbbd83f06ccf648b1fc72cf73d1
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Fri Aug 9 09:57:21 2024 +0200
CAMEL-20986: a few minor improvements for consistency
- Make the parameters really required
- Adjust the order of the elements
---
.../org/apache/camel/catalog/models/langChain4j.json | 6 +++---
.../org/apache/camel/catalog/schemas/camel-spring.xsd | 12 ++++++------
.../org/apache/camel/model/tokenizer/langChain4j.json | 6 +++---
.../model/tokenizer/LangChain4jTokenizerDefinition.java | 14 +++++++-------
.../java/org/apache/camel/xml/out/ModelWriter.java | 2 +-
.../java/org/apache/camel/yaml/out/ModelWriter.java | 2 +-
.../camel/dsl/yaml/deserializers/ModelDeserializers.java | 6 +++---
.../src/generated/resources/schema/camelYamlDsl.json | 7 ++-----
8 files changed, 26 insertions(+), 29 deletions(-)
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 78eea7f2432..cec86e6a5ff 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
@@ -16,8 +16,8 @@
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the id of this node" },
"description": { "index": 1, "kind": "attribute", "displayName":
"Description", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the description of this node" },
"disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "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." },
- "maxTokens": { "index": 3, "kind": "attribute", "displayName": "Max
Tokens", "group": "common", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "1024", "description": "Sets the maximum number of tokens on
each segment" },
- "maxOverlap": { "index": 4, "kind": "attribute", "displayName": "Max
Overlap", "group": "common", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "0", "description": "Sets the maximum number of tokens that can
overlap in each segment" },
- "tokenizerType": { "index": 5, "kind": "attribute", "displayName":
"Tokenizer Type", "group": "common", "required": false, "type": "enum",
"javaType": "org.apache.camel.model.tokenizer.TokenizerType", "enum": [
"OPEN_AI", "AZURE", "QWEN" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "OPEN_AI", "description": "Sets the tokenizer
type" }
+ "tokenizerType": { "index": 3, "kind": "attribute", "displayName":
"Tokenizer Type", "group": "common", "required": true, "type": "enum",
"javaType": "org.apache.camel.model.tokenizer.TokenizerType", "enum": [
"OPEN_AI", "AZURE", "QWEN" ], "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the tokenizer type" },
+ "maxTokens": { "index": 4, "kind": "attribute", "displayName": "Max
Tokens", "group": "common", "required": true, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the maximum number of tokens on each segment" },
+ "maxOverlap": { "index": 5, "kind": "attribute", "displayName": "Max
Overlap", "group": "common", "required": true, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the maximum number of tokens that can overlap in each
segment" }
}
}
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..941f6bdce50 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
@@ -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-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 78eea7f2432..cec86e6a5ff 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
@@ -16,8 +16,8 @@
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the id of this node" },
"description": { "index": 1, "kind": "attribute", "displayName":
"Description", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the description of this node" },
"disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "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." },
- "maxTokens": { "index": 3, "kind": "attribute", "displayName": "Max
Tokens", "group": "common", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "1024", "description": "Sets the maximum number of tokens on
each segment" },
- "maxOverlap": { "index": 4, "kind": "attribute", "displayName": "Max
Overlap", "group": "common", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "0", "description": "Sets the maximum number of tokens that can
overlap in each segment" },
- "tokenizerType": { "index": 5, "kind": "attribute", "displayName":
"Tokenizer Type", "group": "common", "required": false, "type": "enum",
"javaType": "org.apache.camel.model.tokenizer.TokenizerType", "enum": [
"OPEN_AI", "AZURE", "QWEN" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "OPEN_AI", "description": "Sets the tokenizer
type" }
+ "tokenizerType": { "index": 3, "kind": "attribute", "displayName":
"Tokenizer Type", "group": "common", "required": true, "type": "enum",
"javaType": "org.apache.camel.model.tokenizer.TokenizerType", "enum": [
"OPEN_AI", "AZURE", "QWEN" ], "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the tokenizer type" },
+ "maxTokens": { "index": 4, "kind": "attribute", "displayName": "Max
Tokens", "group": "common", "required": true, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the maximum number of tokens on each segment" },
+ "maxOverlap": { "index": 5, "kind": "attribute", "displayName": "Max
Overlap", "group": "common", "required": true, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the maximum number of tokens that can overlap in each
segment" }
}
}
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 cd7805bc0d1..4e48fdeab2b 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
@@ -37,17 +37,17 @@ import org.apache.camel.spi.Tokenizer;
public class LangChain4jTokenizerDefinition extends TokenizerDefinition {
@XmlAttribute(required = true)
- @Metadata(javaType = "java.lang.Integer", defaultValue = "1024")
- private String maxTokens;
+ @Metadata(javaType = "org.apache.camel.model.tokenizer.TokenizerType",
required = true,
+ enums = "OPEN_AI,AZURE,QWEN")
+ private String tokenizerType;
@XmlAttribute(required = true)
- @Metadata(javaType = "java.lang.Integer", defaultValue = "0")
- private String maxOverlap;
+ @Metadata(javaType = "java.lang.Integer", required = true)
+ private String maxTokens;
@XmlAttribute(required = true)
- @Metadata(javaType = "org.apache.camel.model.tokenizer.TokenizerType",
defaultValue = "OPEN_AI",
- enums = "OPEN_AI,AZURE,QWEN")
- private String tokenizerType;
+ @Metadata(javaType = "java.lang.Integer", required = true)
+ private String maxOverlap;
public LangChain4jTokenizerDefinition() {
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 17e9984d094..df8f94ddc5c 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
@@ -3461,8 +3461,8 @@ public class ModelWriter extends BaseWriter {
protected void doWriteLangChain4jTokenizerDefinition(String name,
LangChain4jTokenizerDefinition def) throws IOException {
startElement(name);
doWriteProcessorDefinitionAttributes(def);
- doWriteAttribute("tokenizerType", def.getTokenizerType());
doWriteAttribute("maxTokens", def.getMaxTokens());
+ doWriteAttribute("tokenizerType", def.getTokenizerType());
doWriteAttribute("maxOverlap", def.getMaxOverlap());
endElement(name);
}
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 a4a468593a2..88f79ad4994 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
@@ -3461,8 +3461,8 @@ public class ModelWriter extends BaseWriter {
protected void doWriteLangChain4jTokenizerDefinition(String name,
LangChain4jTokenizerDefinition def) throws IOException {
startElement(name);
doWriteProcessorDefinitionAttributes(def);
- doWriteAttribute("tokenizerType", def.getTokenizerType());
doWriteAttribute("maxTokens", def.getMaxTokens());
+ doWriteAttribute("tokenizerType", def.getTokenizerType());
doWriteAttribute("maxOverlap", def.getMaxOverlap());
endElement(name);
}
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 780f8a7646d..4eb8bcd2365 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
@@ -8826,9 +8826,9 @@ 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 = "inheritErrorHandler", type =
"boolean"),
- @YamlProperty(name = "maxOverlap", type = "number",
required = true, defaultValue = "0", description = "Sets the maximum number of
tokens that can overlap in each segment", displayName = "Max Overlap"),
- @YamlProperty(name = "maxTokens", type = "number",
required = true, defaultValue = "1024", description = "Sets the maximum number
of tokens on each segment", displayName = "Max Tokens"),
- @YamlProperty(name = "tokenizerType", type =
"enum:OPEN_AI,AZURE,QWEN", defaultValue = "OPEN_AI", description = "Sets the
tokenizer type", displayName = "Tokenizer Type")
+ @YamlProperty(name = "maxOverlap", type = "number",
required = true, description = "Sets the maximum number of tokens that can
overlap in each segment", displayName = "Max Overlap"),
+ @YamlProperty(name = "maxTokens", type = "number",
required = true, description = "Sets the maximum number of tokens on each
segment", displayName = "Max Tokens"),
+ @YamlProperty(name = "tokenizerType", type =
"enum:OPEN_AI,AZURE,QWEN", description = "Sets the tokenizer type", displayName
= "Tokenizer Type")
}
)
public static class LangChain4jTokenizerDefinitionDeserializer extends
YamlDeserializerBase<LangChain4jTokenizerDefinition> {
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 376288bf7f8..1c392cb4219 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
@@ -15720,20 +15720,17 @@
"maxOverlap" : {
"type" : "number",
"title" : "Max Overlap",
- "description" : "Sets the maximum number of tokens that can
overlap in each segment",
- "default" : "0"
+ "description" : "Sets the maximum number of tokens that can
overlap in each segment"
},
"maxTokens" : {
"type" : "number",
"title" : "Max Tokens",
- "description" : "Sets the maximum number of tokens on each
segment",
- "default" : "1024"
+ "description" : "Sets the maximum number of tokens on each segment"
},
"tokenizerType" : {
"type" : "string",
"title" : "Tokenizer Type",
"description" : "Sets the tokenizer type",
- "default" : "OPEN_AI",
"enum" : [ "OPEN_AI", "AZURE", "QWEN" ]
}
},
