This is an automated email from the ASF dual-hosted git repository.
acosentino 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 8c5d470 Regen for commit f6f122954698bd32c6f90c1c7bfc7fe20d685c3d
8c5d470 is described below
commit 8c5d470314e323156e211243734ebb45d6597cdc
Author: davsclaus <[email protected]>
AuthorDate: Sat Dec 4 11:51:08 2021 +0000
Regen for commit f6f122954698bd32c6f90c1c7bfc7fe20d685c3d
Signed-off-by: GitHub <[email protected]>
---
.../org/apache/camel/catalog/models.properties | 2 ++
.../apache/camel/catalog/models/camelContext.json | 1 +
.../catalog/models/routeConfigurationContext.json | 17 ++++++++++
.../models/routeConfigurationContextRef.json | 16 +++++++++
.../apache/camel/catalog/schemas/camel-spring.xsd | 38 ++++++++++++++++++++++
.../dsl/yaml/deserializers/ModelDeserializers.java | 37 +++++++++++++++++++++
.../deserializers/ModelDeserializersResolver.java | 3 ++
.../src/generated/resources/camel-yaml-dsl.json | 9 +++++
8 files changed, 123 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
index e0d7e06..b82d7d0 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
@@ -146,6 +146,8 @@ roundRobin
route
routeBuilder
routeConfiguration
+routeConfigurationContext
+routeConfigurationContextRef
routeConfigurations
routeContext
routeContextRef
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
index 42cb0b3..72f27e7 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
@@ -63,6 +63,7 @@
"resilience4jConfiguration": { "kind": "element", "displayName":
"Resilience4j Configuration", "required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.Resilience4jConfigurationDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description":
"Resilience4j Circuit Breaker EIP configurations" },
"defaultFaultToleranceConfiguration": { "kind": "element", "displayName":
"Default Fault Tolerance Configuration", "required": false, "type": "object",
"javaType": "org.apache.camel.model.FaultToleranceConfigurationDefinition",
"deprecated": false, "autowired": false, "secret": false, "description":
"MicroProfile Fault Tolerance EIP default configuration" },
"faultToleranceConfiguration": { "kind": "element", "displayName": "Fault
Tolerance Configuration", "required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.FaultToleranceConfigurationDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description":
"MicroProfile Circuit Breaker EIP configurations" },
+ "routeConfigurationContextRef": { "kind": "element", "displayName": "Route
Configuration Context Ref", "required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.RouteConfigurationContextRefDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to XML route configurations to include as route configurations in this
CamelContext." },
"routeTemplateContextRef": { "kind": "element", "displayName": "Route
Template Context Ref", "required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.RouteTemplateContextRefDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to XML route templates to include as route templates in this
CamelContext." },
"routeBuilder": { "kind": "element", "displayName": "Route Builder",
"required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.RouteBuilderDefinition>", "deprecated":
false, "autowired": false, "secret": false, "description": "Refers to Java
RouteBuilder instances to include as routes in this CamelContext." },
"routeContextRef": { "kind": "element", "displayName": "Route Context
Ref", "required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.RouteContextRefDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description":
"Refers to XML routes to include as routes in this CamelContext." },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeConfigurationContext.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeConfigurationContext.json
new file mode 100644
index 0000000..a858ab4
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeConfigurationContext.json
@@ -0,0 +1,17 @@
+{
+ "model": {
+ "kind": "model",
+ "name": "routeConfigurationContext",
+ "title": "Route Configuration Context",
+ "description": "Configuration of route configurations using XML",
+ "deprecated": false,
+ "label": "spring,configuration,routing",
+ "javaType":
"org.apache.camel.spring.xml.CamelRouteConfigurationContextFactoryBean",
+ "input": false,
+ "output": false
+ },
+ "properties": {
+ "routeConfiguration": { "kind": "element", "displayName": "Route
Configuration", "required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.RouteConfigurationDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description": "Route
Configurations" },
+ "id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" }
+ }
+}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeConfigurationContextRef.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeConfigurationContextRef.json
new file mode 100644
index 0000000..0e7b143
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeConfigurationContextRef.json
@@ -0,0 +1,16 @@
+{
+ "model": {
+ "kind": "model",
+ "name": "routeConfigurationContextRef",
+ "title": "Route Configuration Context Ref",
+ "description": "To refer to an XML file with route configuration defined
using the xml-dsl",
+ "deprecated": false,
+ "label": "configuration",
+ "javaType":
"org.apache.camel.model.RouteConfigurationContextRefDefinition",
+ "input": false,
+ "output": false
+ },
+ "properties": {
+ "ref": { "kind": "attribute", "displayName": "Ref", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Reference to the route
templates in the xml dsl" }
+ }
+}
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 66301c2..d82a833 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
@@ -1256,6 +1256,22 @@ Reusable configuration for Camel route(s).
</xs:annotation>
</xs:element>
+ <xs:element name="routeConfigurationContext"
type="tns:camelRouteConfigurationContextFactoryBean">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+Configuration of route configurations using XML
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:element name="routeConfigurationContextRef"
type="tns:routeConfigurationContextRefDefinition">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+To refer to an XML file with route configuration defined using the xml-dsl
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
<xs:element name="routeConfigurations"
type="tns:routeConfigurationsDefinition">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
@@ -10559,6 +10575,17 @@ Reference to the route builder instance.
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="routeConfigurationContextRefDefinition">
+ <xs:sequence/>
+ <xs:attribute name="ref" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+Reference to the route templates in the xml dsl.
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
<xs:complexType name="routeConfigurationDefinition">
<xs:complexContent>
<xs:extension base="tns:optionalIdentifiedDefinition">
@@ -15020,6 +15047,7 @@ MicroProfile Circuit Breaker EIP configurations.
]]></xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0"
ref="tns:routeConfigurationContextRef"/>
<xs:element maxOccurs="unbounded" minOccurs="0"
ref="tns:routeTemplateContextRef"/>
<xs:element maxOccurs="unbounded" minOccurs="0"
ref="tns:routeBuilder"/>
<xs:element maxOccurs="unbounded" minOccurs="0"
ref="tns:routeContextRef"/>
@@ -15612,6 +15640,16 @@ Sets a reference to a thread pool to be used by the
error handler.
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="camelRouteConfigurationContextFactoryBean">
+ <xs:complexContent>
+ <xs:extension base="tns:identifiedType">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" ref="tns:routeConfiguration"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
<xs:complexType name="camelRouteContextFactoryBean">
<xs:complexContent>
<xs:extension base="tns:identifiedType">
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 095eb74..d40cbeee 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
@@ -69,6 +69,7 @@ import
org.apache.camel.model.Resilience4jConfigurationDefinition;
import org.apache.camel.model.RestContextRefDefinition;
import org.apache.camel.model.RollbackDefinition;
import org.apache.camel.model.RouteBuilderDefinition;
+import org.apache.camel.model.RouteConfigurationContextRefDefinition;
import org.apache.camel.model.RouteContextRefDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RouteTemplateParameterDefinition;
@@ -12918,6 +12919,42 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
}
@YamlType(
+ types =
org.apache.camel.model.RouteConfigurationContextRefDefinition.class,
+ order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
+ nodes = {
+ "route-configuration-context-ref",
+ "routeConfigurationContextRef"
+ },
+ properties = @YamlProperty(name = "ref", type = "string", required
= true)
+ )
+ public static class RouteConfigurationContextRefDefinitionDeserializer
extends YamlDeserializerBase<RouteConfigurationContextRefDefinition> {
+ public RouteConfigurationContextRefDefinitionDeserializer() {
+ super(RouteConfigurationContextRefDefinition.class);
+ }
+
+ @Override
+ protected RouteConfigurationContextRefDefinition newInstance() {
+ return new RouteConfigurationContextRefDefinition();
+ }
+
+ @Override
+ protected boolean setProperty(RouteConfigurationContextRefDefinition
target,
+ String propertyKey, String propertyName, Node node) {
+ switch(propertyKey) {
+ case "ref": {
+ String val = asText(node);
+ target.setRef(val);
+ break;
+ }
+ default: {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+
+ @YamlType(
types = org.apache.camel.model.RouteContextRefDefinition.class,
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = {
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 f5837a5..f0629b1 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
@@ -363,6 +363,9 @@ public final class ModelDeserializersResolver implements
YamlDeserializerResolve
case "route-builder": return new
ModelDeserializers.RouteBuilderDefinitionDeserializer();
case "routeBuilder": return new
ModelDeserializers.RouteBuilderDefinitionDeserializer();
case "org.apache.camel.model.RouteBuilderDefinition": return new
ModelDeserializers.RouteBuilderDefinitionDeserializer();
+ case "route-configuration-context-ref": return new
ModelDeserializers.RouteConfigurationContextRefDefinitionDeserializer();
+ case "routeConfigurationContextRef": return new
ModelDeserializers.RouteConfigurationContextRefDefinitionDeserializer();
+ case
"org.apache.camel.model.RouteConfigurationContextRefDefinition": return new
ModelDeserializers.RouteConfigurationContextRefDefinitionDeserializer();
case "route-context-ref": return new
ModelDeserializers.RouteContextRefDefinitionDeserializer();
case "routeContextRef": return new
ModelDeserializers.RouteContextRefDefinitionDeserializer();
case "org.apache.camel.model.RouteContextRefDefinition": return
new ModelDeserializers.RouteContextRefDefinitionDeserializer();
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
index b6b98fc..8614fed 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
@@ -2131,6 +2131,15 @@
} ],
"required" : [ "ref" ]
},
+ "org.apache.camel.model.RouteConfigurationContextRefDefinition" : {
+ "type" : "object",
+ "properties" : {
+ "ref" : {
+ "type" : "string"
+ }
+ },
+ "required" : [ "ref" ]
+ },
"org.apache.camel.model.RouteConfigurationDefinition" : {
"oneOf" : [ {
"type" : "string"
