[camel] branch main updated: CAMEL-18151: camel-jbang - Export command for spring boot

[davsclaus]

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 72d1ee227b2 CAMEL-18151: camel-jbang - Export command for spring boot
72d1ee227b2 is described below

commit 72d1ee227b24e316695cbe2ca41875b1a56cc1a8
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue May 31 11:24:07 2022 +0200

    CAMEL-18151: camel-jbang - Export command for spring boot
---
 .../dsl/jbang/core/commands/ExportSpringBoot.java  |  2 +-
 .../main/DependencyDownloaderRoutesLoader.java     | 36 ++++++++++++----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index b2325c2d259..9131c02ec5b 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -137,7 +137,7 @@ class ExportSpringBoot extends CamelCommand {
             }
         }
         // copy to export dir and remove work dir
-        FileUtils.copyDirectory(new File(BUILD_DIR), new File("."));
+        FileUtils.copyDirectory(new File(BUILD_DIR), new File(exportDir));
         FileUtil.removeDir(new File(BUILD_DIR));
 
         return 0;
diff --git 
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloaderRoutesLoader.java
 
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloaderRoutesLoader.java
index d45fcdb93a2..dccfec89ba7 100644
--- 
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloaderRoutesLoader.java
+++ 
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloaderRoutesLoader.java
@@ -34,25 +34,27 @@ public class DependencyDownloaderRoutesLoader extends 
MainRoutesLoader {
 
     @Override
     protected RoutesBuilderLoader resolveService(String extension) {
-        RoutesBuilderLoader loader = super.resolveService(extension);
+        // we need to eager capture that we use this route loader extension so 
lets
+        // attempt to download it even if its already on classpath
+        if ("groovy".equals(extension)) {
+            downloadLoader("camel-groovy-dsl");
+        } else if ("java".equals(extension)) {
+            downloadLoader("camel-java-joor-dsl");
+            downloadLoader("camel-endpointdsl");
+        } else if ("js".equals(extension)) {
+            downloadLoader("camel-js-dsl");
+        } else if ("jsh".equals(extension)) {
+            downloadLoader("camel-jsh-dsl");
+        } else if ("kts".equals(extension)) {
+            downloadLoader("camel-kotlin-dsl");
+        } else if ("xml".equals(extension)) {
+            downloadLoader("camel-xml-io-dsl");
+        } else if ("yaml".equals(extension)) {
+            downloadLoader("camel-yaml-dsl");
+        }
 
+        RoutesBuilderLoader loader = super.resolveService(extension);
         if (loader == null) {
-            if ("groovy".equals(extension)) {
-                downloadLoader("camel-groovy-dsl");
-            } else if ("java".equals(extension)) {
-                downloadLoader("camel-java-joor-dsl");
-                downloadLoader("camel-endpointdsl");
-            } else if ("js".equals(extension)) {
-                downloadLoader("camel-js-dsl");
-            } else if ("jsh".equals(extension)) {
-                downloadLoader("camel-jsh-dsl");
-            } else if ("kts".equals(extension)) {
-                downloadLoader("camel-kotlin-dsl");
-            } else if ("xml".equals(extension)) {
-                downloadLoader("camel-xml-io-dsl");
-            } else if ("yaml".equals(extension)) {
-                downloadLoader("camel-yaml-dsl");
-            }
 
             // need to use regular factory finder as bootstrap has already 
marked the loader as a miss
             final ExtendedCamelContext ecc = 
getCamelContext().adapt(ExtendedCamelContext.class);