You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/06/14 10:15:35 UTC
[camel] 02/02: CAMEL-19454: camel-jbang - Export should support --open-api
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 c69072787bec4ab6ca5769b2d49010dba95cac4a
Author: Claus Ibsen <cl...@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 4f81a273a2c..48f34a61559 100644
--- a/dsl/camel-jbang/camel-jbang-core/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-core/pom.xml
@@ -59,6 +59,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 b1c76bbf76a..2ff5ce828c8 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
@@ -420,12 +420,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 11db9fc10a8..9862d46300e 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
@@ -66,6 +66,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;