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 db2120fbacf4e2e346f46fd41c884cca81ac60db
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun Feb 20 11:39:55 2022 +0100
CAMEL-17673: camel-core-model - Cleanup Rest DSL
---
.../org/apache/camel/catalog/models/delete.json | 1 -
.../org/apache/camel/catalog/models/get.json | 1 -
.../org/apache/camel/catalog/models/head.json | 1 -
.../org/apache/camel/catalog/models/patch.json | 1 -
.../org/apache/camel/catalog/models/post.json | 1 -
.../org/apache/camel/catalog/models/put.json | 1 -
.../RestSwaggerReaderPropertyPlaceholderTest.java | 2 +-
.../dsl/yaml/deserializers/ModelDeserializers.java | 36 ----------------------
.../src/generated/resources/camel-yaml-dsl.json | 18 -----------
.../src/generated/resources/camelYamlDsl.json | 18 -----------
10 files changed, 1 insertion(+), 79 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 7e752a7..bafa802 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
@@ -19,7 +19,6 @@
"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." },
- "routeId": { "kind": "attribute", "displayName": "Route Id", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The route id this rest-dsl
is using (read-only)" },
"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 this rest operation in API documentation. The
default value is true." },
"deprecated": { "kind": "attribute", "displayName": "Deprecated",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Marks this rest operation as deprecated in OpenApi
documentation." },
"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 This option will override
what may be configured on a parent level. 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." },
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 eabc9f4..c7c3199 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
@@ -19,7 +19,6 @@
"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." },
- "routeId": { "kind": "attribute", "displayName": "Route Id", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The route id this rest-dsl
is using (read-only)" },
"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 this rest operation in API documentation. The
default value is true." },
"deprecated": { "kind": "attribute", "displayName": "Deprecated",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Marks this rest operation as deprecated in OpenApi
documentation." },
"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 This option will override
what may be configured on a parent level. 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." },
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 415e927..f90765c 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
@@ -19,7 +19,6 @@
"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." },
- "routeId": { "kind": "attribute", "displayName": "Route Id", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The route id this rest-dsl
is using (read-only)" },
"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 this rest operation in API documentation. The
default value is true." },
"deprecated": { "kind": "attribute", "displayName": "Deprecated",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Marks this rest operation as deprecated in OpenApi
documentation." },
"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 This option will override
what may be configured on a parent level. 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." },
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 760e13f..0f5d175 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
@@ -19,7 +19,6 @@
"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." },
- "routeId": { "kind": "attribute", "displayName": "Route Id", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The route id this rest-dsl
is using (read-only)" },
"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 this rest operation in API documentation. The
default value is true." },
"deprecated": { "kind": "attribute", "displayName": "Deprecated",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Marks this rest operation as deprecated in OpenApi
documentation." },
"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 This option will override
what may be configured on a parent level. 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." },
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 673972d..666c6b6 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
@@ -19,7 +19,6 @@
"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." },
- "routeId": { "kind": "attribute", "displayName": "Route Id", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The route id this rest-dsl
is using (read-only)" },
"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 this rest operation in API documentation. The
default value is true." },
"deprecated": { "kind": "attribute", "displayName": "Deprecated",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Marks this rest operation as deprecated in OpenApi
documentation." },
"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 This option will override
what may be configured on a parent level. 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." },
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 7dfa092..8bf87a2 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
@@ -19,7 +19,6 @@
"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." },
- "routeId": { "kind": "attribute", "displayName": "Route Id", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The route id this rest-dsl
is using (read-only)" },
"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 this rest operation in API documentation. The
default value is true." },
"deprecated": { "kind": "attribute", "displayName": "Deprecated",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Marks this rest operation as deprecated in OpenApi
documentation." },
"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 This option will override
what may be configured on a parent level. 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." },
diff --git
a/dsl/camel-xml-jaxb-dsl-test/swagger/src/test/java/org/apache/camel/dsl/xml/jaxb/swagger/RestSwaggerReaderPropertyPlaceholderTest.java
b/dsl/camel-xml-jaxb-dsl-test/swagger/src/test/java/org/apache/camel/dsl/xml/jaxb/swagger/RestSwaggerReaderPropertyPlaceholderTest.java
index 93c2a84..cec767a 100644
---
a/dsl/camel-xml-jaxb-dsl-test/swagger/src/test/java/org/apache/camel/dsl/xml/jaxb/swagger/RestSwaggerReaderPropertyPlaceholderTest.java
+++
b/dsl/camel-xml-jaxb-dsl-test/swagger/src/test/java/org/apache/camel/dsl/xml/jaxb/swagger/RestSwaggerReaderPropertyPlaceholderTest.java
@@ -93,7 +93,7 @@ public class RestSwaggerReaderPropertyPlaceholderTest extends
CamelTestSupport {
RestSwaggerSupport support = new RestSwaggerSupport();
List<RestDefinition> rests = support.getRestDefinitions(context);
- Swagger swagger = reader.read(rests, config, context.getName(), new
DefaultClassResolver());
+ Swagger swagger = reader.read(context, rests, config,
context.getName(), new DefaultClassResolver());
assertNotNull(swagger);
ObjectMapper mapper = new ObjectMapper();
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 f74eeca..f0cb618 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
@@ -3992,7 +3992,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "produces", type = "string"),
@YamlProperty(name = "response-message", type =
"array:org.apache.camel.model.rest.RestOperationResponseMsgDefinition"),
@YamlProperty(name = "route", type =
"object:org.apache.camel.model.RouteDefinition"),
- @YamlProperty(name = "route-id", type = "string"),
@YamlProperty(name = "security", type =
"array:org.apache.camel.model.rest.SecurityDefinition"),
@YamlProperty(name = "skip-binding-on-error-code", type =
"boolean"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition"),
@@ -4070,11 +4069,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setResponseMsgs(val);
break;
}
- case "route-id": {
- String val = asText(node);
- target.setRouteId(val);
- break;
- }
case "security": {
java.util.List<org.apache.camel.model.rest.SecurityDefinition> val =
asFlatList(node, org.apache.camel.model.rest.SecurityDefinition.class);
target.setSecurity(val);
@@ -5363,7 +5357,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "produces", type = "string"),
@YamlProperty(name = "response-message", type =
"array:org.apache.camel.model.rest.RestOperationResponseMsgDefinition"),
@YamlProperty(name = "route", type =
"object:org.apache.camel.model.RouteDefinition"),
- @YamlProperty(name = "route-id", type = "string"),
@YamlProperty(name = "security", type =
"array:org.apache.camel.model.rest.SecurityDefinition"),
@YamlProperty(name = "skip-binding-on-error-code", type =
"boolean"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition"),
@@ -5441,11 +5434,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setResponseMsgs(val);
break;
}
- case "route-id": {
- String val = asText(node);
- target.setRouteId(val);
- break;
- }
case "security": {
java.util.List<org.apache.camel.model.rest.SecurityDefinition> val =
asFlatList(node, org.apache.camel.model.rest.SecurityDefinition.class);
target.setSecurity(val);
@@ -5800,7 +5788,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "produces", type = "string"),
@YamlProperty(name = "response-message", type =
"array:org.apache.camel.model.rest.RestOperationResponseMsgDefinition"),
@YamlProperty(name = "route", type =
"object:org.apache.camel.model.RouteDefinition"),
- @YamlProperty(name = "route-id", type = "string"),
@YamlProperty(name = "security", type =
"array:org.apache.camel.model.rest.SecurityDefinition"),
@YamlProperty(name = "skip-binding-on-error-code", type =
"boolean"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition"),
@@ -5878,11 +5865,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setResponseMsgs(val);
break;
}
- case "route-id": {
- String val = asText(node);
- target.setRouteId(val);
- break;
- }
case "security": {
java.util.List<org.apache.camel.model.rest.SecurityDefinition> val =
asFlatList(node, org.apache.camel.model.rest.SecurityDefinition.class);
target.setSecurity(val);
@@ -9578,7 +9560,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "produces", type = "string"),
@YamlProperty(name = "response-message", type =
"array:org.apache.camel.model.rest.RestOperationResponseMsgDefinition"),
@YamlProperty(name = "route", type =
"object:org.apache.camel.model.RouteDefinition"),
- @YamlProperty(name = "route-id", type = "string"),
@YamlProperty(name = "security", type =
"array:org.apache.camel.model.rest.SecurityDefinition"),
@YamlProperty(name = "skip-binding-on-error-code", type =
"boolean"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition"),
@@ -9656,11 +9637,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setResponseMsgs(val);
break;
}
- case "route-id": {
- String val = asText(node);
- target.setRouteId(val);
- break;
- }
case "security": {
java.util.List<org.apache.camel.model.rest.SecurityDefinition> val =
asFlatList(node, org.apache.camel.model.rest.SecurityDefinition.class);
target.setSecurity(val);
@@ -9955,7 +9931,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "produces", type = "string"),
@YamlProperty(name = "response-message", type =
"array:org.apache.camel.model.rest.RestOperationResponseMsgDefinition"),
@YamlProperty(name = "route", type =
"object:org.apache.camel.model.RouteDefinition"),
- @YamlProperty(name = "route-id", type = "string"),
@YamlProperty(name = "security", type =
"array:org.apache.camel.model.rest.SecurityDefinition"),
@YamlProperty(name = "skip-binding-on-error-code", type =
"boolean"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition"),
@@ -10033,11 +10008,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setResponseMsgs(val);
break;
}
- case "route-id": {
- String val = asText(node);
- target.setRouteId(val);
- break;
- }
case "security": {
java.util.List<org.apache.camel.model.rest.SecurityDefinition> val =
asFlatList(node, org.apache.camel.model.rest.SecurityDefinition.class);
target.setSecurity(val);
@@ -10458,7 +10428,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "produces", type = "string"),
@YamlProperty(name = "response-message", type =
"array:org.apache.camel.model.rest.RestOperationResponseMsgDefinition"),
@YamlProperty(name = "route", type =
"object:org.apache.camel.model.RouteDefinition"),
- @YamlProperty(name = "route-id", type = "string"),
@YamlProperty(name = "security", type =
"array:org.apache.camel.model.rest.SecurityDefinition"),
@YamlProperty(name = "skip-binding-on-error-code", type =
"boolean"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition"),
@@ -10536,11 +10505,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setResponseMsgs(val);
break;
}
- case "route-id": {
- String val = asText(node);
- target.setRouteId(val);
- break;
- }
case "security": {
java.util.List<org.apache.camel.model.rest.SecurityDefinition> val =
asFlatList(node, org.apache.camel.model.rest.SecurityDefinition.class);
target.setSecurity(val);
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 2cd53c4..34ca020 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
@@ -6595,9 +6595,6 @@
"route" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.RouteDefinition"
},
- "route-id" : {
- "type" : "string"
- },
"security" : {
"type" : "array",
"items" : {
@@ -6675,9 +6672,6 @@
"route" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.RouteDefinition"
},
- "route-id" : {
- "type" : "string"
- },
"security" : {
"type" : "array",
"items" : {
@@ -6755,9 +6749,6 @@
"route" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.RouteDefinition"
},
- "route-id" : {
- "type" : "string"
- },
"security" : {
"type" : "array",
"items" : {
@@ -6835,9 +6826,6 @@
"route" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.RouteDefinition"
},
- "route-id" : {
- "type" : "string"
- },
"security" : {
"type" : "array",
"items" : {
@@ -6915,9 +6903,6 @@
"route" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.RouteDefinition"
},
- "route-id" : {
- "type" : "string"
- },
"security" : {
"type" : "array",
"items" : {
@@ -6995,9 +6980,6 @@
"route" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.RouteDefinition"
},
- "route-id" : {
- "type" : "string"
- },
"security" : {
"type" : "array",
"items" : {
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 b148f0c..fe7be29 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
@@ -6493,9 +6493,6 @@
"route" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.RouteDefinition"
},
- "routeId" : {
- "type" : "string"
- },
"security" : {
"type" : "array",
"items" : {
@@ -6573,9 +6570,6 @@
"route" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.RouteDefinition"
},
- "routeId" : {
- "type" : "string"
- },
"security" : {
"type" : "array",
"items" : {
@@ -6653,9 +6647,6 @@
"route" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.RouteDefinition"
},
- "routeId" : {
- "type" : "string"
- },
"security" : {
"type" : "array",
"items" : {
@@ -6733,9 +6724,6 @@
"route" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.RouteDefinition"
},
- "routeId" : {
- "type" : "string"
- },
"security" : {
"type" : "array",
"items" : {
@@ -6813,9 +6801,6 @@
"route" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.RouteDefinition"
},
- "routeId" : {
- "type" : "string"
- },
"security" : {
"type" : "array",
"items" : {
@@ -6893,9 +6878,6 @@
"route" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.RouteDefinition"
},
- "routeId" : {
- "type" : "string"
- },
"security" : {
"type" : "array",
"items" : {
