[camel] 02/05: CAMEL-17194: endpointdsl - Prepare for generate only once during project build. WIP.

[da...@apache.org]

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 96b4c89bb70570279fca9b0fb2db10d0b03565d6
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 21 13:58:37 2021 +0100

    CAMEL-17194: endpointdsl - Prepare for generate only once during project build. WIP.
---
 .../apache/camel/maven/packaging/EndpointDslMojo.java | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 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 c0b810a..ba37ef6 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
@@ -264,6 +264,10 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
         javaClass.setPackage(componentsFactoriesPackageName);
         javaClass.setName(builderName + "Factory");
         javaClass.setClass(false);
+        javaClass.addImport("java.util.*");
+        javaClass.addImport("java.util.concurrent.*");
+        javaClass.addImport("java.util.function.*");
+        javaClass.addImport("java.util.stream.*");
         javaClass.addImport("org.apache.camel.builder.EndpointConsumerBuilder");
         javaClass.addImport("org.apache.camel.builder.EndpointProducerBuilder");
         javaClass.addImport("org.apache.camel.builder.endpoint.AbstractEndpointBuilder");
@@ -450,7 +454,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                 if (multiValued) {
                     // multi value option that takes one value
                     String desc = baseDesc.replace("@@REPLACE_ME@@",
-                            "\nThe option is a: <code>" + optionJavaType(option).replace("<", "&lt;").replace(">", "&gt;")
+                            "\nThe option is a: <code>" + option.getJavaType().replace("<", "&lt;").replace(">", "&gt;")
                                                                      + "</code> type.");
                     desc = JavadocHelper.xmlEncode(desc);
 
@@ -487,7 +491,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                 } else {
                     // regular option
                     String desc = baseDesc.replace("@@REPLACE_ME@@",
-                            "\nThe option is a: <code>" + optionJavaType(option).replace("<", "&lt;").replace(">", "&gt;")
+                            "\nThe option is a: <code>" + option.getJavaType().replace("<", "&lt;").replace(">", "&gt;")
                                                                      + "</code> type.");
                     desc = JavadocHelper.xmlEncode(desc);
 
@@ -508,7 +512,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                         // regular option by String parameter variant
                         desc = baseDesc.replace("@@REPLACE_ME@@",
                                 "\nThe option will be converted to a <code>"
-                                                                  + optionJavaType(option).replace("<", "&lt;").replace(">",
+                                                                  + option.getJavaType().replace("<", "&lt;").replace(">",
                                                                           "&gt;")
                                                                   + "</code> type.");
                         desc = JavadocHelper.xmlEncode(desc);
@@ -668,7 +672,16 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
         String answer = option.getJavaType();
         if (answer.startsWith("java.lang.")) {
             return answer.substring(10);
+        } else if (answer.startsWith("java.util.concurrent.")) {
+            return answer.substring(21);
+        } else if (answer.startsWith("java.util.function.")) {
+            return answer.substring(19);
+        } else if (answer.startsWith("java.util.stream.")) {
+            return answer.substring(17);
+        } else if (answer.startsWith("java.util.")) {
+            return answer.substring(10);
         }
+
         return answer;
     }