[camel] branch master updated: [CAMEL-13911] Fix endpoint dsl clash with the rest endpoint

[gn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new dfff32a  [CAMEL-13911] Fix endpoint dsl clash with the rest endpoint
dfff32a is described below

commit dfff32a7b530c551e4756d49bf8a035b7805fecd
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Aug 28 14:55:29 2019 +0200

    [CAMEL-13911] Fix endpoint dsl clash with the rest endpoint
---
 .../apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java  | 2 +-
 .../main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java
index 96df792..2e891e5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java
@@ -704,7 +704,7 @@ public interface RestEndpointBuilderFactory {
      * Path parameter: uriTemplate
      * The uri template
      */
-    default RestEndpointBuilder rest(String path) {
+    default RestEndpointBuilder restEndpoint(String path) {
         class RestEndpointBuilderImpl extends AbstractEndpointBuilder implements RestEndpointBuilder, AdvancedRestEndpointBuilder {
             public RestEndpointBuilderImpl(String path) {
                 super("rest", path);
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 681b62b..e27dcf6 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -467,6 +467,9 @@ public class EndpointDslMojo extends AbstractMojo {
                 case "package":
                     s = "packag";
                     break;
+                case "rest":
+                    s = "restEndpoint";
+                    break;
             }
         }
         return s;