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
The following commit(s) were added to refs/heads/main by this push:
new f42d9f2 CAMEL-17308: Remove verb as an allowed CAMEL REST YAML
element. (#6962)
f42d9f2 is described below
commit f42d9f2ad7b660e410d15c46bbe0fcb716847952
Author: Claus Ibsen <[email protected]>
AuthorDate: Sun Feb 20 09:45:49 2022 +0100
CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element. (#6962)
---
.../apache/camel/dsl/yaml/deserializers/ModelDeserializers.java | 8 +-------
.../camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java | 1 +
.../camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json | 6 ------
.../camel-yaml-dsl/src/generated/resources/camelYamlDsl.json | 6 ------
4 files changed, 2 insertions(+), 19 deletions(-)
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 e1c4560..f74eeca 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
@@ -11842,8 +11842,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@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 =
"boolean"),
- @YamlProperty(name = "tag", type = "string"),
- @YamlProperty(name = "verbs", type =
"array:org.apache.camel.model.rest.VerbDefinition")
+ @YamlProperty(name = "tag", type = "string")
}
)
public static class RestDefinitionDeserializer extends
YamlDeserializerBase<RestDefinition> {
@@ -11975,11 +11974,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setVerbs(existing);
break;
}
- case "verbs": {
- java.util.List<org.apache.camel.model.rest.VerbDefinition>
val = asFlatList(node, org.apache.camel.model.rest.VerbDefinition.class);
- target.setVerbs(val);
- break;
- }
case "id": {
String val = asText(node);
target.setId(val);
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
index a25d526..06529f5 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
@@ -820,6 +820,7 @@ public class GenerateYamlDeserializersMojo extends
GenerateYamlSupportMojo {
false)
);
});
+ return true;
}
}
}
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 ee163c4..2cd53c4 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
@@ -7248,12 +7248,6 @@
},
"tag" : {
"type" : "string"
- },
- "verbs" : {
- "type" : "array",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.VerbDefinition"
- }
}
}
},
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 a6725f8..b148f0c 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
@@ -7146,12 +7146,6 @@
},
"tag" : {
"type" : "string"
- },
- "verbs" : {
- "type" : "array",
- "items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.VerbDefinition"
- }
}
}
},
