This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch yaml-optional
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/yaml-optional by this push:
new c9b8a16 CAMEL-16604: route template parameter should be able to be
marked explicit as required.
c9b8a16 is described below
commit c9b8a16289f20f4d5bac1b336e7c9f2da8af5553
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed May 12 07:56:24 2021 +0200
CAMEL-16604: route template parameter should be able to be marked explicit
as required.
---
.../apache/camel/catalog/models/routeTemplate.json | 4 +--
.../org/apache/camel/model/routeTemplate.json | 4 +--
.../camel/model/RouteTemplateDefinition.java | 34 +++++++++-------------
3 files changed, 17 insertions(+), 25 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplate.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplate.json
index 25c4d73..9d681a0 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplate.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplate.json
@@ -11,8 +11,8 @@
"output": true
},
"properties": {
- "templateParameter": { "kind": "element", "displayName": "Template
Parameter", "required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.RouteTemplateParameterDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description": "Adds
a required parameter the route template uses." },
- "templateBean": { "kind": "element", "displayName": "Template Bean",
"required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.RouteTemplateBeanDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description": "Adds
a local bean the route template uses." },
+ "templateParameter": { "kind": "element", "displayName": "Template
Parameter", "required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.RouteTemplateParameterDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description": "Adds
a template parameter the route template uses" },
+ "templateBean": { "kind": "element", "displayName": "Template Bean",
"required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.RouteTemplateBeanDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description": "Adds
a local bean the route template uses" },
"route": { "kind": "element", "displayName": "Route", "required": true,
"type": "object", "javaType": "org.apache.camel.model.RouteDefinition",
"deprecated": false, "autowired": false, "secret": false, "description": "To
define the route in the template" },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the id of this node"
},
"description": { "kind": "element", "displayName": "Description",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.DescriptionDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the description of
this node" }
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/routeTemplate.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/routeTemplate.json
index 25c4d73..9d681a0 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/routeTemplate.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/routeTemplate.json
@@ -11,8 +11,8 @@
"output": true
},
"properties": {
- "templateParameter": { "kind": "element", "displayName": "Template
Parameter", "required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.RouteTemplateParameterDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description": "Adds
a required parameter the route template uses." },
- "templateBean": { "kind": "element", "displayName": "Template Bean",
"required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.RouteTemplateBeanDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description": "Adds
a local bean the route template uses." },
+ "templateParameter": { "kind": "element", "displayName": "Template
Parameter", "required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.RouteTemplateParameterDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description": "Adds
a template parameter the route template uses" },
+ "templateBean": { "kind": "element", "displayName": "Template Bean",
"required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.RouteTemplateBeanDefinition>",
"deprecated": false, "autowired": false, "secret": false, "description": "Adds
a local bean the route template uses" },
"route": { "kind": "element", "displayName": "Route", "required": true,
"type": "object", "javaType": "org.apache.camel.model.RouteDefinition",
"deprecated": false, "autowired": false, "secret": false, "description": "To
define the route in the template" },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the id of this node"
},
"description": { "kind": "element", "displayName": "Description",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.DescriptionDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the description of
this node" }
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java
index 81a5bc7..987b635 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java
@@ -45,9 +45,10 @@ import org.apache.camel.spi.Metadata;
public class RouteTemplateDefinition extends OptionalIdentifiedDefinition {
@XmlElement(name = "templateParameter")
+ @Metadata(description = "Adds a template parameter the route template
uses")
private List<RouteTemplateParameterDefinition> templateParameters;
@XmlElement(name = "templateBean")
- @Metadata(description = "Adds a local bean the route template uses.")
+ @Metadata(description = "Adds a local bean the route template uses")
private List<RouteTemplateBeanDefinition> templateBeans;
@XmlElement(name = "route", required = true)
private RouteDefinition route = new RouteDefinition();
@@ -135,7 +136,7 @@ public class RouteTemplateDefinition extends
OptionalIdentifiedDefinition {
}
/**
- * Adds a required parameter the route template uses.
+ * Adds a required parameter the route template uses
*
* @param name the name of the parameter
*/
@@ -145,7 +146,7 @@ public class RouteTemplateDefinition extends
OptionalIdentifiedDefinition {
}
/**
- * Adds an optional parameter the route template uses.
+ * Adds an optional parameter the route template uses
*
* @param name the name of the parameter
*/
@@ -155,7 +156,7 @@ public class RouteTemplateDefinition extends
OptionalIdentifiedDefinition {
}
/**
- * Adds an optional parameter the route template uses.
+ * Adds an optional parameter the route template uses
*
* @param name the name of the parameter
* @param description the description of the parameter
@@ -166,7 +167,7 @@ public class RouteTemplateDefinition extends
OptionalIdentifiedDefinition {
}
/**
- * Adds a parameter (will use default value if not provided) the route
template uses.
+ * Adds a parameter (will use default value if not provided) the route
template uses
*
* @param name the name of the parameter
* @param defaultValue default value of the parameter
@@ -177,7 +178,7 @@ public class RouteTemplateDefinition extends
OptionalIdentifiedDefinition {
}
/**
- * Adds a parameter (will use default value if not provided) the route
template uses.
+ * Adds a parameter (will use default value if not provided) the route
template uses
*
* @param name the name of the parameter
* @param defaultValue default value of the parameter
@@ -202,7 +203,7 @@ public class RouteTemplateDefinition extends
OptionalIdentifiedDefinition {
}
/**
- * Adds a local bean the route template uses.
+ * Adds a local bean the route template uses
*
* @param name the name of the bean
* @param type the type of the bean to associate the binding
@@ -219,7 +220,7 @@ public class RouteTemplateDefinition extends
OptionalIdentifiedDefinition {
}
/**
- * Adds a local bean the route template uses.
+ * Adds a local bean the route template uses
*
* @param name the name of the bean
* @param bean the bean or a supplier for the bean
@@ -243,7 +244,7 @@ public class RouteTemplateDefinition extends
OptionalIdentifiedDefinition {
}
/**
- * Adds a local bean the route template uses.
+ * Adds a local bean the route template uses
*
* @param name the name of the bean
* @param bean the supplier for the bean
@@ -260,7 +261,7 @@ public class RouteTemplateDefinition extends
OptionalIdentifiedDefinition {
}
/**
- * Adds a local bean the route template uses.
+ * Adds a local bean the route template uses
*
* @param name the name of the bean
* @param type the type of the bean to associate the binding
@@ -279,7 +280,7 @@ public class RouteTemplateDefinition extends
OptionalIdentifiedDefinition {
}
/**
- * Adds a local bean the route template uses.
+ * Adds a local bean the route template uses
*
* @param name the name of the bean
* @param language the language to use
@@ -298,7 +299,7 @@ public class RouteTemplateDefinition extends
OptionalIdentifiedDefinition {
}
/**
- * Adds a local bean the route template uses (via fluent builder).
+ * Adds a local bean the route template uses (via fluent builder)
*
* @param name the name of the bean
* @return fluent builder to choose which language and script to use
for creating the bean
@@ -334,16 +335,10 @@ public class RouteTemplateDefinition extends
OptionalIdentifiedDefinition {
return "RouteTemplate[" + route.getInput().getLabel() + "]";
}
- /**
- * Adds a parameter the route template uses.
- */
private void addTemplateParameter(String name, String defaultValue) {
addTemplateParameter(name, defaultValue, null);
}
- /**
- * Adds a parameter the route template uses.
- */
private void addTemplateParameter(String name, String defaultValue, String
description) {
if (this.templateParameters == null) {
this.templateParameters = new ArrayList<>();
@@ -351,9 +346,6 @@ public class RouteTemplateDefinition extends
OptionalIdentifiedDefinition {
this.templateParameters.add(new RouteTemplateParameterDefinition(name,
defaultValue, description));
}
- /**
- * Adds an optional parameter the route template uses.
- */
private void addTemplateOptionalParameter(String name, String description)
{
if (this.templateParameters == null) {
this.templateParameters = new ArrayList<>();
