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 f31944feeef8cb1baad0390375847f7f9e425bb6 Author: Claus Ibsen <[email protected]> AuthorDate: Fri Feb 18 12:53:02 2022 +0100 CAMEL-17673: camel-core-model - Cleanup Rest DSL --- .../org/apache/camel/model/rest/delete.json | 1 - .../resources/org/apache/camel/model/rest/get.json | 1 - .../org/apache/camel/model/rest/head.json | 1 - .../org/apache/camel/model/rest/patch.json | 1 - .../org/apache/camel/model/rest/post.json | 1 - .../resources/org/apache/camel/model/rest/put.json | 1 - .../apache/camel/model/rest/VerbDefinition.java | 18 +------- .../java/org/apache/camel/xml/in/ModelParser.java | 1 - .../dsl/yaml/deserializers/ModelDeserializers.java | 48 +++------------------- .../src/generated/resources/camel-yaml-dsl.json | 18 -------- .../src/generated/resources/camelYamlDsl.json | 18 -------- 11 files changed, 7 insertions(+), 102 deletions(-) diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json index 4d66dbd..7e752a7 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/delete.json @@ -12,7 +12,6 @@ "output": false }, "properties": { - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Deprecated use path instead." }, "path": { "kind": "attribute", "displayName": "Path", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The path mapping URIs of this REST operation 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/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/get.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/get.json index 8df3292..eabc9f4 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/get.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/get.json @@ -12,7 +12,6 @@ "output": false }, "properties": { - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Deprecated use path instead." }, "path": { "kind": "attribute", "displayName": "Path", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The path mapping URIs of this REST operation 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/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/head.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/head.json index 1612b71..415e927 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/head.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/head.json @@ -12,7 +12,6 @@ "output": false }, "properties": { - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Deprecated use path instead." }, "path": { "kind": "attribute", "displayName": "Path", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The path mapping URIs of this REST operation 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/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/patch.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/patch.json index 975cb54..760e13f 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/patch.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/patch.json @@ -12,7 +12,6 @@ "output": false }, "properties": { - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Deprecated use path instead." }, "path": { "kind": "attribute", "displayName": "Path", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The path mapping URIs of this REST operation 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/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/post.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/post.json index 850e5ad..673972d 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/post.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/post.json @@ -12,7 +12,6 @@ "output": false }, "properties": { - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Deprecated use path instead." }, "path": { "kind": "attribute", "displayName": "Path", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The path mapping URIs of this REST operation 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/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/put.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/put.json index 4018c38..7dfa092 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/put.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/put.json @@ -12,7 +12,6 @@ "output": false }, "properties": { - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Deprecated use path instead." }, "path": { "kind": "attribute", "displayName": "Path", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The path mapping URIs of this REST operation 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/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 a4f67ad..cd4a187 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 @@ -51,9 +51,6 @@ public abstract class VerbDefinition extends OptionalIdentifiedDefinition<VerbDe private List<SecurityDefinition> security = new ArrayList<>(); @XmlAttribute - @Deprecated - private String uri; - @XmlAttribute private String path; @XmlAttribute private String consumes; @@ -177,21 +174,8 @@ public abstract class VerbDefinition extends OptionalIdentifiedDefinition<VerbDe this.security = security; } - @Deprecated - public String getUri() { - return path; - } - - /** - * Deprecated use path instead. - */ - @Deprecated - public void setUri(String uri) { - this.path = uri; - } - public String getPath() { - return path != null ? path : uri; + return path; } /** diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java index 523093c..9212a89 100644 --- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java +++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java @@ -2821,7 +2821,6 @@ public class ModelParser extends BaseParser { case "routeId": def.setRouteId(val); break; case "skipBindingOnErrorCode": def.setSkipBindingOnErrorCode(val); break; case "type": def.setType(val); break; - case "uri": def.setUri(val); break; default: return optionalIdentifiedDefinitionAttributeHandler().accept(def, key, val); } return true; 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 18fa1ef..e1c4560 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 @@ -3998,8 +3998,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "steps", type = "array:org.apache.camel.model.ProcessorDefinition"), @YamlProperty(name = "to", type = "object:org.apache.camel.model.ToDefinition"), @YamlProperty(name = "to-d", type = "object:org.apache.camel.model.ToDynamicDefinition"), - @YamlProperty(name = "type", type = "string"), - @YamlProperty(name = "uri", type = "string", deprecated = true) + @YamlProperty(name = "type", type = "string") } ) public static class DeleteDefinitionDeserializer extends YamlDeserializerBase<DeleteDefinition> { @@ -4111,11 +4110,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setType(val); break; } - case "uri": { - String val = asText(node); - target.setUri(val); - break; - } case "id": { String val = asText(node); target.setId(val); @@ -5375,8 +5369,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "steps", type = "array:org.apache.camel.model.ProcessorDefinition"), @YamlProperty(name = "to", type = "object:org.apache.camel.model.ToDefinition"), @YamlProperty(name = "to-d", type = "object:org.apache.camel.model.ToDynamicDefinition"), - @YamlProperty(name = "type", type = "string"), - @YamlProperty(name = "uri", type = "string", deprecated = true) + @YamlProperty(name = "type", type = "string") } ) public static class GetDefinitionDeserializer extends YamlDeserializerBase<GetDefinition> { @@ -5488,11 +5481,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setType(val); break; } - case "uri": { - String val = asText(node); - target.setUri(val); - break; - } case "id": { String val = asText(node); target.setId(val); @@ -5818,8 +5806,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "steps", type = "array:org.apache.camel.model.ProcessorDefinition"), @YamlProperty(name = "to", type = "object:org.apache.camel.model.ToDefinition"), @YamlProperty(name = "to-d", type = "object:org.apache.camel.model.ToDynamicDefinition"), - @YamlProperty(name = "type", type = "string"), - @YamlProperty(name = "uri", type = "string", deprecated = true) + @YamlProperty(name = "type", type = "string") } ) public static class HeadDefinitionDeserializer extends YamlDeserializerBase<HeadDefinition> { @@ -5931,11 +5918,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setType(val); break; } - case "uri": { - String val = asText(node); - target.setUri(val); - break; - } case "id": { String val = asText(node); target.setId(val); @@ -9602,8 +9584,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "steps", type = "array:org.apache.camel.model.ProcessorDefinition"), @YamlProperty(name = "to", type = "object:org.apache.camel.model.ToDefinition"), @YamlProperty(name = "to-d", type = "object:org.apache.camel.model.ToDynamicDefinition"), - @YamlProperty(name = "type", type = "string"), - @YamlProperty(name = "uri", type = "string", deprecated = true) + @YamlProperty(name = "type", type = "string") } ) public static class PatchDefinitionDeserializer extends YamlDeserializerBase<PatchDefinition> { @@ -9715,11 +9696,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setType(val); break; } - case "uri": { - String val = asText(node); - target.setUri(val); - break; - } case "id": { String val = asText(node); target.setId(val); @@ -9985,8 +9961,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "steps", type = "array:org.apache.camel.model.ProcessorDefinition"), @YamlProperty(name = "to", type = "object:org.apache.camel.model.ToDefinition"), @YamlProperty(name = "to-d", type = "object:org.apache.camel.model.ToDynamicDefinition"), - @YamlProperty(name = "type", type = "string"), - @YamlProperty(name = "uri", type = "string", deprecated = true) + @YamlProperty(name = "type", type = "string") } ) public static class PostDefinitionDeserializer extends YamlDeserializerBase<PostDefinition> { @@ -10098,11 +10073,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setType(val); break; } - case "uri": { - String val = asText(node); - target.setUri(val); - break; - } case "id": { String val = asText(node); target.setId(val); @@ -10494,8 +10464,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { @YamlProperty(name = "steps", type = "array:org.apache.camel.model.ProcessorDefinition"), @YamlProperty(name = "to", type = "object:org.apache.camel.model.ToDefinition"), @YamlProperty(name = "to-d", type = "object:org.apache.camel.model.ToDynamicDefinition"), - @YamlProperty(name = "type", type = "string"), - @YamlProperty(name = "uri", type = "string", deprecated = true) + @YamlProperty(name = "type", type = "string") } ) public static class PutDefinitionDeserializer extends YamlDeserializerBase<PutDefinition> { @@ -10607,11 +10576,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setType(val); break; } - case "uri": { - String val = asText(node); - target.setUri(val); - break; - } case "id": { String val = asText(node); target.setId(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 54be238..ee163c4 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 @@ -6621,9 +6621,6 @@ }, "type" : { "type" : "string" - }, - "uri" : { - "type" : "string" } } }, @@ -6704,9 +6701,6 @@ }, "type" : { "type" : "string" - }, - "uri" : { - "type" : "string" } } }, @@ -6787,9 +6781,6 @@ }, "type" : { "type" : "string" - }, - "uri" : { - "type" : "string" } } }, @@ -6870,9 +6861,6 @@ }, "type" : { "type" : "string" - }, - "uri" : { - "type" : "string" } } }, @@ -6953,9 +6941,6 @@ }, "type" : { "type" : "string" - }, - "uri" : { - "type" : "string" } } }, @@ -7036,9 +7021,6 @@ }, "type" : { "type" : "string" - }, - "uri" : { - "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 f34f2a7..a6725f8 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 @@ -6519,9 +6519,6 @@ }, "type" : { "type" : "string" - }, - "uri" : { - "type" : "string" } } }, @@ -6602,9 +6599,6 @@ }, "type" : { "type" : "string" - }, - "uri" : { - "type" : "string" } } }, @@ -6685,9 +6679,6 @@ }, "type" : { "type" : "string" - }, - "uri" : { - "type" : "string" } } }, @@ -6768,9 +6759,6 @@ }, "type" : { "type" : "string" - }, - "uri" : { - "type" : "string" } } }, @@ -6851,9 +6839,6 @@ }, "type" : { "type" : "string" - }, - "uri" : { - "type" : "string" } } }, @@ -6934,9 +6919,6 @@ }, "type" : { "type" : "string" - }, - "uri" : { - "type" : "string" } } },
