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 7bb660b CAMEL-17664: camel-core-model - Rename rest verb files to use
same naming style as others.
7bb660b is described below
commit 7bb660babf48a7402584462338c0ea72887d733f
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Feb 17 15:08:15 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 | 2 +-
.../resources/org/apache/camel/model/rest/get.json | 2 +-
.../org/apache/camel/model/rest/head.json | 2 +-
.../org/apache/camel/model/rest/jaxb.index | 12 ++++----
.../org/apache/camel/model/rest/patch.json | 2 +-
.../org/apache/camel/model/rest/post.json | 2 +-
.../resources/org/apache/camel/model/rest/put.json | 2 +-
...teVerbDefinition.java => DeleteDefinition.java} | 2 +-
.../{GetVerbDefinition.java => GetDefinition.java} | 2 +-
...HeadVerbDefinition.java => HeadDefinition.java} | 2 +-
...tchVerbDefinition.java => PatchDefinition.java} | 2 +-
...PostVerbDefinition.java => PostDefinition.java} | 2 +-
.../{PutVerbDefinition.java => PutDefinition.java} | 2 +-
.../apache/camel/model/rest/RestDefinition.java | 12 ++++----
.../apache/camel/model/rest/VerbDefinition.java | 12 ++++----
.../org/apache/camel/model/XmlRestParseTest.java | 4 +--
.../apache/camel/model/XmlRestParseToDTest.java | 4 +--
.../java/org/apache/camel/xml/in/ModelParser.java | 36 +++++++++++-----------
18 files changed, 52 insertions(+), 52 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 d4fe702..c766e6c 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
@@ -6,7 +6,7 @@
"description": "Rest DELETE command",
"deprecated": false,
"label": "rest",
- "javaType": "org.apache.camel.model.rest.DeleteVerbDefinition",
+ "javaType": "org.apache.camel.model.rest.DeleteDefinition",
"abstract": false,
"input": true,
"output": false
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 7a1b07b..54b9e85 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
@@ -6,7 +6,7 @@
"description": "Rest GET command",
"deprecated": false,
"label": "rest",
- "javaType": "org.apache.camel.model.rest.GetVerbDefinition",
+ "javaType": "org.apache.camel.model.rest.GetDefinition",
"abstract": false,
"input": true,
"output": false
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 162cebe..3958f22 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
@@ -6,7 +6,7 @@
"description": "Rest HEAD command",
"deprecated": false,
"label": "rest",
- "javaType": "org.apache.camel.model.rest.HeadVerbDefinition",
+ "javaType": "org.apache.camel.model.rest.HeadDefinition",
"abstract": false,
"input": true,
"output": false
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/jaxb.index
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/jaxb.index
index 222b310..43b1cd5 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/jaxb.index
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/jaxb.index
@@ -1,11 +1,11 @@
# Generated by camel build tools - do NOT edit this file!
CollectionFormat
-DeleteVerbDefinition
-GetVerbDefinition
-HeadVerbDefinition
-PatchVerbDefinition
-PostVerbDefinition
-PutVerbDefinition
+DeleteDefinition
+GetDefinition
+HeadDefinition
+PatchDefinition
+PostDefinition
+PutDefinition
RestBindingDefinition
RestBindingMode
RestConfigurationDefinition
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 85c62be..26b61658 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
@@ -6,7 +6,7 @@
"description": "Rest PATCH command",
"deprecated": false,
"label": "rest",
- "javaType": "org.apache.camel.model.rest.PatchVerbDefinition",
+ "javaType": "org.apache.camel.model.rest.PatchDefinition",
"abstract": false,
"input": true,
"output": false
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 c6ed089..36af584 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
@@ -6,7 +6,7 @@
"description": "Rest POST command",
"deprecated": false,
"label": "rest",
- "javaType": "org.apache.camel.model.rest.PostVerbDefinition",
+ "javaType": "org.apache.camel.model.rest.PostDefinition",
"abstract": false,
"input": true,
"output": false
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 39bd45e..edddb5b 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
@@ -6,7 +6,7 @@
"description": "Rest PUT command",
"deprecated": false,
"label": "rest",
- "javaType": "org.apache.camel.model.rest.PutVerbDefinition",
+ "javaType": "org.apache.camel.model.rest.PutDefinition",
"abstract": false,
"input": true,
"output": false
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteDefinition.java
similarity index 95%
rename from
core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
rename to
core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteDefinition.java
index 8cd6cf9..fe2a3d9 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteDefinition.java
@@ -28,6 +28,6 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "rest")
@XmlRootElement(name = "delete")
@XmlAccessorType(XmlAccessType.FIELD)
-public class DeleteVerbDefinition extends VerbDefinition {
+public class DeleteDefinition extends VerbDefinition {
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetDefinition.java
similarity index 95%
rename from
core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
rename to
core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetDefinition.java
index 12206679..ea22a73 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetDefinition.java
@@ -28,6 +28,6 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "rest")
@XmlRootElement(name = "get")
@XmlAccessorType(XmlAccessType.FIELD)
-public class GetVerbDefinition extends VerbDefinition {
+public class GetDefinition extends VerbDefinition {
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadDefinition.java
similarity index 95%
rename from
core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
rename to
core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadDefinition.java
index b871219..80427a7 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadDefinition.java
@@ -28,6 +28,6 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "rest")
@XmlRootElement(name = "head")
@XmlAccessorType(XmlAccessType.FIELD)
-public class HeadVerbDefinition extends VerbDefinition {
+public class HeadDefinition extends VerbDefinition {
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchDefinition.java
similarity index 95%
rename from
core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java
rename to
core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchDefinition.java
index 38da212..4f03209 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchDefinition.java
@@ -28,6 +28,6 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "rest")
@XmlRootElement(name = "patch")
@XmlAccessorType(XmlAccessType.FIELD)
-public class PatchVerbDefinition extends VerbDefinition {
+public class PatchDefinition extends VerbDefinition {
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostDefinition.java
similarity index 95%
rename from
core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
rename to
core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostDefinition.java
index 51f7f2c..7ee32f6 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostDefinition.java
@@ -28,6 +28,6 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "rest")
@XmlRootElement(name = "post")
@XmlAccessorType(XmlAccessType.FIELD)
-public class PostVerbDefinition extends VerbDefinition {
+public class PostDefinition extends VerbDefinition {
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutDefinition.java
similarity index 95%
rename from
core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
rename to
core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutDefinition.java
index 8bfd2b5..0f02cf3 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutDefinition.java
@@ -28,6 +28,6 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "rest")
@XmlRootElement(name = "put")
@XmlAccessorType(XmlAccessType.FIELD)
-public class PutVerbDefinition extends VerbDefinition {
+public class PutDefinition extends VerbDefinition {
}
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 df627cd..11383bd 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
@@ -682,17 +682,17 @@ public class RestDefinition extends
OptionalIdentifiedDefinition<RestDefinition>
VerbDefinition answer;
if ("get".equals(verb)) {
- answer = new GetVerbDefinition();
+ answer = new GetDefinition();
} else if ("post".equals(verb)) {
- answer = new PostVerbDefinition();
+ answer = new PostDefinition();
} else if ("delete".equals(verb)) {
- answer = new DeleteVerbDefinition();
+ answer = new DeleteDefinition();
} else if ("head".equals(verb)) {
- answer = new HeadVerbDefinition();
+ answer = new HeadDefinition();
} else if ("put".equals(verb)) {
- answer = new PutVerbDefinition();
+ answer = new PutDefinition();
} else if ("patch".equals(verb)) {
- answer = new PatchVerbDefinition();
+ answer = new PatchDefinition();
} else {
answer = new VerbDefinition();
answer.setMethod(verb);
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 7edb7f3..fefaef2 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
@@ -494,17 +494,17 @@ public class VerbDefinition extends
OptionalIdentifiedDefinition<VerbDefinition>
// we do not want the jaxb model to repeat itself, by outputting <get
// method="get">
// so we infer the verb from the instance type
- if (this instanceof GetVerbDefinition) {
+ if (this instanceof GetDefinition) {
return "get";
- } else if (this instanceof PostVerbDefinition) {
+ } else if (this instanceof PostDefinition) {
return "post";
- } else if (this instanceof PutVerbDefinition) {
+ } else if (this instanceof PutDefinition) {
return "put";
- } else if (this instanceof PatchVerbDefinition) {
+ } else if (this instanceof PatchDefinition) {
return "patch";
- } else if (this instanceof DeleteVerbDefinition) {
+ } else if (this instanceof DeleteDefinition) {
return "delete";
- } else if (this instanceof HeadVerbDefinition) {
+ } else if (this instanceof HeadDefinition) {
return "head";
} else {
return method;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/model/XmlRestParseTest.java
b/core/camel-core/src/test/java/org/apache/camel/model/XmlRestParseTest.java
index 6bdb291..0da4094 100644
--- a/core/camel-core/src/test/java/org/apache/camel/model/XmlRestParseTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/model/XmlRestParseTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.model;
import javax.xml.bind.JAXBException;
-import org.apache.camel.model.rest.GetVerbDefinition;
+import org.apache.camel.model.rest.GetDefinition;
import org.apache.camel.model.rest.RestContainer;
import org.apache.camel.model.rest.RestDefinition;
import org.junit.jupiter.api.Test;
@@ -33,7 +33,7 @@ public class XmlRestParseTest extends XmlTestSupport {
assertEquals("/users", rest.getPath());
assertEquals(1, rest.getVerbs().size());
- GetVerbDefinition get = (GetVerbDefinition) rest.getVerbs().get(0);
+ GetDefinition get = (GetDefinition) rest.getVerbs().get(0);
assertEquals("/view/{id}", get.getUri());
assertEquals("direct:getUser", get.getTo().getUri());
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/model/XmlRestParseToDTest.java
b/core/camel-core/src/test/java/org/apache/camel/model/XmlRestParseToDTest.java
index 8523d3d..2314828 100644
---
a/core/camel-core/src/test/java/org/apache/camel/model/XmlRestParseToDTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/model/XmlRestParseToDTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.model;
import javax.xml.bind.JAXBException;
-import org.apache.camel.model.rest.GetVerbDefinition;
+import org.apache.camel.model.rest.GetDefinition;
import org.apache.camel.model.rest.RestContainer;
import org.apache.camel.model.rest.RestDefinition;
import org.junit.jupiter.api.Test;
@@ -33,7 +33,7 @@ public class XmlRestParseToDTest extends XmlTestSupport {
assertEquals("/users", rest.getPath());
assertEquals(1, rest.getVerbs().size());
- GetVerbDefinition get = (GetVerbDefinition) rest.getVerbs().get(0);
+ GetDefinition get = (GetDefinition) rest.getVerbs().get(0);
assertEquals("/view/{id}", get.getUri());
assertEquals("bean:getUser?id=${header.id}", get.getToD().getUri());
}
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 9870958..5caeb02 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
@@ -1086,12 +1086,12 @@ public class ModelParser extends BaseParser {
return true;
}, (def, key) -> {
switch (key) {
- case "delete": doAdd(doParseDeleteVerbDefinition(),
def.getVerbs(), def::setVerbs); break;
- case "get": doAdd(doParseGetVerbDefinition(), def.getVerbs(),
def::setVerbs); break;
- case "head": doAdd(doParseHeadVerbDefinition(),
def.getVerbs(), def::setVerbs); break;
- case "patch": doAdd(doParsePatchVerbDefinition(),
def.getVerbs(), def::setVerbs); break;
- case "post": doAdd(doParsePostVerbDefinition(),
def.getVerbs(), def::setVerbs); break;
- case "put": doAdd(doParsePutVerbDefinition(), def.getVerbs(),
def::setVerbs); break;
+ case "delete": doAdd(doParseDeleteDefinition(),
def.getVerbs(), def::setVerbs); break;
+ case "get": doAdd(doParseGetDefinition(), def.getVerbs(),
def::setVerbs); break;
+ case "head": doAdd(doParseHeadDefinition(), def.getVerbs(),
def::setVerbs); break;
+ case "patch": doAdd(doParsePatchDefinition(), def.getVerbs(),
def::setVerbs); break;
+ case "post": doAdd(doParsePostDefinition(), def.getVerbs(),
def::setVerbs); break;
+ case "put": doAdd(doParsePutDefinition(), def.getVerbs(),
def::setVerbs); break;
case "securityDefinitions":
def.setSecurityDefinitions(doParseRestSecuritiesDefinition()); break;
case "securityRequirements":
def.setSecurityRequirements(doParseRestSecuritiesRequirement()); break;
default: return
optionalIdentifiedDefinitionElementHandler().accept(def, key);
@@ -2802,8 +2802,8 @@ public class ModelParser extends BaseParser {
return true;
}, noElementHandler(), noValueHandler());
}
- protected DeleteVerbDefinition doParseDeleteVerbDefinition() throws
IOException, XmlPullParserException {
- return doParse(new DeleteVerbDefinition(),
+ protected DeleteDefinition doParseDeleteDefinition() throws IOException,
XmlPullParserException {
+ return doParse(new DeleteDefinition(),
verbDefinitionAttributeHandler(), verbDefinitionElementHandler(),
noValueHandler());
}
protected <T extends VerbDefinition> AttributeHandler<T>
verbDefinitionAttributeHandler() {
@@ -2896,24 +2896,24 @@ public class ModelParser extends BaseParser {
return true;
}, noElementHandler(), noValueHandler());
}
- protected GetVerbDefinition doParseGetVerbDefinition() throws IOException,
XmlPullParserException {
- return doParse(new GetVerbDefinition(),
+ protected GetDefinition doParseGetDefinition() throws IOException,
XmlPullParserException {
+ return doParse(new GetDefinition(),
verbDefinitionAttributeHandler(), verbDefinitionElementHandler(),
noValueHandler());
}
- protected HeadVerbDefinition doParseHeadVerbDefinition() throws
IOException, XmlPullParserException {
- return doParse(new HeadVerbDefinition(),
+ protected HeadDefinition doParseHeadDefinition() throws IOException,
XmlPullParserException {
+ return doParse(new HeadDefinition(),
verbDefinitionAttributeHandler(), verbDefinitionElementHandler(),
noValueHandler());
}
- protected PatchVerbDefinition doParsePatchVerbDefinition() throws
IOException, XmlPullParserException {
- return doParse(new PatchVerbDefinition(),
+ protected PatchDefinition doParsePatchDefinition() throws IOException,
XmlPullParserException {
+ return doParse(new PatchDefinition(),
verbDefinitionAttributeHandler(), verbDefinitionElementHandler(),
noValueHandler());
}
- protected PostVerbDefinition doParsePostVerbDefinition() throws
IOException, XmlPullParserException {
- return doParse(new PostVerbDefinition(),
+ protected PostDefinition doParsePostDefinition() throws IOException,
XmlPullParserException {
+ return doParse(new PostDefinition(),
verbDefinitionAttributeHandler(), verbDefinitionElementHandler(),
noValueHandler());
}
- protected PutVerbDefinition doParsePutVerbDefinition() throws IOException,
XmlPullParserException {
- return doParse(new PutVerbDefinition(),
+ protected PutDefinition doParsePutDefinition() throws IOException,
XmlPullParserException {
+ return doParse(new PutDefinition(),
verbDefinitionAttributeHandler(), verbDefinitionElementHandler(),
noValueHandler());
}
protected RestConfigurationDefinition doParseRestConfigurationDefinition()
throws IOException, XmlPullParserException {
