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 eaf5154ebb8a9e1230217be2b3d2d22e6a5c08a8
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Feb 17 15:57:31 2022 +0100
CAMEL-17673: camel-core-model - Cleanup Rest DSL
---
.../generated/resources/org/apache/camel/catalog/models/delete.json | 3 +--
.../src/generated/resources/org/apache/camel/catalog/models/get.json | 3 +--
.../src/generated/resources/org/apache/camel/catalog/models/head.json | 3 +--
.../src/generated/resources/org/apache/camel/catalog/models/patch.json | 3 +--
.../src/generated/resources/org/apache/camel/catalog/models/post.json | 3 +--
.../src/generated/resources/org/apache/camel/catalog/models/put.json | 3 +--
.../src/generated/resources/org/apache/camel/catalog/models/rest.json | 2 +-
.../resources/org/apache/camel/catalog/models/restBinding.json | 2 +-
8 files changed, 8 insertions(+), 14 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/delete.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/delete.json
index d4fe702..fce370a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/delete.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/delete.json
@@ -6,13 +6,12 @@
"description": "Rest DELETE command",
"deprecated": false,
"label": "rest",
- "javaType": "org.apache.camel.model.rest.DeleteVerbDefinition",
+ "javaType": "org.apache.camel.model.rest.DeleteDefinition",
"abstract": false,
"input": true,
"output": false
},
"properties": {
- "method": { "kind": "attribute", "displayName": "Method", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The HTTP verb such as GET,
POST, DELETE, etc." },
"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Uri template of this REST
service such as \/{id}." },
"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" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/get.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/get.json
index 7a1b07b..99f0336 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/get.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/get.json
@@ -6,13 +6,12 @@
"description": "Rest GET command",
"deprecated": false,
"label": "rest",
- "javaType": "org.apache.camel.model.rest.GetVerbDefinition",
+ "javaType": "org.apache.camel.model.rest.GetDefinition",
"abstract": false,
"input": true,
"output": false
},
"properties": {
- "method": { "kind": "attribute", "displayName": "Method", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The HTTP verb such as GET,
POST, DELETE, etc." },
"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Uri template of this REST
service such as \/{id}." },
"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" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/head.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/head.json
index 162cebe..c543e5f 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/head.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/head.json
@@ -6,13 +6,12 @@
"description": "Rest HEAD command",
"deprecated": false,
"label": "rest",
- "javaType": "org.apache.camel.model.rest.HeadVerbDefinition",
+ "javaType": "org.apache.camel.model.rest.HeadDefinition",
"abstract": false,
"input": true,
"output": false
},
"properties": {
- "method": { "kind": "attribute", "displayName": "Method", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The HTTP verb such as GET,
POST, DELETE, etc." },
"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Uri template of this REST
service such as \/{id}." },
"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" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/patch.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/patch.json
index 85c62be..721cd6e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/patch.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/patch.json
@@ -6,13 +6,12 @@
"description": "Rest PATCH command",
"deprecated": false,
"label": "rest",
- "javaType": "org.apache.camel.model.rest.PatchVerbDefinition",
+ "javaType": "org.apache.camel.model.rest.PatchDefinition",
"abstract": false,
"input": true,
"output": false
},
"properties": {
- "method": { "kind": "attribute", "displayName": "Method", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The HTTP verb such as GET,
POST, DELETE, etc." },
"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Uri template of this REST
service such as \/{id}." },
"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" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/post.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/post.json
index c6ed089..edfdc50 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/post.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/post.json
@@ -6,13 +6,12 @@
"description": "Rest POST command",
"deprecated": false,
"label": "rest",
- "javaType": "org.apache.camel.model.rest.PostVerbDefinition",
+ "javaType": "org.apache.camel.model.rest.PostDefinition",
"abstract": false,
"input": true,
"output": false
},
"properties": {
- "method": { "kind": "attribute", "displayName": "Method", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The HTTP verb such as GET,
POST, DELETE, etc." },
"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Uri template of this REST
service such as \/{id}." },
"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" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/put.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/put.json
index 39bd45e..e7fca03 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/put.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/put.json
@@ -6,13 +6,12 @@
"description": "Rest PUT command",
"deprecated": false,
"label": "rest",
- "javaType": "org.apache.camel.model.rest.PutVerbDefinition",
+ "javaType": "org.apache.camel.model.rest.PutDefinition",
"abstract": false,
"input": true,
"output": false
},
"properties": {
- "method": { "kind": "attribute", "displayName": "Method", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The HTTP verb such as GET,
POST, DELETE, etc." },
"uri": { "kind": "attribute", "displayName": "Uri", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Uri template of this REST
service such as \/{id}." },
"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" },
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 c3e6ac4..4fdce04 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
@@ -16,7 +16,7 @@
"tag": { "kind": "attribute", "displayName": "Tag", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To configure a special tag
for the operations within this rest definition." },
"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": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"auto", "description": "Sets the binding mode to use. This option will override
what may be configured on a parent level The default value is auto" },
+ "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." },
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 e6172ba..294fa8c 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
@@ -14,7 +14,7 @@
"properties": {
"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" },
"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" },
- "bindingMode": { "kind": "attribute", "displayName": "Binding Mode",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"off", "description": "Sets the binding mode to use. The default value is off"
},
+ "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." },
