This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch rest-to in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9c112777f7429549f7063c05c353d45d3de1f2aa Author: Claus Ibsen <[email protected]> AuthorDate: Tue Feb 22 12:45:53 2022 +0100 CAMEL-17675: camel-core - Rest DSL remove support for using inlined routes. --- .../apache/camel/model/rest/VerbDefinition.java | 3 +- .../dsl/yaml/deserializers/ModelDeserializers.java | 30 --------- .../src/generated/resources/camel-yaml-dsl.json | 72 ---------------------- .../src/generated/resources/camelYamlDsl.json | 72 ---------------------- .../org/apache/camel/dsl/yaml/RestTest.groovy | 6 +- 5 files changed, 3 insertions(+), 180 deletions(-) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java index 732eeaa..00a4f69 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java @@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.model.OptionalIdentifiedDefinition; -import org.apache.camel.model.OutputNode; import org.apache.camel.model.ToDefinition; import org.apache.camel.spi.Metadata; @@ -36,7 +35,7 @@ import org.apache.camel.spi.Metadata; */ @Metadata(label = "rest") @XmlAccessorType(XmlAccessType.FIELD) -public abstract class VerbDefinition extends OptionalIdentifiedDefinition<VerbDefinition> implements OutputNode { +public abstract class VerbDefinition extends OptionalIdentifiedDefinition<VerbDefinition> { @XmlTransient private RestDefinition rest; 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 5b53cff..b0d19de 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 @@ -3993,7 +3993,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "response-message", type = "array:org.apache.camel.model.rest.RestOperationResponseMsgDefinition"), @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"), @YamlProperty(name = "to", type = "object:org.apache.camel.model.ToDefinition"), @YamlProperty(name = "type", type = "string") } @@ -4097,10 +4096,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDescription(val); break; } - case "steps": { - setSteps(target, node); - break; - } default: { return false; } @@ -5341,7 +5336,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "response-message", type = "array:org.apache.camel.model.rest.RestOperationResponseMsgDefinition"), @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"), @YamlProperty(name = "to", type = "object:org.apache.camel.model.ToDefinition"), @YamlProperty(name = "type", type = "string") } @@ -5445,10 +5439,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDescription(val); break; } - case "steps": { - setSteps(target, node); - break; - } default: { return false; } @@ -5755,7 +5745,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "response-message", type = "array:org.apache.camel.model.rest.RestOperationResponseMsgDefinition"), @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"), @YamlProperty(name = "to", type = "object:org.apache.camel.model.ToDefinition"), @YamlProperty(name = "type", type = "string") } @@ -5859,10 +5848,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDescription(val); break; } - case "steps": { - setSteps(target, node); - break; - } default: { return false; } @@ -9510,7 +9495,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "response-message", type = "array:org.apache.camel.model.rest.RestOperationResponseMsgDefinition"), @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"), @YamlProperty(name = "to", type = "object:org.apache.camel.model.ToDefinition"), @YamlProperty(name = "type", type = "string") } @@ -9614,10 +9598,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDescription(val); break; } - case "steps": { - setSteps(target, node); - break; - } default: { return false; } @@ -9864,7 +9844,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "response-message", type = "array:org.apache.camel.model.rest.RestOperationResponseMsgDefinition"), @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"), @YamlProperty(name = "to", type = "object:org.apache.camel.model.ToDefinition"), @YamlProperty(name = "type", type = "string") } @@ -9968,10 +9947,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDescription(val); break; } - case "steps": { - setSteps(target, node); - break; - } default: { return false; } @@ -10344,7 +10319,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "response-message", type = "array:org.apache.camel.model.rest.RestOperationResponseMsgDefinition"), @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"), @YamlProperty(name = "to", type = "object:org.apache.camel.model.ToDefinition"), @YamlProperty(name = "type", type = "string") } @@ -10448,10 +10422,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDescription(val); break; } - case "steps": { - setSteps(target, node); - break; - } default: { return false; } 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 34ca020..3a9bcbf 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 @@ -6592,9 +6592,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestOperationResponseMsgDefinition" } }, - "route" : { - "$ref" : "#/items/definitions/org.apache.camel.model.RouteDefinition" - }, "security" : { "type" : "array", "items" : { @@ -6604,18 +6601,9 @@ "skip-binding-on-error-code" : { "type" : "boolean" }, - "steps" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition" - } - }, "to" : { "$ref" : "#/items/definitions/org.apache.camel.model.ToDefinition" }, - "to-d" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition" - }, "type" : { "type" : "string" } @@ -6669,9 +6657,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestOperationResponseMsgDefinition" } }, - "route" : { - "$ref" : "#/items/definitions/org.apache.camel.model.RouteDefinition" - }, "security" : { "type" : "array", "items" : { @@ -6681,18 +6666,9 @@ "skip-binding-on-error-code" : { "type" : "boolean" }, - "steps" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition" - } - }, "to" : { "$ref" : "#/items/definitions/org.apache.camel.model.ToDefinition" }, - "to-d" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition" - }, "type" : { "type" : "string" } @@ -6746,9 +6722,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestOperationResponseMsgDefinition" } }, - "route" : { - "$ref" : "#/items/definitions/org.apache.camel.model.RouteDefinition" - }, "security" : { "type" : "array", "items" : { @@ -6758,18 +6731,9 @@ "skip-binding-on-error-code" : { "type" : "boolean" }, - "steps" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition" - } - }, "to" : { "$ref" : "#/items/definitions/org.apache.camel.model.ToDefinition" }, - "to-d" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition" - }, "type" : { "type" : "string" } @@ -6823,9 +6787,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestOperationResponseMsgDefinition" } }, - "route" : { - "$ref" : "#/items/definitions/org.apache.camel.model.RouteDefinition" - }, "security" : { "type" : "array", "items" : { @@ -6835,18 +6796,9 @@ "skip-binding-on-error-code" : { "type" : "boolean" }, - "steps" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition" - } - }, "to" : { "$ref" : "#/items/definitions/org.apache.camel.model.ToDefinition" }, - "to-d" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition" - }, "type" : { "type" : "string" } @@ -6900,9 +6852,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestOperationResponseMsgDefinition" } }, - "route" : { - "$ref" : "#/items/definitions/org.apache.camel.model.RouteDefinition" - }, "security" : { "type" : "array", "items" : { @@ -6912,18 +6861,9 @@ "skip-binding-on-error-code" : { "type" : "boolean" }, - "steps" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition" - } - }, "to" : { "$ref" : "#/items/definitions/org.apache.camel.model.ToDefinition" }, - "to-d" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition" - }, "type" : { "type" : "string" } @@ -6977,9 +6917,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestOperationResponseMsgDefinition" } }, - "route" : { - "$ref" : "#/items/definitions/org.apache.camel.model.RouteDefinition" - }, "security" : { "type" : "array", "items" : { @@ -6989,18 +6926,9 @@ "skip-binding-on-error-code" : { "type" : "boolean" }, - "steps" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition" - } - }, "to" : { "$ref" : "#/items/definitions/org.apache.camel.model.ToDefinition" }, - "to-d" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition" - }, "type" : { "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 fe7be29..930ed37 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 @@ -6490,9 +6490,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestOperationResponseMsgDefinition" } }, - "route" : { - "$ref" : "#/items/definitions/org.apache.camel.model.RouteDefinition" - }, "security" : { "type" : "array", "items" : { @@ -6502,18 +6499,9 @@ "skipBindingOnErrorCode" : { "type" : "boolean" }, - "steps" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition" - } - }, "to" : { "$ref" : "#/items/definitions/org.apache.camel.model.ToDefinition" }, - "toD" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition" - }, "type" : { "type" : "string" } @@ -6567,9 +6555,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestOperationResponseMsgDefinition" } }, - "route" : { - "$ref" : "#/items/definitions/org.apache.camel.model.RouteDefinition" - }, "security" : { "type" : "array", "items" : { @@ -6579,18 +6564,9 @@ "skipBindingOnErrorCode" : { "type" : "boolean" }, - "steps" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition" - } - }, "to" : { "$ref" : "#/items/definitions/org.apache.camel.model.ToDefinition" }, - "toD" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition" - }, "type" : { "type" : "string" } @@ -6644,9 +6620,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestOperationResponseMsgDefinition" } }, - "route" : { - "$ref" : "#/items/definitions/org.apache.camel.model.RouteDefinition" - }, "security" : { "type" : "array", "items" : { @@ -6656,18 +6629,9 @@ "skipBindingOnErrorCode" : { "type" : "boolean" }, - "steps" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition" - } - }, "to" : { "$ref" : "#/items/definitions/org.apache.camel.model.ToDefinition" }, - "toD" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition" - }, "type" : { "type" : "string" } @@ -6721,9 +6685,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestOperationResponseMsgDefinition" } }, - "route" : { - "$ref" : "#/items/definitions/org.apache.camel.model.RouteDefinition" - }, "security" : { "type" : "array", "items" : { @@ -6733,18 +6694,9 @@ "skipBindingOnErrorCode" : { "type" : "boolean" }, - "steps" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition" - } - }, "to" : { "$ref" : "#/items/definitions/org.apache.camel.model.ToDefinition" }, - "toD" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition" - }, "type" : { "type" : "string" } @@ -6798,9 +6750,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestOperationResponseMsgDefinition" } }, - "route" : { - "$ref" : "#/items/definitions/org.apache.camel.model.RouteDefinition" - }, "security" : { "type" : "array", "items" : { @@ -6810,18 +6759,9 @@ "skipBindingOnErrorCode" : { "type" : "boolean" }, - "steps" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition" - } - }, "to" : { "$ref" : "#/items/definitions/org.apache.camel.model.ToDefinition" }, - "toD" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition" - }, "type" : { "type" : "string" } @@ -6875,9 +6815,6 @@ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestOperationResponseMsgDefinition" } }, - "route" : { - "$ref" : "#/items/definitions/org.apache.camel.model.RouteDefinition" - }, "security" : { "type" : "array", "items" : { @@ -6887,18 +6824,9 @@ "skipBindingOnErrorCode" : { "type" : "boolean" }, - "steps" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition" - } - }, "to" : { "$ref" : "#/items/definitions/org.apache.camel.model.ToDefinition" }, - "toD" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ToDynamicDefinition" - }, "type" : { "type" : "string" } diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RestTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RestTest.groovy index aec575e..567e1dc 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RestTest.groovy +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RestTest.groovy @@ -89,8 +89,7 @@ class RestTest extends YamlTestSupport { - path: "/foo" type: ${MyFooBar.name} out-type: ${MyBean.name} - steps: - - to: "direct:bar" + to: "direct:bar" - from: uri: 'direct:bar' steps: @@ -106,8 +105,7 @@ class RestTest extends YamlTestSupport { path == '/foo' type == MyFooBar.name outType == MyBean.name - - with (route.outputs[0], ToDefinition) { + with (to, ToDefinition) { endpointUri == 'direct:bar' } }
