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:53:06 UTC
[camel] branch camel-3.20.x updated (c34f8eda3a1 -> cf54505449b)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from c34f8eda3a1 CAMEL-19453: camel-jbang - Run with --open-api to support yaml spec files
new 2f65004dcd2 CAMEL-19454: camel-jbang - Export should support --open-api
new 5ae79e29594 CAMEL-19454: camel-jbang - Export should support --open-api
new cf54505449b CAMEL-19454: camel-jbang - Export should support --open-api
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/dsl/jbang/core/commands/Export.java | 2 +
.../dsl/jbang/core/commands/ExportBaseCommand.java | 12 ++---
.../dsl/jbang/core/commands/ExportQuarkus.java | 3 +-
.../apache/camel/dsl/jbang/core/commands/Run.java | 2 -
.../camel/dsl/jbang/core/common/RuntimeUtil.java | 52 +++++++++++-----------
5 files changed, 38 insertions(+), 33 deletions(-)
[camel] 01/03: CAMEL-19454: camel-jbang - Export should support --open-api
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2f65004dcd2260e5f94a08cec71188de154a914d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jun 14 09:58:12 2023 +0200
CAMEL-19454: camel-jbang - Export should support --open-api
---
.../camel/dsl/jbang/core/commands/Export.java | 2 +
.../dsl/jbang/core/commands/ExportBaseCommand.java | 7 ++-
.../dsl/jbang/core/commands/ExportQuarkus.java | 3 +-
.../camel/dsl/jbang/core/common/RuntimeUtil.java | 52 +++++++++++-----------
4 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
index a395ba62a6f..41ded453e1b 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
@@ -66,6 +66,7 @@ public class Export extends ExportBaseCommand {
= "true".equals(prop.getProperty("camel.jbang.secretsRefresh", this.secretsRefresh ? "true" : "false"));
this.secretsRefreshProviders
= prop.getProperty("camel.jbang.secretsRefreshProviders", this.secretsRefreshProviders);
+ this.openapi = prop.getProperty("camel.jbang.openApi", this.openapi);
}
if (runtime == null) {
@@ -118,6 +119,7 @@ public class Export extends ExportBaseCommand {
cmd.additionalProperties = this.additionalProperties;
cmd.secretsRefresh = this.secretsRefresh;
cmd.secretsRefreshProviders = this.secretsRefreshProviders;
+ cmd.openapi = this.openapi;
// run export
return cmd.export();
}
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 926f7073a7d..cd0c7d4505f 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
@@ -145,6 +145,9 @@ abstract class ExportBaseCommand extends CamelCommand {
description = "Build tool to use (maven or gradle)")
protected String buildTool;
+ @CommandLine.Option(names = { "--open-api" }, description = "Adds an OpenAPI spec from the given file (json or yaml file)")
+ protected String openapi;
+
@CommandLine.Option(names = {
"--dir",
"--directory" }, description = "Directory where the project will be exported", defaultValue = ".")
@@ -254,8 +257,8 @@ abstract class ExportBaseCommand extends CamelCommand {
run.localKameletDir = localKameletDir;
run.dependencies = dependencies;
run.files = files;
- Integer code = run.runSilent();
- return code;
+ run.openapi = openapi;
+ return run.runSilent();
}
protected Set<String> resolveDependencies(File settings, File profile) throws Exception {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index 11681bbb3ce..4b11098d752 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
@@ -210,8 +210,9 @@ class ExportQuarkus extends Export {
private static String removeScheme(String s) {
if (s.contains(":")) {
- return StringHelper.after(s, ":");
+ s = StringHelper.after(s, ":");
}
+ s = s.replace(".camel-jbang/", "");
return s;
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java
index 45becca7b0d..6465bca201e 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java
@@ -55,32 +55,34 @@ public final class RuntimeUtil {
}
public static void setRootLoggingLevel(String level) {
- level = level.toLowerCase();
+ if (level != null) {
+ level = level.toLowerCase();
- switch (level) {
- case "off":
- Configurator.setRootLevel(Level.OFF);
- break;
- case "trace":
- Configurator.setRootLevel(Level.TRACE);
- break;
- case "debug":
- Configurator.setRootLevel(Level.DEBUG);
- break;
- case "info":
- Configurator.setRootLevel(Level.INFO);
- break;
- case "warn":
- Configurator.setRootLevel(Level.WARN);
- break;
- case "error":
- Configurator.setRootLevel(Level.ERROR);
- break;
- case "fatal":
- Configurator.setRootLevel(Level.FATAL);
- break;
- default: {
- Configurator.setRootLevel(Level.INFO);
+ switch (level) {
+ case "off":
+ Configurator.setRootLevel(Level.OFF);
+ break;
+ case "trace":
+ Configurator.setRootLevel(Level.TRACE);
+ break;
+ case "debug":
+ Configurator.setRootLevel(Level.DEBUG);
+ break;
+ case "info":
+ Configurator.setRootLevel(Level.INFO);
+ break;
+ case "warn":
+ Configurator.setRootLevel(Level.WARN);
+ break;
+ case "error":
+ Configurator.setRootLevel(Level.ERROR);
+ break;
+ case "fatal":
+ Configurator.setRootLevel(Level.FATAL);
+ break;
+ default: {
+ Configurator.setRootLevel(Level.INFO);
+ }
}
}
}
[camel] 03/03: CAMEL-19454: camel-jbang - Export should support --open-api
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cf54505449b7221caf6e796539194c5d569ac3e4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jun 14 12:24:38 2023 +0200
CAMEL-19454: camel-jbang - Export should support --open-api
---
dsl/camel-jbang/camel-jbang-core/pom.xml | 4 ----
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 2 --
2 files changed, 6 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/pom.xml b/dsl/camel-jbang/camel-jbang-core/pom.xml
index c4470d7ca34..540c6849bb1 100644
--- a/dsl/camel-jbang/camel-jbang-core/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-core/pom.xml
@@ -55,10 +55,6 @@
<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/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 29b5209ffa3..4624fff9700 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,8 +65,6 @@ 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.logging.log4j.Level;
-import org.apache.logging.log4j.core.config.Configurator;
import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
[camel] 02/03: CAMEL-19454: camel-jbang - Export should support --open-api
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5ae79e29594e0c3582b5c8ccb38631861623e37b
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 ++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/pom.xml b/dsl/camel-jbang/camel-jbang-core/pom.xml
index 540c6849bb1..c4470d7ca34 100644
--- a/dsl/camel-jbang/camel-jbang-core/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-core/pom.xml
@@ -55,6 +55,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 cd0c7d4505f..fbc3174911c 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