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 29873b291cf28f0ea2e5eea9133be856cebfbb90 Author: Claus Ibsen <[email protected]> AuthorDate: Fri Feb 18 10:17:31 2022 +0100 CAMEL-17673: camel-core-model - Cleanup Rest DSL --- .../apache/camel/model/rest/DeleteDefinition.java | 4 ++++ .../org/apache/camel/model/rest/GetDefinition.java | 4 ++++ .../org/apache/camel/model/rest/HeadDefinition.java | 4 ++++ .../org/apache/camel/model/rest/PatchDefinition.java | 4 ++++ .../org/apache/camel/model/rest/PostDefinition.java | 4 ++++ .../org/apache/camel/model/rest/PutDefinition.java | 4 ++++ .../org/apache/camel/model/rest/VerbDefinition.java | 20 +------------------- 7 files changed, 25 insertions(+), 19 deletions(-) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteDefinition.java index fe2a3d9..5a73e53 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/DeleteDefinition.java @@ -30,4 +30,8 @@ import org.apache.camel.spi.Metadata; @XmlAccessorType(XmlAccessType.FIELD) public class DeleteDefinition extends VerbDefinition { + @Override + public String asVerb() { + return "delete"; + } } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetDefinition.java index ea22a73..05972f7 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/GetDefinition.java @@ -30,4 +30,8 @@ import org.apache.camel.spi.Metadata; @XmlAccessorType(XmlAccessType.FIELD) public class GetDefinition extends VerbDefinition { + @Override + public String asVerb() { + return "get"; + } } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadDefinition.java index 80427a7..b3e4091 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/HeadDefinition.java @@ -30,4 +30,8 @@ import org.apache.camel.spi.Metadata; @XmlAccessorType(XmlAccessType.FIELD) public class HeadDefinition extends VerbDefinition { + @Override + public String asVerb() { + return "head"; + } } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchDefinition.java index 4f03209..78974ff 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PatchDefinition.java @@ -30,4 +30,8 @@ import org.apache.camel.spi.Metadata; @XmlAccessorType(XmlAccessType.FIELD) public class PatchDefinition extends VerbDefinition { + @Override + public String asVerb() { + return "patch"; + } } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostDefinition.java index 7ee32f6..fe635ae 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PostDefinition.java @@ -30,4 +30,8 @@ import org.apache.camel.spi.Metadata; @XmlAccessorType(XmlAccessType.FIELD) public class PostDefinition extends VerbDefinition { + @Override + public String asVerb() { + return "post"; + } } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutDefinition.java index 0f02cf3..019213b 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/PutDefinition.java @@ -30,4 +30,8 @@ import org.apache.camel.spi.Metadata; @XmlAccessorType(XmlAccessType.FIELD) public class PutDefinition extends VerbDefinition { + @Override + public String asVerb() { + return "put"; + } } 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 c6f593a..9b58702 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 @@ -460,25 +460,7 @@ public abstract class VerbDefinition extends OptionalIdentifiedDefinition<VerbDe return rest.verb(verb, uri); } - public String asVerb() { - // 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 GetDefinition) { - return "get"; - } else if (this instanceof PostDefinition) { - return "post"; - } else if (this instanceof PutDefinition) { - return "put"; - } else if (this instanceof PatchDefinition) { - return "patch"; - } else if (this instanceof DeleteDefinition) { - return "delete"; - } else if (this instanceof HeadDefinition) { - return "head"; - } - throw new IllegalArgumentException("Verb not supported"); - } + public abstract String asVerb(); public Boolean getUsedForGeneratingNodeId() { return usedForGeneratingNodeId;
