This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dabd731c0954db91e0b5454c19c12e63c09e0103
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Feb 17 16:42:03 2022 +0100
CAMEL-17673: camel-core-model - Cleanup Rest DSL
---
.../resources/org/apache/camel/catalog/models/rest.json | 8 ++++----
.../org/apache/camel/catalog/models/restBinding.json | 6 +++---
.../camel/dsl/yaml/deserializers/ModelDeserializers.java | 14 +++++++-------
.../src/generated/resources/camel-yaml-dsl.json | 14 +++++++-------
.../src/generated/resources/camelYamlDsl.json | 14 +++++++-------
5 files changed, 28 insertions(+), 28 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/rest.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/rest.json
index 4fdce04..6019f0b 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/rest.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/rest.json
@@ -17,10 +17,10 @@
"consumes": { "kind": "attribute", "displayName": "Consumes", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service consumes (accept as input), such as application\/xml or
application\/json. This option will override what may be configured on a parent
level" },
"produces": { "kind": "attribute", "displayName": "Produces", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To define the content type
what the REST service produces (uses for output), such as application\/xml or
application\/json This option will override what may be configured on a parent
level" },
"bindingMode": { "kind": "attribute", "displayName": "Binding Mode",
"required": false, "type": "enum", "javaType": "java.lang.String", "enum": [
"off", "auto", "json", "xml", "json_xml" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "off", "description": "Sets the binding
mode to use. This option will override what may be configured on a parent level
The default value is auto" },
- "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip
Binding On Error Code", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Whether to skip binding on output if there is a custom HTTP
error code header. This allows to build custom error messages that do not bind
to json \/ xml etc, as success messages otherwise will do. This option will
override what may be configured on a [...]
- "clientRequestValidation": { "kind": "attribute", "displayName": "Client
Request Validation", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Whether to enable validation of the client request to check: 1)
Content-Type header matches what the Rest DSL consumes; returns HTTP Status 415
if validation error. 2) Accept header matches what the Rest DSL produces;
returns HTTP Status 406 if valida [...]
- "enableCORS": { "kind": "attribute", "displayName": "Enable CORS",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Whether to enable CORS headers in the HTTP response. This option will override
what may be configured on a parent level The default value is false." },
- "apiDocs": { "kind": "attribute", "displayName": "Api Docs", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Whether to include or
exclude the VerbDefinition in API documentation. This option will override what
may be configured on a parent level The default value is true." },
+ "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip
Binding On Error Code", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to skip binding on output if
there is a custom HTTP error code header. This allows to build custom error
messages that do not bind to json \/ xml etc, as success messages otherwise
will do. This option will override wh [...]
+ "clientRequestValidation": { "kind": "attribute", "displayName": "Client
Request Validation", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to enable validation of the
client request to check: 1) Content-Type header matches what the Rest DSL
consumes; returns HTTP Status 415 if validation error. 2) Accept header matches
what the Rest DSL produces; returns [...]
+ "enableCORS": { "kind": "attribute", "displayName": "Enable CORS",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Whether to enable CORS headers in the HTTP response.
This option will override what may be configured on a parent level The default
value is false." },
+ "apiDocs": { "kind": "attribute", "displayName": "Api Docs", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether to include or exclude the VerbDefinition in API documentation. This
option will override what may be configured on a parent level The default value
is true." },
"securityDefinitions": { "kind": "element", "displayName": "Security
Definitions", "required": false, "type": "object", "javaType":
"org.apache.camel.model.rest.RestSecuritiesDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the security
definitions such as Basic, OAuth2 etc." },
"securityRequirements": { "kind": "element", "displayName": "Security
Requirements", "required": false, "type": "object", "javaType":
"org.apache.camel.model.rest.RestSecuritiesRequirement", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the security
requirement(s) for all endpoints." },
"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"
},
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/restBinding.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/restBinding.json
index 294fa8c..97f01b8 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/restBinding.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/restBinding.json
@@ -17,9 +17,9 @@
"bindingMode": { "kind": "attribute", "displayName": "Binding Mode",
"required": false, "type": "enum", "javaType": "java.lang.String", "enum": [
"off", "auto", "json", "xml", "json_xml" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "off", "description": "Sets the binding
mode to use. The default value is off" },
"type": { "kind": "attribute", "displayName": "Type", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the class name to use
for binding from input to POJO for the incoming data The name of the class of
the input data. Append a to the end of the name if you want the input to be an
array type." },
"outType": { "kind": "attribute", "displayName": "Out Type", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the class name to use
for binding from POJO to output for the outgoing data The name of the class of
the input data. Append a to the end of the name if you want the input to be an
array type." },
- "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip
Binding On Error Code", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Whether to skip binding on output if there is a custom HTTP
error code header. This allows to build custom error messages that do not bind
to json \/ xml etc, as success messages otherwise will do." },
- "clientRequestValidation": { "kind": "attribute", "displayName": "Client
Request Validation", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Whether to enable validation of the client request to check: 1)
Content-Type header matches what the Rest DSL consumes; returns HTTP Status 415
if validation error. 2) Accept header matches what the Rest DSL produces;
returns HTTP Status 406 if valida [...]
- "enableCORS": { "kind": "attribute", "displayName": "Enable CORS",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Whether to enable CORS headers in the HTTP response. The default value is
false." },
+ "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip
Binding On Error Code", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to skip binding on output if
there is a custom HTTP error code header. This allows to build custom error
messages that do not bind to json \/ xml etc, as success messages otherwise
will do." },
+ "clientRequestValidation": { "kind": "attribute", "displayName": "Client
Request Validation", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to enable validation of the
client request to check: 1) Content-Type header matches what the Rest DSL
consumes; returns HTTP Status 415 if validation error. 2) Accept header matches
what the Rest DSL produces; returns [...]
+ "enableCORS": { "kind": "attribute", "displayName": "Enable CORS",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Whether to enable CORS headers in the HTTP response. The
default value is false." },
"component": { "kind": "attribute", "displayName": "Component",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the component name that this definition will apply to" },
"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/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 f52c063..e3fb3e1 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
@@ -11489,15 +11489,15 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
},
properties = {
@YamlProperty(name = "binding-mode", type = "string"),
- @YamlProperty(name = "client-request-validation", type =
"string"),
+ @YamlProperty(name = "client-request-validation", type =
"boolean"),
@YamlProperty(name = "component", type = "string"),
@YamlProperty(name = "consumes", type = "string"),
@YamlProperty(name = "description", type = "string"),
- @YamlProperty(name = "enable-cors", type = "string"),
+ @YamlProperty(name = "enable-cors", type = "boolean"),
@YamlProperty(name = "id", type = "string"),
@YamlProperty(name = "out-type", type = "string"),
@YamlProperty(name = "produces", type = "string"),
- @YamlProperty(name = "skip-binding-on-error-code", type =
"string"),
+ @YamlProperty(name = "skip-binding-on-error-code", type =
"boolean"),
@YamlProperty(name = "type", type = "string")
}
)
@@ -11824,13 +11824,13 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = "rest",
properties = {
- @YamlProperty(name = "api-docs", type = "string"),
+ @YamlProperty(name = "api-docs", type = "boolean"),
@YamlProperty(name = "binding-mode", type = "string"),
- @YamlProperty(name = "client-request-validation", type =
"string"),
+ @YamlProperty(name = "client-request-validation", type =
"boolean"),
@YamlProperty(name = "consumes", type = "string"),
@YamlProperty(name = "delete", type =
"array:org.apache.camel.model.rest.DeleteDefinition"),
@YamlProperty(name = "description", type = "string"),
- @YamlProperty(name = "enable-cors", type = "string"),
+ @YamlProperty(name = "enable-cors", type = "boolean"),
@YamlProperty(name = "get", type =
"array:org.apache.camel.model.rest.GetDefinition"),
@YamlProperty(name = "head", type =
"array:org.apache.camel.model.rest.HeadDefinition"),
@YamlProperty(name = "id", type = "string"),
@@ -11841,7 +11841,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "put", type =
"array:org.apache.camel.model.rest.PutDefinition"),
@YamlProperty(name = "security-definitions", type =
"object:org.apache.camel.model.rest.RestSecuritiesDefinition"),
@YamlProperty(name = "security-requirements", type =
"object:org.apache.camel.model.rest.RestSecuritiesRequirement"),
- @YamlProperty(name = "skip-binding-on-error-code", type =
"string"),
+ @YamlProperty(name = "skip-binding-on-error-code", type =
"boolean"),
@YamlProperty(name = "tag", type = "string"),
@YamlProperty(name = "verbs", type =
"array:org.apache.camel.model.rest.VerbDefinition")
}
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 b115478..2b854dd 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
@@ -7031,7 +7031,7 @@
"type" : "string"
},
"client-request-validation" : {
- "type" : "string"
+ "type" : "boolean"
},
"component" : {
"type" : "string"
@@ -7043,7 +7043,7 @@
"type" : "string"
},
"enable-cors" : {
- "type" : "string"
+ "type" : "boolean"
},
"id" : {
"type" : "string"
@@ -7055,7 +7055,7 @@
"type" : "string"
},
"skip-binding-on-error-code" : {
- "type" : "string"
+ "type" : "boolean"
},
"type" : {
"type" : "string"
@@ -7175,13 +7175,13 @@
"type" : "object",
"properties" : {
"api-docs" : {
- "type" : "string"
+ "type" : "boolean"
},
"binding-mode" : {
"type" : "string"
},
"client-request-validation" : {
- "type" : "string"
+ "type" : "boolean"
},
"consumes" : {
"type" : "string"
@@ -7196,7 +7196,7 @@
"type" : "string"
},
"enable-cors" : {
- "type" : "string"
+ "type" : "boolean"
},
"get" : {
"type" : "array",
@@ -7244,7 +7244,7 @@
"$ref" :
"#/items/definitions/org.apache.camel.model.rest.RestSecuritiesRequirement"
},
"skip-binding-on-error-code" : {
- "type" : "string"
+ "type" : "boolean"
},
"tag" : {
"type" : "string"
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
index abf694a..84b0c9d 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
@@ -6929,7 +6929,7 @@
"type" : "string"
},
"clientRequestValidation" : {
- "type" : "string"
+ "type" : "boolean"
},
"component" : {
"type" : "string"
@@ -6941,7 +6941,7 @@
"type" : "string"
},
"enableCors" : {
- "type" : "string"
+ "type" : "boolean"
},
"id" : {
"type" : "string"
@@ -6953,7 +6953,7 @@
"type" : "string"
},
"skipBindingOnErrorCode" : {
- "type" : "string"
+ "type" : "boolean"
},
"type" : {
"type" : "string"
@@ -7073,13 +7073,13 @@
"type" : "object",
"properties" : {
"apiDocs" : {
- "type" : "string"
+ "type" : "boolean"
},
"bindingMode" : {
"type" : "string"
},
"clientRequestValidation" : {
- "type" : "string"
+ "type" : "boolean"
},
"consumes" : {
"type" : "string"
@@ -7094,7 +7094,7 @@
"type" : "string"
},
"enableCors" : {
- "type" : "string"
+ "type" : "boolean"
},
"get" : {
"type" : "array",
@@ -7142,7 +7142,7 @@
"$ref" :
"#/items/definitions/org.apache.camel.model.rest.RestSecuritiesRequirement"
},
"skipBindingOnErrorCode" : {
- "type" : "string"
+ "type" : "boolean"
},
"tag" : {
"type" : "string"
