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:24:51 UTC
[camel] branch camel-3.x updated (3f1ee9629a1 -> 672dde832ed)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from 3f1ee9629a1 Regen for commit 2212b7f43f70e12208729c4b5f9af45d116d1bc6 (#10377)
new 3b2787a56c6 CAMEL-19454: camel-jbang - Export should support --open-api
new 58c2728b4a7 CAMEL-19454: camel-jbang - Export should support --open-api
new 672dde832ed 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 +-
.../camel/dsl/jbang/core/common/RuntimeUtil.java | 52 +++++++++++-----------
4 files changed, 38 insertions(+), 31 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.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3b2787a56c672e9285203b15400f824c2ef94220
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 ea0e8253ce6..aaeaca73e42 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 7ead086b366..4c28a7e3419 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 3939eabe67e..aa7cc6bce78 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.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 672dde832edb0377a4b380cf69d9665cde19fa87
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 7f8c09db014..74d86990a87 100644
--- a/dsl/camel-jbang/camel-jbang-core/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-core/pom.xml
@@ -61,10 +61,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 92997471a13..03f8c415bde 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.camel.xml.io.util.XmlStreamDetector;
-import org.apache.camel.xml.io.util.XmlStreamInfo;
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.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 58c2728b4a74e436cce15d075701630c12f6bb17
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 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;