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 ea83eff CAMEL-17664: camel-core-model - Rename rest verb files to use
same naming style as others.
ea83eff is described below
commit ea83effa58dafdf442dcfed512f7ffa90a892637
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Feb 17 15:40:34 2022 +0100
CAMEL-17664: camel-core-model - Rename rest verb files to use same naming
style as others.
---
.../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/RestDefinition.java | 3 +-
.../apache/camel/model/rest/VerbDefinition.java | 23 +--
.../java/org/apache/camel/xml/in/ModelParser.java | 1 -
.../ROOT/pages/camel-3x-upgrade-guide-3_16.adoc | 19 ++-
.../dsl/groovy/GroovyRouteBuilderLoaderTest.groovy | 8 +-
.../camel/dsl/java/joor/JavaMainRestsTest.java | 4 +-
.../apache/camel/dsl/xml/io/XmlMainRestsTest.java | 4 +-
.../camel/dsl/xml/jaxb/JaxbXmlMainRestsTest.java | 4 +-
.../dsl/yaml/deserializers/ModelDeserializers.java | 160 ++++++++-------------
.../deserializers/ModelDeserializersResolver.java | 24 ++--
.../src/generated/resources/camel-yaml-dsl.json | 42 ++----
.../src/generated/resources/camelYamlDsl.json | 42 ++----
.../org/apache/camel/dsl/yaml/RestTest.groovy | 10 +-
19 files changed, 131 insertions(+), 219 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 c766e6c..fce370a 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": {
- "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/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 54b9e85..99f0336 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": {
- "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/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 3958f22..c543e5f 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": {
- "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/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 26b61658..721cd6e 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": {
- "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/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 36af584..edfdc50 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": {
- "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/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 edddb5b..e7fca03 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": {
- "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/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index 11383bd..3a06891 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -694,8 +694,7 @@ public class RestDefinition extends
OptionalIdentifiedDefinition<RestDefinition>
} else if ("patch".equals(verb)) {
answer = new PatchDefinition();
} else {
- answer = new VerbDefinition();
- answer.setMethod(verb);
+ throw new IllegalArgumentException("Verb " + verb + " not
supported");
}
getVerbs().add(answer);
answer.setRest(this);
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 fefaef2..b239e2f0 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
@@ -43,9 +43,6 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class VerbDefinition extends
OptionalIdentifiedDefinition<VerbDefinition> implements Block, OutputNode {
- @XmlAttribute
- private String method;
-
@XmlElementRef
private List<RestOperationParamDefinition> params = new ArrayList<>();
@@ -127,11 +124,7 @@ public class VerbDefinition extends
OptionalIdentifiedDefinition<VerbDefinition>
@Override
public String getLabel() {
- if (method != null) {
- return method;
- } else {
- return "verb";
- }
+ return "verb";
}
@Override
@@ -193,17 +186,6 @@ public class VerbDefinition extends
OptionalIdentifiedDefinition<VerbDefinition>
this.security = security;
}
- public String getMethod() {
- return method;
- }
-
- /**
- * The HTTP verb such as GET, POST, DELETE, etc.
- */
- public void setMethod(String method) {
- this.method = method;
- }
-
public String getUri() {
return uri;
}
@@ -506,9 +488,8 @@ public class VerbDefinition extends
OptionalIdentifiedDefinition<VerbDefinition>
return "delete";
} else if (this instanceof HeadDefinition) {
return "head";
- } else {
- return method;
}
+ throw new IllegalArgumentException("Verb not supported");
}
public Boolean getUsedForGeneratingNodeId() {
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 5caeb02..0641583 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
@@ -2815,7 +2815,6 @@ public class ModelParser extends BaseParser {
case "consumes": def.setConsumes(val); break;
case "deprecated": def.setDeprecated(Boolean.valueOf(val));
break;
case "enableCORS": def.setEnableCORS(val); break;
- case "method": def.setMethod(val); break;
case "outType": def.setOutType(val); break;
case "produces": def.setProduces(val); break;
case "routeId": def.setRouteId(val); break;
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
index acc9c58..a0e91cc 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
@@ -15,6 +15,21 @@ Previously when Camel detected a duplicate type converter
during startup, Camel
override the existing converter and log a WARN. A more correct behaviour would
be
to keep the existing and ignore the duplicate.
+==== Rest DSL
+
+The generic verb-based definition, where the HTTP verb can be specified as a
string value
+is no longer supported for defining a REST service.
+Only the built-in verbs (get, post, put etc.) must be used.
+
+Renamed the following classes in package `org.apache.camel.model.rest`:
+
+- `DeleteVerbDefinition` to `DeleteDefinition`
+- `GetVerbDefinition` to `GetDefinition`
+- `HeadVerbDefinition` to `HeadDefinition`
+- `PatchVerbDefinition` to `PatchDefinition`
+- `PostVerbDefinition` to `PostDefinition`
+- `PutVerbDefinition` to `PutDefinition`
+
==== Saga EIP
Removed the deprecated `timeoutInMilliseconds` option, use `timeout` instead.
@@ -104,10 +119,6 @@ The option `camel.main.packageScanRouteBuilders` has been
renamed to `camel.main
Using configuration classes must now implement the interface
`org.apache.camel.main.CamelConfiguration`
and the `configure` method now takes a `CamelContext` as argument.
-=== camel-yaml-dsl and camel-xml-dsl REST services
-The verb-based definition is no longer supported for defining a REST service
in YAML or XML.
-Only the method-based definitions (get, post, etc) are supported.
-
=== camel-any23
The option `baseURI` is renamed to `baseUri`.
diff --git
a/dsl/camel-groovy-dsl/camel-groovy-dsl-test/src/test/groovy/org/apache/camel/dsl/groovy/GroovyRouteBuilderLoaderTest.groovy
b/dsl/camel-groovy-dsl/camel-groovy-dsl-test/src/test/groovy/org/apache/camel/dsl/groovy/GroovyRouteBuilderLoaderTest.groovy
index 89b9656..9db3e3a 100644
---
a/dsl/camel-groovy-dsl/camel-groovy-dsl-test/src/test/groovy/org/apache/camel/dsl/groovy/GroovyRouteBuilderLoaderTest.groovy
+++
b/dsl/camel-groovy-dsl/camel-groovy-dsl-test/src/test/groovy/org/apache/camel/dsl/groovy/GroovyRouteBuilderLoaderTest.groovy
@@ -27,8 +27,8 @@ import org.apache.camel.impl.engine.DefaultChannel
import org.apache.camel.language.bean.BeanLanguage
import org.apache.camel.model.FromDefinition
import org.apache.camel.model.ToDefinition
-import org.apache.camel.model.rest.GetVerbDefinition
-import org.apache.camel.model.rest.PostVerbDefinition
+import org.apache.camel.model.rest.GetDefinition
+import org.apache.camel.model.rest.PostDefinition
import org.apache.camel.processor.FatalFallbackErrorHandler
import org.apache.camel.processor.SendProcessor
import org.apache.camel.spi.HeaderFilterStrategy
@@ -84,7 +84,7 @@ class GroovyRouteBuilderLoaderTest extends Specification {
with(context.restDefinitions.find {it.path == '/my/path'}) {
verbs.size() == 1
- with(verbs.first(), GetVerbDefinition) {
+ with(verbs.first(), GetDefinition) {
uri == '/get'
consumes == 'application/json'
produces == 'application/json'
@@ -98,7 +98,7 @@ class GroovyRouteBuilderLoaderTest extends Specification {
with(context.restDefinitions.find {it.path == '/post'}) {
verbs.size() == 1
- with(verbs.first(), PostVerbDefinition) {
+ with(verbs.first(), PostDefinition) {
uri == null
consumes == 'application/json'
produces == 'application/json'
diff --git
a/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/JavaMainRestsTest.java
b/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/JavaMainRestsTest.java
index d91acce..f0be34b 100644
---
a/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/JavaMainRestsTest.java
+++
b/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/JavaMainRestsTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.dsl.java.joor.support.MockRestConsumerFactory;
import org.apache.camel.main.Main;
import org.apache.camel.model.ModelCamelContext;
-import org.apache.camel.model.rest.GetVerbDefinition;
+import org.apache.camel.model.rest.GetDefinition;
import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.rest.VerbDefinition;
import org.junit.jupiter.api.Test;
@@ -108,7 +108,7 @@ public class JavaMainRestsTest {
assertEquals(1, verbs.size());
VerbDefinition verbDefinition = verbs.get(0);
- assertTrue(verbDefinition instanceof GetVerbDefinition);
+ assertTrue(verbDefinition instanceof GetDefinition);
main.stop();
}
diff --git
a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlMainRestsTest.java
b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlMainRestsTest.java
index 948d9c9..35ce217 100644
---
a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlMainRestsTest.java
+++
b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlMainRestsTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.dsl.xml.io.support.MockRestConsumerFactory;
import org.apache.camel.main.Main;
import org.apache.camel.model.ModelCamelContext;
-import org.apache.camel.model.rest.GetVerbDefinition;
+import org.apache.camel.model.rest.GetDefinition;
import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.rest.VerbDefinition;
import org.junit.jupiter.api.Test;
@@ -108,7 +108,7 @@ public class XmlMainRestsTest {
assertEquals(1, verbs.size());
VerbDefinition verbDefinition = verbs.get(0);
- assertTrue(verbDefinition instanceof GetVerbDefinition);
+ assertTrue(verbDefinition instanceof GetDefinition);
main.stop();
}
diff --git
a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlMainRestsTest.java
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlMainRestsTest.java
index 7710282..a304c7c 100644
---
a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlMainRestsTest.java
+++
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlMainRestsTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.dsl.xml.jaxb.support.MockRestConsumerFactory;
import org.apache.camel.main.Main;
import org.apache.camel.model.ModelCamelContext;
-import org.apache.camel.model.rest.GetVerbDefinition;
+import org.apache.camel.model.rest.GetDefinition;
import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.rest.VerbDefinition;
import org.junit.jupiter.api.Test;
@@ -108,7 +108,7 @@ public class JaxbXmlMainRestsTest {
assertEquals(1, verbs.size());
VerbDefinition verbDefinition = verbs.get(0);
- assertTrue(verbDefinition instanceof GetVerbDefinition);
+ assertTrue(verbDefinition instanceof GetDefinition);
main.stop();
}
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 41e10db..f52c063 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
@@ -198,12 +198,12 @@ import
org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition;
import org.apache.camel.model.loadbalancer.StickyLoadBalancerDefinition;
import org.apache.camel.model.loadbalancer.TopicLoadBalancerDefinition;
import org.apache.camel.model.loadbalancer.WeightedLoadBalancerDefinition;
-import org.apache.camel.model.rest.DeleteVerbDefinition;
-import org.apache.camel.model.rest.GetVerbDefinition;
-import org.apache.camel.model.rest.HeadVerbDefinition;
-import org.apache.camel.model.rest.PatchVerbDefinition;
-import org.apache.camel.model.rest.PostVerbDefinition;
-import org.apache.camel.model.rest.PutVerbDefinition;
+import org.apache.camel.model.rest.DeleteDefinition;
+import org.apache.camel.model.rest.GetDefinition;
+import org.apache.camel.model.rest.HeadDefinition;
+import org.apache.camel.model.rest.PatchDefinition;
+import org.apache.camel.model.rest.PostDefinition;
+import org.apache.camel.model.rest.PutDefinition;
import org.apache.camel.model.rest.RestBindingDefinition;
import org.apache.camel.model.rest.RestConfigurationDefinition;
import org.apache.camel.model.rest.RestDefinition;
@@ -3974,7 +3974,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
}
@YamlType(
- types = org.apache.camel.model.rest.DeleteVerbDefinition.class,
+ types = org.apache.camel.model.rest.DeleteDefinition.class,
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = "delete",
properties = {
@@ -3986,7 +3986,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "description", type = "string"),
@YamlProperty(name = "enable-cors", type = "string"),
@YamlProperty(name = "id", type = "string"),
- @YamlProperty(name = "method", type = "string"),
@YamlProperty(name = "out-type", type = "string"),
@YamlProperty(name = "param", type =
"array:org.apache.camel.model.rest.RestOperationParamDefinition"),
@YamlProperty(name = "produces", type = "string"),
@@ -4002,18 +4001,18 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "uri", type = "string")
}
)
- public static class DeleteVerbDefinitionDeserializer extends
YamlDeserializerBase<DeleteVerbDefinition> {
- public DeleteVerbDefinitionDeserializer() {
- super(DeleteVerbDefinition.class);
+ public static class DeleteDefinitionDeserializer extends
YamlDeserializerBase<DeleteDefinition> {
+ public DeleteDefinitionDeserializer() {
+ super(DeleteDefinition.class);
}
@Override
- protected DeleteVerbDefinition newInstance() {
- return new DeleteVerbDefinition();
+ protected DeleteDefinition newInstance() {
+ return new DeleteDefinition();
}
@Override
- protected boolean setProperty(DeleteVerbDefinition target, String
propertyKey,
+ protected boolean setProperty(DeleteDefinition target, String
propertyKey,
String propertyName, Node node) {
switch(propertyKey) {
case "api-docs": {
@@ -4046,11 +4045,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setEnableCORS(val);
break;
}
- case "method": {
- String val = asText(node);
- target.setMethod(val);
- break;
- }
case "out-type": {
String val = asText(node);
target.setOutType(val);
@@ -5351,7 +5345,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
}
@YamlType(
- types = org.apache.camel.model.rest.GetVerbDefinition.class,
+ types = org.apache.camel.model.rest.GetDefinition.class,
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = "get",
properties = {
@@ -5363,7 +5357,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "description", type = "string"),
@YamlProperty(name = "enable-cors", type = "string"),
@YamlProperty(name = "id", type = "string"),
- @YamlProperty(name = "method", type = "string"),
@YamlProperty(name = "out-type", type = "string"),
@YamlProperty(name = "param", type =
"array:org.apache.camel.model.rest.RestOperationParamDefinition"),
@YamlProperty(name = "produces", type = "string"),
@@ -5379,19 +5372,19 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "uri", type = "string")
}
)
- public static class GetVerbDefinitionDeserializer extends
YamlDeserializerBase<GetVerbDefinition> {
- public GetVerbDefinitionDeserializer() {
- super(GetVerbDefinition.class);
+ public static class GetDefinitionDeserializer extends
YamlDeserializerBase<GetDefinition> {
+ public GetDefinitionDeserializer() {
+ super(GetDefinition.class);
}
@Override
- protected GetVerbDefinition newInstance() {
- return new GetVerbDefinition();
+ protected GetDefinition newInstance() {
+ return new GetDefinition();
}
@Override
- protected boolean setProperty(GetVerbDefinition target, String
propertyKey,
- String propertyName, Node node) {
+ protected boolean setProperty(GetDefinition target, String
propertyKey, String propertyName,
+ Node node) {
switch(propertyKey) {
case "api-docs": {
String val = asText(node);
@@ -5423,11 +5416,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setEnableCORS(val);
break;
}
- case "method": {
- String val = asText(node);
- target.setMethod(val);
- break;
- }
case "out-type": {
String val = asText(node);
target.setOutType(val);
@@ -5794,7 +5782,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
}
@YamlType(
- types = org.apache.camel.model.rest.HeadVerbDefinition.class,
+ types = org.apache.camel.model.rest.HeadDefinition.class,
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = "head",
properties = {
@@ -5806,7 +5794,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "description", type = "string"),
@YamlProperty(name = "enable-cors", type = "string"),
@YamlProperty(name = "id", type = "string"),
- @YamlProperty(name = "method", type = "string"),
@YamlProperty(name = "out-type", type = "string"),
@YamlProperty(name = "param", type =
"array:org.apache.camel.model.rest.RestOperationParamDefinition"),
@YamlProperty(name = "produces", type = "string"),
@@ -5822,18 +5809,18 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "uri", type = "string")
}
)
- public static class HeadVerbDefinitionDeserializer extends
YamlDeserializerBase<HeadVerbDefinition> {
- public HeadVerbDefinitionDeserializer() {
- super(HeadVerbDefinition.class);
+ public static class HeadDefinitionDeserializer extends
YamlDeserializerBase<HeadDefinition> {
+ public HeadDefinitionDeserializer() {
+ super(HeadDefinition.class);
}
@Override
- protected HeadVerbDefinition newInstance() {
- return new HeadVerbDefinition();
+ protected HeadDefinition newInstance() {
+ return new HeadDefinition();
}
@Override
- protected boolean setProperty(HeadVerbDefinition target, String
propertyKey,
+ protected boolean setProperty(HeadDefinition target, String
propertyKey,
String propertyName, Node node) {
switch(propertyKey) {
case "api-docs": {
@@ -5866,11 +5853,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setEnableCORS(val);
break;
}
- case "method": {
- String val = asText(node);
- target.setMethod(val);
- break;
- }
case "out-type": {
String val = asText(node);
target.setOutType(val);
@@ -9578,7 +9560,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
}
@YamlType(
- types = org.apache.camel.model.rest.PatchVerbDefinition.class,
+ types = org.apache.camel.model.rest.PatchDefinition.class,
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = "patch",
properties = {
@@ -9590,7 +9572,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "description", type = "string"),
@YamlProperty(name = "enable-cors", type = "string"),
@YamlProperty(name = "id", type = "string"),
- @YamlProperty(name = "method", type = "string"),
@YamlProperty(name = "out-type", type = "string"),
@YamlProperty(name = "param", type =
"array:org.apache.camel.model.rest.RestOperationParamDefinition"),
@YamlProperty(name = "produces", type = "string"),
@@ -9606,18 +9587,18 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "uri", type = "string")
}
)
- public static class PatchVerbDefinitionDeserializer extends
YamlDeserializerBase<PatchVerbDefinition> {
- public PatchVerbDefinitionDeserializer() {
- super(PatchVerbDefinition.class);
+ public static class PatchDefinitionDeserializer extends
YamlDeserializerBase<PatchDefinition> {
+ public PatchDefinitionDeserializer() {
+ super(PatchDefinition.class);
}
@Override
- protected PatchVerbDefinition newInstance() {
- return new PatchVerbDefinition();
+ protected PatchDefinition newInstance() {
+ return new PatchDefinition();
}
@Override
- protected boolean setProperty(PatchVerbDefinition target, String
propertyKey,
+ protected boolean setProperty(PatchDefinition target, String
propertyKey,
String propertyName, Node node) {
switch(propertyKey) {
case "api-docs": {
@@ -9650,11 +9631,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setEnableCORS(val);
break;
}
- case "method": {
- String val = asText(node);
- target.setMethod(val);
- break;
- }
case "out-type": {
String val = asText(node);
target.setOutType(val);
@@ -9961,7 +9937,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
}
@YamlType(
- types = org.apache.camel.model.rest.PostVerbDefinition.class,
+ types = org.apache.camel.model.rest.PostDefinition.class,
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = "post",
properties = {
@@ -9973,7 +9949,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "description", type = "string"),
@YamlProperty(name = "enable-cors", type = "string"),
@YamlProperty(name = "id", type = "string"),
- @YamlProperty(name = "method", type = "string"),
@YamlProperty(name = "out-type", type = "string"),
@YamlProperty(name = "param", type =
"array:org.apache.camel.model.rest.RestOperationParamDefinition"),
@YamlProperty(name = "produces", type = "string"),
@@ -9989,18 +9964,18 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "uri", type = "string")
}
)
- public static class PostVerbDefinitionDeserializer extends
YamlDeserializerBase<PostVerbDefinition> {
- public PostVerbDefinitionDeserializer() {
- super(PostVerbDefinition.class);
+ public static class PostDefinitionDeserializer extends
YamlDeserializerBase<PostDefinition> {
+ public PostDefinitionDeserializer() {
+ super(PostDefinition.class);
}
@Override
- protected PostVerbDefinition newInstance() {
- return new PostVerbDefinition();
+ protected PostDefinition newInstance() {
+ return new PostDefinition();
}
@Override
- protected boolean setProperty(PostVerbDefinition target, String
propertyKey,
+ protected boolean setProperty(PostDefinition target, String
propertyKey,
String propertyName, Node node) {
switch(propertyKey) {
case "api-docs": {
@@ -10033,11 +10008,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setEnableCORS(val);
break;
}
- case "method": {
- String val = asText(node);
- target.setMethod(val);
- break;
- }
case "out-type": {
String val = asText(node);
target.setOutType(val);
@@ -10470,7 +10440,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
}
@YamlType(
- types = org.apache.camel.model.rest.PutVerbDefinition.class,
+ types = org.apache.camel.model.rest.PutDefinition.class,
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = "put",
properties = {
@@ -10482,7 +10452,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "description", type = "string"),
@YamlProperty(name = "enable-cors", type = "string"),
@YamlProperty(name = "id", type = "string"),
- @YamlProperty(name = "method", type = "string"),
@YamlProperty(name = "out-type", type = "string"),
@YamlProperty(name = "param", type =
"array:org.apache.camel.model.rest.RestOperationParamDefinition"),
@YamlProperty(name = "produces", type = "string"),
@@ -10498,19 +10467,19 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "uri", type = "string")
}
)
- public static class PutVerbDefinitionDeserializer extends
YamlDeserializerBase<PutVerbDefinition> {
- public PutVerbDefinitionDeserializer() {
- super(PutVerbDefinition.class);
+ public static class PutDefinitionDeserializer extends
YamlDeserializerBase<PutDefinition> {
+ public PutDefinitionDeserializer() {
+ super(PutDefinition.class);
}
@Override
- protected PutVerbDefinition newInstance() {
- return new PutVerbDefinition();
+ protected PutDefinition newInstance() {
+ return new PutDefinition();
}
@Override
- protected boolean setProperty(PutVerbDefinition target, String
propertyKey,
- String propertyName, Node node) {
+ protected boolean setProperty(PutDefinition target, String
propertyKey, String propertyName,
+ Node node) {
switch(propertyKey) {
case "api-docs": {
String val = asText(node);
@@ -10542,11 +10511,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setEnableCORS(val);
break;
}
- case "method": {
- String val = asText(node);
- target.setMethod(val);
- break;
- }
case "out-type": {
String val = asText(node);
target.setOutType(val);
@@ -11864,17 +11828,17 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "binding-mode", type = "string"),
@YamlProperty(name = "client-request-validation", type =
"string"),
@YamlProperty(name = "consumes", type = "string"),
- @YamlProperty(name = "delete", type =
"array:org.apache.camel.model.rest.DeleteVerbDefinition"),
+ @YamlProperty(name = "delete", type =
"array:org.apache.camel.model.rest.DeleteDefinition"),
@YamlProperty(name = "description", type = "string"),
@YamlProperty(name = "enable-cors", type = "string"),
- @YamlProperty(name = "get", type =
"array:org.apache.camel.model.rest.GetVerbDefinition"),
- @YamlProperty(name = "head", type =
"array:org.apache.camel.model.rest.HeadVerbDefinition"),
+ @YamlProperty(name = "get", type =
"array:org.apache.camel.model.rest.GetDefinition"),
+ @YamlProperty(name = "head", type =
"array:org.apache.camel.model.rest.HeadDefinition"),
@YamlProperty(name = "id", type = "string"),
- @YamlProperty(name = "patch", type =
"array:org.apache.camel.model.rest.PatchVerbDefinition"),
+ @YamlProperty(name = "patch", type =
"array:org.apache.camel.model.rest.PatchDefinition"),
@YamlProperty(name = "path", type = "string"),
- @YamlProperty(name = "post", type =
"array:org.apache.camel.model.rest.PostVerbDefinition"),
+ @YamlProperty(name = "post", type =
"array:org.apache.camel.model.rest.PostDefinition"),
@YamlProperty(name = "produces", type = "string"),
- @YamlProperty(name = "put", type =
"array:org.apache.camel.model.rest.PutVerbDefinition"),
+ @YamlProperty(name = "put", type =
"array:org.apache.camel.model.rest.PutDefinition"),
@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 =
"string"),
@@ -11956,7 +11920,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
if (existing == null) {
existing = new java.util.ArrayList<>();
}
- java.util.List val = asFlatList(node,
org.apache.camel.model.rest.DeleteVerbDefinition.class);
+ java.util.List val = asFlatList(node,
org.apache.camel.model.rest.DeleteDefinition.class);
existing.addAll(val);
target.setVerbs(existing);
break;
@@ -11966,7 +11930,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
if (existing == null) {
existing = new java.util.ArrayList<>();
}
- java.util.List val = asFlatList(node,
org.apache.camel.model.rest.GetVerbDefinition.class);
+ java.util.List val = asFlatList(node,
org.apache.camel.model.rest.GetDefinition.class);
existing.addAll(val);
target.setVerbs(existing);
break;
@@ -11976,7 +11940,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
if (existing == null) {
existing = new java.util.ArrayList<>();
}
- java.util.List val = asFlatList(node,
org.apache.camel.model.rest.HeadVerbDefinition.class);
+ java.util.List val = asFlatList(node,
org.apache.camel.model.rest.HeadDefinition.class);
existing.addAll(val);
target.setVerbs(existing);
break;
@@ -11986,7 +11950,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
if (existing == null) {
existing = new java.util.ArrayList<>();
}
- java.util.List val = asFlatList(node,
org.apache.camel.model.rest.PatchVerbDefinition.class);
+ java.util.List val = asFlatList(node,
org.apache.camel.model.rest.PatchDefinition.class);
existing.addAll(val);
target.setVerbs(existing);
break;
@@ -11996,7 +11960,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
if (existing == null) {
existing = new java.util.ArrayList<>();
}
- java.util.List val = asFlatList(node,
org.apache.camel.model.rest.PostVerbDefinition.class);
+ java.util.List val = asFlatList(node,
org.apache.camel.model.rest.PostDefinition.class);
existing.addAll(val);
target.setVerbs(existing);
break;
@@ -12006,7 +11970,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
if (existing == null) {
existing = new java.util.ArrayList<>();
}
- java.util.List val = asFlatList(node,
org.apache.camel.model.rest.PutVerbDefinition.class);
+ java.util.List val = asFlatList(node,
org.apache.camel.model.rest.PutDefinition.class);
existing.addAll(val);
target.setVerbs(existing);
break;
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
index 00e6a75..27252f9 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
@@ -101,8 +101,8 @@ public final class ModelDeserializersResolver implements
YamlDeserializerResolve
case
"org.apache.camel.model.cloud.DefaultServiceCallServiceLoadBalancerConfiguration":
return new
ModelDeserializers.DefaultServiceCallServiceLoadBalancerConfigurationDeserializer();
case "delay": return new
ModelDeserializers.DelayDefinitionDeserializer();
case "org.apache.camel.model.DelayDefinition": return new
ModelDeserializers.DelayDefinitionDeserializer();
- case "delete": return new
ModelDeserializers.DeleteVerbDefinitionDeserializer();
- case "org.apache.camel.model.rest.DeleteVerbDefinition": return
new ModelDeserializers.DeleteVerbDefinitionDeserializer();
+ case "delete": return new
ModelDeserializers.DeleteDefinitionDeserializer();
+ case "org.apache.camel.model.rest.DeleteDefinition": return new
ModelDeserializers.DeleteDefinitionDeserializer();
case "description": return new
ModelDeserializers.DescriptionDefinitionDeserializer();
case "org.apache.camel.model.DescriptionDefinition": return new
ModelDeserializers.DescriptionDefinitionDeserializer();
case "dns-service-discovery": return new
ModelDeserializers.DnsServiceCallServiceDiscoveryConfigurationDeserializer();
@@ -140,8 +140,8 @@ public final class ModelDeserializersResolver implements
YamlDeserializerResolve
case "org.apache.camel.model.FinallyDefinition": return new
ModelDeserializers.FinallyDefinitionDeserializer();
case "flatpack": return new
ModelDeserializers.FlatpackDataFormatDeserializer();
case "org.apache.camel.model.dataformat.FlatpackDataFormat":
return new ModelDeserializers.FlatpackDataFormatDeserializer();
- case "get": return new
ModelDeserializers.GetVerbDefinitionDeserializer();
- case "org.apache.camel.model.rest.GetVerbDefinition": return new
ModelDeserializers.GetVerbDefinitionDeserializer();
+ case "get": return new
ModelDeserializers.GetDefinitionDeserializer();
+ case "org.apache.camel.model.rest.GetDefinition": return new
ModelDeserializers.GetDefinitionDeserializer();
case "global-option": return new
ModelDeserializers.GlobalOptionDefinitionDeserializer();
case "globalOption": return new
ModelDeserializers.GlobalOptionDefinitionDeserializer();
case "org.apache.camel.model.GlobalOptionDefinition": return new
ModelDeserializers.GlobalOptionDefinitionDeserializer();
@@ -157,8 +157,8 @@ public final class ModelDeserializersResolver implements
YamlDeserializerResolve
case "org.apache.camel.model.dataformat.GzipDeflaterDataFormat":
return new ModelDeserializers.GzipDeflaterDataFormatDeserializer();
case "hl7": return new
ModelDeserializers.HL7DataFormatDeserializer();
case "org.apache.camel.model.dataformat.HL7DataFormat": return new
ModelDeserializers.HL7DataFormatDeserializer();
- case "head": return new
ModelDeserializers.HeadVerbDefinitionDeserializer();
- case "org.apache.camel.model.rest.HeadVerbDefinition": return new
ModelDeserializers.HeadVerbDefinitionDeserializer();
+ case "head": return new
ModelDeserializers.HeadDefinitionDeserializer();
+ case "org.apache.camel.model.rest.HeadDefinition": return new
ModelDeserializers.HeadDefinitionDeserializer();
case "header": return new
ModelDeserializers.HeaderExpressionDeserializer();
case "org.apache.camel.model.language.HeaderExpression": return
new ModelDeserializers.HeaderExpressionDeserializer();
case "healthy-service-filter": return new
ModelDeserializers.HealthyServiceCallServiceFilterConfigurationDeserializer();
@@ -260,8 +260,8 @@ public final class ModelDeserializersResolver implements
YamlDeserializerResolve
case "pass-through-service-filter": return new
ModelDeserializers.PassThroughServiceCallServiceFilterConfigurationDeserializer();
case "passThroughServiceFilter": return new
ModelDeserializers.PassThroughServiceCallServiceFilterConfigurationDeserializer();
case
"org.apache.camel.model.cloud.PassThroughServiceCallServiceFilterConfiguration":
return new
ModelDeserializers.PassThroughServiceCallServiceFilterConfigurationDeserializer();
- case "patch": return new
ModelDeserializers.PatchVerbDefinitionDeserializer();
- case "org.apache.camel.model.rest.PatchVerbDefinition": return new
ModelDeserializers.PatchVerbDefinitionDeserializer();
+ case "patch": return new
ModelDeserializers.PatchDefinitionDeserializer();
+ case "org.apache.camel.model.rest.PatchDefinition": return new
ModelDeserializers.PatchDefinitionDeserializer();
case "pipeline": return new
ModelDeserializers.PipelineDefinitionDeserializer();
case "org.apache.camel.model.PipelineDefinition": return new
ModelDeserializers.PipelineDefinitionDeserializer();
case "policy": return new
ModelDeserializers.PolicyDefinitionDeserializer();
@@ -269,8 +269,8 @@ public final class ModelDeserializersResolver implements
YamlDeserializerResolve
case "poll-enrich": return new
ModelDeserializers.PollEnrichDefinitionDeserializer();
case "pollEnrich": return new
ModelDeserializers.PollEnrichDefinitionDeserializer();
case "org.apache.camel.model.PollEnrichDefinition": return new
ModelDeserializers.PollEnrichDefinitionDeserializer();
- case "post": return new
ModelDeserializers.PostVerbDefinitionDeserializer();
- case "org.apache.camel.model.rest.PostVerbDefinition": return new
ModelDeserializers.PostVerbDefinitionDeserializer();
+ case "post": return new
ModelDeserializers.PostDefinitionDeserializer();
+ case "org.apache.camel.model.rest.PostDefinition": return new
ModelDeserializers.PostDefinitionDeserializer();
case
"org.apache.camel.model.validator.PredicateValidatorDefinition": return new
ModelDeserializers.PredicateValidatorDefinitionDeserializer();
case "process": return new
ModelDeserializers.ProcessDefinitionDeserializer();
case "org.apache.camel.model.ProcessDefinition": return new
ModelDeserializers.ProcessDefinitionDeserializer();
@@ -281,8 +281,8 @@ public final class ModelDeserializersResolver implements
YamlDeserializerResolve
case "org.apache.camel.model.PropertyExpressionDefinition": return
new ModelDeserializers.PropertyExpressionDefinitionDeserializer();
case "protobuf": return new
ModelDeserializers.ProtobufDataFormatDeserializer();
case "org.apache.camel.model.dataformat.ProtobufDataFormat":
return new ModelDeserializers.ProtobufDataFormatDeserializer();
- case "put": return new
ModelDeserializers.PutVerbDefinitionDeserializer();
- case "org.apache.camel.model.rest.PutVerbDefinition": return new
ModelDeserializers.PutVerbDefinitionDeserializer();
+ case "put": return new
ModelDeserializers.PutDefinitionDeserializer();
+ case "org.apache.camel.model.rest.PutDefinition": return new
ModelDeserializers.PutDefinitionDeserializer();
case "random": return new
ModelDeserializers.RandomLoadBalancerDefinitionDeserializer();
case
"org.apache.camel.model.loadbalancer.RandomLoadBalancerDefinition": return new
ModelDeserializers.RandomLoadBalancerDefinitionDeserializer();
case "recipient-list": return new
ModelDeserializers.RecipientListDefinitionDeserializer();
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 550a74b..b115478 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
@@ -6544,7 +6544,7 @@
},
"required" : [ "distribution-ratio" ]
},
- "org.apache.camel.model.rest.DeleteVerbDefinition" : {
+ "org.apache.camel.model.rest.DeleteDefinition" : {
"type" : "object",
"properties" : {
"api-docs" : {
@@ -6571,9 +6571,6 @@
"id" : {
"type" : "string"
},
- "method" : {
- "type" : "string"
- },
"out-type" : {
"type" : "string"
},
@@ -6627,7 +6624,7 @@
}
}
},
- "org.apache.camel.model.rest.GetVerbDefinition" : {
+ "org.apache.camel.model.rest.GetDefinition" : {
"type" : "object",
"properties" : {
"api-docs" : {
@@ -6654,9 +6651,6 @@
"id" : {
"type" : "string"
},
- "method" : {
- "type" : "string"
- },
"out-type" : {
"type" : "string"
},
@@ -6710,7 +6704,7 @@
}
}
},
- "org.apache.camel.model.rest.HeadVerbDefinition" : {
+ "org.apache.camel.model.rest.HeadDefinition" : {
"type" : "object",
"properties" : {
"api-docs" : {
@@ -6737,9 +6731,6 @@
"id" : {
"type" : "string"
},
- "method" : {
- "type" : "string"
- },
"out-type" : {
"type" : "string"
},
@@ -6793,7 +6784,7 @@
}
}
},
- "org.apache.camel.model.rest.PatchVerbDefinition" : {
+ "org.apache.camel.model.rest.PatchDefinition" : {
"type" : "object",
"properties" : {
"api-docs" : {
@@ -6820,9 +6811,6 @@
"id" : {
"type" : "string"
},
- "method" : {
- "type" : "string"
- },
"out-type" : {
"type" : "string"
},
@@ -6876,7 +6864,7 @@
}
}
},
- "org.apache.camel.model.rest.PostVerbDefinition" : {
+ "org.apache.camel.model.rest.PostDefinition" : {
"type" : "object",
"properties" : {
"api-docs" : {
@@ -6903,9 +6891,6 @@
"id" : {
"type" : "string"
},
- "method" : {
- "type" : "string"
- },
"out-type" : {
"type" : "string"
},
@@ -6959,7 +6944,7 @@
}
}
},
- "org.apache.camel.model.rest.PutVerbDefinition" : {
+ "org.apache.camel.model.rest.PutDefinition" : {
"type" : "object",
"properties" : {
"api-docs" : {
@@ -6986,9 +6971,6 @@
"id" : {
"type" : "string"
},
- "method" : {
- "type" : "string"
- },
"out-type" : {
"type" : "string"
},
@@ -7207,7 +7189,7 @@
"delete" : {
"type" : "array",
"items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.DeleteVerbDefinition"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.rest.DeleteDefinition"
}
},
"description" : {
@@ -7219,13 +7201,13 @@
"get" : {
"type" : "array",
"items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.GetVerbDefinition"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.rest.GetDefinition"
}
},
"head" : {
"type" : "array",
"items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.HeadVerbDefinition"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.rest.HeadDefinition"
}
},
"id" : {
@@ -7234,7 +7216,7 @@
"patch" : {
"type" : "array",
"items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.PatchVerbDefinition"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.rest.PatchDefinition"
}
},
"path" : {
@@ -7243,7 +7225,7 @@
"post" : {
"type" : "array",
"items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.PostVerbDefinition"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.rest.PostDefinition"
}
},
"produces" : {
@@ -7252,7 +7234,7 @@
"put" : {
"type" : "array",
"items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.PutVerbDefinition"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.rest.PutDefinition"
}
},
"security-definitions" : {
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 735ccd4..abf694a 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
@@ -6442,7 +6442,7 @@
},
"required" : [ "distributionRatio" ]
},
- "org.apache.camel.model.rest.DeleteVerbDefinition" : {
+ "org.apache.camel.model.rest.DeleteDefinition" : {
"type" : "object",
"properties" : {
"apiDocs" : {
@@ -6469,9 +6469,6 @@
"id" : {
"type" : "string"
},
- "method" : {
- "type" : "string"
- },
"outType" : {
"type" : "string"
},
@@ -6525,7 +6522,7 @@
}
}
},
- "org.apache.camel.model.rest.GetVerbDefinition" : {
+ "org.apache.camel.model.rest.GetDefinition" : {
"type" : "object",
"properties" : {
"apiDocs" : {
@@ -6552,9 +6549,6 @@
"id" : {
"type" : "string"
},
- "method" : {
- "type" : "string"
- },
"outType" : {
"type" : "string"
},
@@ -6608,7 +6602,7 @@
}
}
},
- "org.apache.camel.model.rest.HeadVerbDefinition" : {
+ "org.apache.camel.model.rest.HeadDefinition" : {
"type" : "object",
"properties" : {
"apiDocs" : {
@@ -6635,9 +6629,6 @@
"id" : {
"type" : "string"
},
- "method" : {
- "type" : "string"
- },
"outType" : {
"type" : "string"
},
@@ -6691,7 +6682,7 @@
}
}
},
- "org.apache.camel.model.rest.PatchVerbDefinition" : {
+ "org.apache.camel.model.rest.PatchDefinition" : {
"type" : "object",
"properties" : {
"apiDocs" : {
@@ -6718,9 +6709,6 @@
"id" : {
"type" : "string"
},
- "method" : {
- "type" : "string"
- },
"outType" : {
"type" : "string"
},
@@ -6774,7 +6762,7 @@
}
}
},
- "org.apache.camel.model.rest.PostVerbDefinition" : {
+ "org.apache.camel.model.rest.PostDefinition" : {
"type" : "object",
"properties" : {
"apiDocs" : {
@@ -6801,9 +6789,6 @@
"id" : {
"type" : "string"
},
- "method" : {
- "type" : "string"
- },
"outType" : {
"type" : "string"
},
@@ -6857,7 +6842,7 @@
}
}
},
- "org.apache.camel.model.rest.PutVerbDefinition" : {
+ "org.apache.camel.model.rest.PutDefinition" : {
"type" : "object",
"properties" : {
"apiDocs" : {
@@ -6884,9 +6869,6 @@
"id" : {
"type" : "string"
},
- "method" : {
- "type" : "string"
- },
"outType" : {
"type" : "string"
},
@@ -7105,7 +7087,7 @@
"delete" : {
"type" : "array",
"items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.DeleteVerbDefinition"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.rest.DeleteDefinition"
}
},
"description" : {
@@ -7117,13 +7099,13 @@
"get" : {
"type" : "array",
"items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.GetVerbDefinition"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.rest.GetDefinition"
}
},
"head" : {
"type" : "array",
"items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.HeadVerbDefinition"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.rest.HeadDefinition"
}
},
"id" : {
@@ -7132,7 +7114,7 @@
"patch" : {
"type" : "array",
"items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.PatchVerbDefinition"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.rest.PatchDefinition"
}
},
"path" : {
@@ -7141,7 +7123,7 @@
"post" : {
"type" : "array",
"items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.PostVerbDefinition"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.rest.PostDefinition"
}
},
"produces" : {
@@ -7150,7 +7132,7 @@
"put" : {
"type" : "array",
"items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.rest.PutVerbDefinition"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.rest.PutDefinition"
}
},
"securityDefinitions" : {
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 e1837fc..ee117f9 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
@@ -21,8 +21,8 @@ import org.apache.camel.dsl.yaml.support.YamlTestSupport
import org.apache.camel.dsl.yaml.support.model.MyBean
import org.apache.camel.dsl.yaml.support.model.MyFooBar
import org.apache.camel.model.ToDefinition
-import org.apache.camel.model.rest.GetVerbDefinition
-import org.apache.camel.model.rest.PostVerbDefinition
+import org.apache.camel.model.rest.GetDefinition
+import org.apache.camel.model.rest.PostDefinition
import org.apache.camel.model.rest.RestDefinition
import org.apache.camel.model.rest.VerbDefinition
@@ -142,7 +142,7 @@ class RestTest extends YamlTestSupport {
with(context.restDefinitions[0], RestDefinition) {
verbs.size() == 3
- with(verbs[0], PostVerbDefinition) {
+ with(verbs[0], PostDefinition) {
uri == '/foo'
type == MyFooBar.name
outType == MyBean.name
@@ -151,13 +151,13 @@ class RestTest extends YamlTestSupport {
endpointUri == 'direct:foo'
}
}
- with(verbs[1], PostVerbDefinition) {
+ with(verbs[1], PostDefinition) {
uri == '/baz'
with(to, ToDefinition) {
endpointUri == 'direct:baz'
}
}
- with(verbs[2], GetVerbDefinition) {
+ with(verbs[2], GetDefinition) {
uri == '/getFoo'
with(to, ToDefinition) {
endpointUri == 'direct:getFoo'
