This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch model-apps
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 473f4856b9f12cc9828d1f9cb3d3c716f47d5971
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Oct 21 11:30:27 2023 +0200
CAMEL-20024: camel-core-model - Add description for new bean DSL
---
.../apache/camel/catalog/schemas/camel-spring.xsd | 23 +--
.../camel-yaml-dsl-deserializers/pom.xml | 2 +
.../dsl/yaml/deserializers/ModelDeserializers.java | 166 +--------------------
.../deserializers/ModelDeserializersResolver.java | 4 -
.../generated/resources/schema/camelYamlDsl.json | 130 +---------------
5 files changed, 20 insertions(+), 305 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 0be8875ac2e..8b8aba708c5 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
@@ -93,9 +93,7 @@ Spring specific DefaultCamelBeanPostProcessor which uses
Spring BeanPostProcesso
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-A grouping POJO (and related XML root element) that's historically associated
with entire application (or its
-distinguished fragment). This class is not meant to be used with Camel Java
DSL, but it's needed to generate XML Schema
-and MX parser methods.
+Container for beans, routes, and more.
]]>
</xs:documentation>
</xs:annotation>
@@ -141,7 +139,7 @@ Deprecated: null
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-If beans reminds Spring application too much, we can use camel.
+Root tag for Camel application, that can contain beans, routes, and more.
]]>
</xs:documentation>
</xs:annotation>
@@ -2299,7 +2297,7 @@ property.
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Property key.
+The name of the property.
]]>
</xs:documentation>
</xs:annotation>
@@ -2308,7 +2306,7 @@ Property key.
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Property value.
+The property value.
]]>
</xs:documentation>
</xs:annotation>
@@ -13573,13 +13571,20 @@ Uses a custom thread pool.
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Component scanning definition(s). But unlike package/packageScan/contextScan,
we're not scanning only for
-org.apache.camel.builder.RouteBuilder.
+Component scanning that can auto-discover Camel route builders from the
classpath.
+]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="bean"
type="tns:registryBeanDefinition">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+<![CDATA[
+List of bean.
]]>
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="bean"
type="tns:registryBeanDefinition"/>
<xs:any maxOccurs="unbounded" minOccurs="0" namespace="##other"
processContents="skip"/>
<xs:any maxOccurs="unbounded" minOccurs="0" namespace="##other"
processContents="skip"/>
<xs:element maxOccurs="unbounded" minOccurs="0"
ref="tns:restConfiguration"/>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
index 30e4da51d03..9bf7cf17c05 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
@@ -140,6 +140,8 @@
<bannedDefinition>org.apache.camel.model.RestsDefinition</bannedDefinition>
<bannedDefinition>org.apache.camel.model.RouteConfigurationDefinition</bannedDefinition>
<bannedDefinition>org.apache.camel.model.RouteConfigurationsDefinition</bannedDefinition>
+
<bannedDefinition>org.apache.camel.model.app.BeansDefinition</bannedDefinition>
+
<bannedDefinition>org.apache.camel.model.app.ApplicationDefinition</bannedDefinition>
</bannedDefinitions>
<additionalDefinitions>
<!-- saga -->
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 37b8eb620cc..8f3aee8a841 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
@@ -98,12 +98,10 @@ import org.apache.camel.model.ValueDefinition;
import org.apache.camel.model.WhenDefinition;
import org.apache.camel.model.WhenSkipSendToEndpointDefinition;
import org.apache.camel.model.WireTapDefinition;
-import org.apache.camel.model.app.ApplicationDefinition;
import org.apache.camel.model.app.BeanConstructorDefinition;
import org.apache.camel.model.app.BeanConstructorsDefinition;
import org.apache.camel.model.app.BeanPropertiesDefinition;
import org.apache.camel.model.app.BeanPropertyDefinition;
-import org.apache.camel.model.app.BeansDefinition;
import org.apache.camel.model.app.ComponentScanDefinition;
import org.apache.camel.model.app.RegistryBeanDefinition;
import
org.apache.camel.model.cloud.BlacklistServiceCallServiceFilterConfiguration;
@@ -600,86 +598,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
}
}
- @YamlType(
- nodes = "camel",
- types = org.apache.camel.model.app.ApplicationDefinition.class,
- order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
- displayName = "Camel",
- description = "If beans reminds Spring application too much, we
can use camel.",
- deprecated = false,
- properties = {
- @YamlProperty(name = "bean", type =
"array:org.apache.camel.model.app.RegistryBeanDefinition", displayName =
"Bean"),
- @YamlProperty(name = "component-scan", type =
"array:org.apache.camel.model.app.ComponentScanDefinition"),
- @YamlProperty(name = "rest", type =
"array:org.apache.camel.model.rest.RestDefinition", displayName = "Rest"),
- @YamlProperty(name = "rest-configuration", type =
"array:org.apache.camel.model.rest.RestConfigurationDefinition", displayName =
"Rest Configuration"),
- @YamlProperty(name = "route", type =
"array:org.apache.camel.model.RouteDefinition", displayName = "Route"),
- @YamlProperty(name = "route-configuration", type =
"array:org.apache.camel.model.RouteConfigurationDefinition", displayName =
"Route Configuration"),
- @YamlProperty(name = "route-template", type =
"array:org.apache.camel.model.RouteTemplateDefinition", displayName = "Route
Template"),
- @YamlProperty(name = "templated-route", type =
"array:org.apache.camel.model.TemplatedRouteDefinition", displayName =
"Templated Route")
- }
- )
- public static class ApplicationDefinitionDeserializer extends
YamlDeserializerBase<ApplicationDefinition> {
- public ApplicationDefinitionDeserializer() {
- super(ApplicationDefinition.class);
- }
-
- @Override
- protected ApplicationDefinition newInstance() {
- return new ApplicationDefinition();
- }
-
- @Override
- protected boolean setProperty(ApplicationDefinition target, String
propertyKey,
- String propertyName, Node node) {
- switch(propertyKey) {
- case "bean": {
-
java.util.List<org.apache.camel.model.app.RegistryBeanDefinition> val =
asFlatList(node, org.apache.camel.model.app.RegistryBeanDefinition.class);
- target.setBeans(val);
- break;
- }
- case "component-scan": {
-
java.util.List<org.apache.camel.model.app.ComponentScanDefinition> val =
asFlatList(node, org.apache.camel.model.app.ComponentScanDefinition.class);
- target.setComponentScanning(val);
- break;
- }
- case "rest-configuration": {
-
java.util.List<org.apache.camel.model.rest.RestConfigurationDefinition> val =
asFlatList(node, org.apache.camel.model.rest.RestConfigurationDefinition.class);
- target.setRestConfigurations(val);
- break;
- }
- case "rest": {
- java.util.List<org.apache.camel.model.rest.RestDefinition>
val = asFlatList(node, org.apache.camel.model.rest.RestDefinition.class);
- target.setRests(val);
- break;
- }
- case "route-configuration": {
-
java.util.List<org.apache.camel.model.RouteConfigurationDefinition> val =
asFlatList(node, org.apache.camel.model.RouteConfigurationDefinition.class);
- target.setRouteConfigurations(val);
- break;
- }
- case "route-template": {
-
java.util.List<org.apache.camel.model.RouteTemplateDefinition> val =
asFlatList(node, org.apache.camel.model.RouteTemplateDefinition.class);
- target.setRouteTemplates(val);
- break;
- }
- case "route": {
- java.util.List<org.apache.camel.model.RouteDefinition> val
= asFlatList(node, org.apache.camel.model.RouteDefinition.class);
- target.setRoutes(val);
- break;
- }
- case "templated-route": {
-
java.util.List<org.apache.camel.model.TemplatedRouteDefinition> val =
asFlatList(node, org.apache.camel.model.TemplatedRouteDefinition.class);
- target.setTemplatedRoutes(val);
- break;
- }
- default: {
- return false;
- }
- }
- return true;
- }
- }
-
@YamlType(
nodes = "avro",
inline = true,
@@ -1306,86 +1224,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
}
}
- @YamlType(
- nodes = "beans",
- types = org.apache.camel.model.app.BeansDefinition.class,
- order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
- displayName = "Beans",
- description = "A grouping POJO (and related XML root element)
that's historically associated with entire application (or its distinguished
fragment). This class is not meant to be used with Camel Java DSL, but it's
needed to generate XML Schema and MX parser methods.",
- deprecated = false,
- properties = {
- @YamlProperty(name = "bean", type =
"array:org.apache.camel.model.app.RegistryBeanDefinition", displayName =
"Bean"),
- @YamlProperty(name = "component-scan", type =
"array:org.apache.camel.model.app.ComponentScanDefinition"),
- @YamlProperty(name = "rest", type =
"array:org.apache.camel.model.rest.RestDefinition", displayName = "Rest"),
- @YamlProperty(name = "rest-configuration", type =
"array:org.apache.camel.model.rest.RestConfigurationDefinition", displayName =
"Rest Configuration"),
- @YamlProperty(name = "route", type =
"array:org.apache.camel.model.RouteDefinition", displayName = "Route"),
- @YamlProperty(name = "route-configuration", type =
"array:org.apache.camel.model.RouteConfigurationDefinition", displayName =
"Route Configuration"),
- @YamlProperty(name = "route-template", type =
"array:org.apache.camel.model.RouteTemplateDefinition", displayName = "Route
Template"),
- @YamlProperty(name = "templated-route", type =
"array:org.apache.camel.model.TemplatedRouteDefinition", displayName =
"Templated Route")
- }
- )
- public static class BeansDefinitionDeserializer extends
YamlDeserializerBase<BeansDefinition> {
- public BeansDefinitionDeserializer() {
- super(BeansDefinition.class);
- }
-
- @Override
- protected BeansDefinition newInstance() {
- return new BeansDefinition();
- }
-
- @Override
- protected boolean setProperty(BeansDefinition target, String
propertyKey,
- String propertyName, Node node) {
- switch(propertyKey) {
- case "bean": {
-
java.util.List<org.apache.camel.model.app.RegistryBeanDefinition> val =
asFlatList(node, org.apache.camel.model.app.RegistryBeanDefinition.class);
- target.setBeans(val);
- break;
- }
- case "component-scan": {
-
java.util.List<org.apache.camel.model.app.ComponentScanDefinition> val =
asFlatList(node, org.apache.camel.model.app.ComponentScanDefinition.class);
- target.setComponentScanning(val);
- break;
- }
- case "rest-configuration": {
-
java.util.List<org.apache.camel.model.rest.RestConfigurationDefinition> val =
asFlatList(node, org.apache.camel.model.rest.RestConfigurationDefinition.class);
- target.setRestConfigurations(val);
- break;
- }
- case "rest": {
- java.util.List<org.apache.camel.model.rest.RestDefinition>
val = asFlatList(node, org.apache.camel.model.rest.RestDefinition.class);
- target.setRests(val);
- break;
- }
- case "route-configuration": {
-
java.util.List<org.apache.camel.model.RouteConfigurationDefinition> val =
asFlatList(node, org.apache.camel.model.RouteConfigurationDefinition.class);
- target.setRouteConfigurations(val);
- break;
- }
- case "route-template": {
-
java.util.List<org.apache.camel.model.RouteTemplateDefinition> val =
asFlatList(node, org.apache.camel.model.RouteTemplateDefinition.class);
- target.setRouteTemplates(val);
- break;
- }
- case "route": {
- java.util.List<org.apache.camel.model.RouteDefinition> val
= asFlatList(node, org.apache.camel.model.RouteDefinition.class);
- target.setRoutes(val);
- break;
- }
- case "templated-route": {
-
java.util.List<org.apache.camel.model.TemplatedRouteDefinition> val =
asFlatList(node, org.apache.camel.model.TemplatedRouteDefinition.class);
- target.setTemplatedRoutes(val);
- break;
- }
- default: {
- return false;
- }
- }
- return true;
- }
- }
-
@YamlType(
nodes = {
"bearer-token",
@@ -11401,8 +11239,8 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
description = "A key value pair where the value is a literal
value",
deprecated = false,
properties = {
- @YamlProperty(name = "key", type = "string", required =
true, description = "Property key", displayName = "Key"),
- @YamlProperty(name = "value", type = "string", required =
true, description = "Property value", displayName = "Value")
+ @YamlProperty(name = "key", type = "string", required =
true, description = "The name of the property", displayName = "Key"),
+ @YamlProperty(name = "value", type = "string", required =
true, description = "The property value.", displayName = "Value")
}
)
public static class PropertyDefinitionDeserializer extends
YamlDeserializerBase<PropertyDefinition> {
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
index fa4f77c4ec4..503119cfcab 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
@@ -22,8 +22,6 @@ public final class ModelDeserializersResolver implements
YamlDeserializerResolve
case "api-key": return new
ModelDeserializers.ApiKeyDefinitionDeserializer();
case "apiKey": return new
ModelDeserializers.ApiKeyDefinitionDeserializer();
case "org.apache.camel.model.rest.ApiKeyDefinition": return new
ModelDeserializers.ApiKeyDefinitionDeserializer();
- case "camel": return new
ModelDeserializers.ApplicationDefinitionDeserializer();
- case "org.apache.camel.model.app.ApplicationDefinition": return
new ModelDeserializers.ApplicationDefinitionDeserializer();
case "avro": return new
ModelDeserializers.AvroDataFormatDeserializer();
case "org.apache.camel.model.dataformat.AvroDataFormat": return
new ModelDeserializers.AvroDataFormatDeserializer();
case "barcode": return new
ModelDeserializers.BarcodeDataFormatDeserializer();
@@ -41,8 +39,6 @@ public final class ModelDeserializersResolver implements
YamlDeserializerResolve
case "org.apache.camel.model.BeanDefinition": return new
ModelDeserializers.BeanDefinitionDeserializer();
case "org.apache.camel.model.app.BeanPropertiesDefinition": return
new ModelDeserializers.BeanPropertiesDefinitionDeserializer();
case "org.apache.camel.model.app.BeanPropertyDefinition": return
new ModelDeserializers.BeanPropertyDefinitionDeserializer();
- case "beans": return new
ModelDeserializers.BeansDefinitionDeserializer();
- case "org.apache.camel.model.app.BeansDefinition": return new
ModelDeserializers.BeansDefinitionDeserializer();
case "bearer-token": return new
ModelDeserializers.BearerTokenDefinitionDeserializer();
case "bearerToken": return new
ModelDeserializers.BearerTokenDefinitionDeserializer();
case "org.apache.camel.model.rest.BearerTokenDefinition": return
new ModelDeserializers.BearerTokenDefinitionDeserializer();
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 3fd4b751151..15df9786f50 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
@@ -3783,12 +3783,12 @@
"key" : {
"type" : "string",
"title" : "Key",
- "description" : "Property key"
+ "description" : "The name of the property"
},
"value" : {
"type" : "string",
"title" : "Value",
- "description" : "Property value"
+ "description" : "The property value."
}
},
"required" : [ "key", "value" ]
@@ -7832,69 +7832,6 @@
},
"required" : [ "uri" ]
},
- "org.apache.camel.model.app.ApplicationDefinition" : {
- "title" : "Camel",
- "description" : "If beans reminds Spring application too much, we can
use camel.",
- "type" : "object",
- "additionalProperties" : false,
- "properties" : {
- "bean" : {
- "type" : "array",
- "title" : "Bean",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.app.RegistryBeanDefinition"
- }
- },
- "componentScan" : {
- "type" : "array",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.app.ComponentScanDefinition"
- }
- },
- "rest" : {
- "type" : "array",
- "title" : "Rest",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.RestDefinition"
- }
- },
- "restConfiguration" : {
- "type" : "array",
- "title" : "Rest Configuration",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.RestConfigurationDefinition"
- }
- },
- "route" : {
- "type" : "array",
- "title" : "Route",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.RouteDefinition"
- }
- },
- "routeConfiguration" : {
- "type" : "array",
- "title" : "Route Configuration",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.RouteConfigurationDefinition"
- }
- },
- "routeTemplate" : {
- "type" : "array",
- "title" : "Route Template",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.RouteTemplateDefinition"
- }
- },
- "templatedRoute" : {
- "type" : "array",
- "title" : "Templated Route",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.TemplatedRouteDefinition"
- }
- }
- }
- },
"org.apache.camel.model.app.BeanConstructorDefinition" : {
"type" : "object",
"additionalProperties" : false,
@@ -7947,69 +7884,6 @@
}
}
},
- "org.apache.camel.model.app.BeansDefinition" : {
- "title" : "Beans",
- "description" : "A grouping POJO (and related XML root element) that's
historically associated with entire application (or its distinguished
fragment). This class is not meant to be used with Camel Java DSL, but it's
needed to generate XML Schema and MX parser methods.",
- "type" : "object",
- "additionalProperties" : false,
- "properties" : {
- "bean" : {
- "type" : "array",
- "title" : "Bean",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.app.RegistryBeanDefinition"
- }
- },
- "componentScan" : {
- "type" : "array",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.app.ComponentScanDefinition"
- }
- },
- "rest" : {
- "type" : "array",
- "title" : "Rest",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.RestDefinition"
- }
- },
- "restConfiguration" : {
- "type" : "array",
- "title" : "Rest Configuration",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.RestConfigurationDefinition"
- }
- },
- "route" : {
- "type" : "array",
- "title" : "Route",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.RouteDefinition"
- }
- },
- "routeConfiguration" : {
- "type" : "array",
- "title" : "Route Configuration",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.RouteConfigurationDefinition"
- }
- },
- "routeTemplate" : {
- "type" : "array",
- "title" : "Route Template",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.RouteTemplateDefinition"
- }
- },
- "templatedRoute" : {
- "type" : "array",
- "title" : "Templated Route",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.TemplatedRouteDefinition"
- }
- }
- }
- },
"org.apache.camel.model.app.ComponentScanDefinition" : {
"type" : "object",
"additionalProperties" : false,
