[camel] 01/03: Polished

[davsclaus]

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

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

commit 5e60a587c0566bbbfe7e44783e810e53915b0caf
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Oct 31 14:48:49 2019 +0100

    Polished
---
 .../camel/maven/packaging/EndpointDslMojo.java     | 27 ++++++----------------
 1 file changed, 7 insertions(+), 20 deletions(-)

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 bc1542b..4fce633 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
@@ -208,10 +208,11 @@ public class EndpointDslMojo extends AbstractMojo {
 
         Map<String, JavaClass> enumClasses = new HashMap<>();
 
-        boolean advanced = false;
+        boolean hasAdvanced = false;
         for (EndpointOptionModel option : model.getEndpointOptions()) {
             if (option.getLabel().contains("advanced")) {
-                advanced = true;
+                hasAdvanced = true;
+                break;
             }
         }
 
@@ -228,7 +229,7 @@ public class EndpointDslMojo extends AbstractMojo {
             generateDummyClass(consumerClass.getCanonicalName());
             consumerClass.getJavaDoc().setText("Builder for endpoint consumers 
for the " + model.getTitle() + " component.");
 
-            if (advanced) {
+            if (hasAdvanced) {
                 advancedConsumerClass = 
javaClass.addNestedType().setPublic().setClass(false);
                 advancedConsumerClass.setName("Advanced" + consumerName);
                 
advancedConsumerClass.implementInterface("EndpointConsumerBuilder");
@@ -248,7 +249,7 @@ public class EndpointDslMojo extends AbstractMojo {
             generateDummyClass(producerClass.getCanonicalName());
             producerClass.getJavaDoc().setText("Builder for endpoint producers 
for the " + model.getTitle() + " component.");
 
-            if (advanced) {
+            if (hasAdvanced) {
                 advancedProducerClass = 
javaClass.addNestedType().setPublic().setClass(false);
                 advancedProducerClass.setName("Advanced" + producerName);
                 
advancedProducerClass.implementInterface("EndpointProducerBuilder");
@@ -276,7 +277,7 @@ public class EndpointDslMojo extends AbstractMojo {
         }
         generateDummyClass(builderClass.getCanonicalName());
         builderClass.getJavaDoc().setText("Builder for endpoint for the " + 
model.getTitle() + " component.");
-        if (advanced) {
+        if (hasAdvanced) {
             advancedBuilderClass = 
javaClass.addNestedType().setPublic().setClass(false);
             advancedBuilderClass.setName("Advanced" + builderName);
             if 
(realEndpointClass.getAnnotation(UriEndpoint.class).producerOnly()) {
@@ -522,20 +523,6 @@ public class EndpointDslMojo extends AbstractMojo {
         return wrapped;
     }
 
-    private String getMethodName(String type) {
-        String builderName = getEndpointName(type);
-        String methodName = builderName.replace("EndpointBuilder", "");
-        methodName = methodName.substring(0, 1).toLowerCase() + 
methodName.substring(1);
-        switch (type) {
-        case "org.apache.camel.component.rest.RestComponent":
-            return "restEndpoint";
-        case "org.apache.camel.component.beanclass.ClassComponent":
-            return "classEndpoint";
-        default:
-            return methodName;
-        }
-    }
-
     private String getEndpointName(String type) {
         int pos = type.lastIndexOf(".");
         String name = type.substring(pos + 1).replace("Component", 
"EndpointBuilder");
@@ -608,7 +595,7 @@ public class EndpointDslMojo extends AbstractMojo {
         return field;
     }
 
-    static boolean isPrimitive(String type) {
+    private static boolean isPrimitive(String type) {
         return PRIMITIVEMAP.containsKey(type);
     }