[camel] 02/03: CAMEL-19454: camel-jbang - Export should support --open-api

[davsclaus]

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

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

commit 58c2728b4a74e436cce15d075701630c12f6bb17
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jun 14 12:15:08 2023 +0200

    CAMEL-19454: camel-jbang - Export should support --open-api
---
 dsl/camel-jbang/camel-jbang-core/pom.xml                             | 4 ++++
 .../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java  | 5 ++---
 .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java  | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dsl/camel-jbang/camel-jbang-core/pom.xml 
b/dsl/camel-jbang/camel-jbang-core/pom.xml
index 74d86990a87..7f8c09db014 100644
--- a/dsl/camel-jbang/camel-jbang-core/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-core/pom.xml
@@ -61,6 +61,10 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-resourceresolver-github</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-xml-io-util</artifactId>
+        </dependency>
 
         <!-- cli -->
         <dependency>
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 4c28a7e3419..6f6d0ff05bb 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -418,12 +418,11 @@ abstract class ExportBaseCommand extends CamelCommand {
                         out = new File(target, source.getName());
                     }
                     if (!java) {
-                        if (camel) {
-                            safeCopy(source, out, true);
-                        }
                         if (kamelet) {
                             out = srcKameletsResourcesDir;
                             safeCopy(source, out, true);
+                        } else {
+                            safeCopy(source, out, true);
                         }
                     } else {
                         // need to append package name in java source file
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 03f8c415bde..92997471a13 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -65,6 +65,8 @@ import org.apache.camel.util.FileUtil;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.StringHelper;
+import org.apache.camel.xml.io.util.XmlStreamDetector;
+import org.apache.camel.xml.io.util.XmlStreamInfo;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;