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 2022/08/04 08:38:38 UTC
[camel] branch camel-3.18.x updated: camel-jbang - Profile option should only be on run/export commands.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new 6bb27980f9e camel-jbang - Profile option should only be on run/export commands.
6bb27980f9e is described below
commit 6bb27980f9ecd945d823db2d091c7bd2bc88e26e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Aug 4 10:34:57 2022 +0200
camel-jbang - Profile option should only be on run/export commands.
---
.../org/apache/camel/dsl/jbang/core/commands/CamelCommand.java | 4 ----
.../org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java | 7 -------
.../java/org/apache/camel/dsl/jbang/core/commands/Export.java | 1 +
.../apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 8 ++++++++
.../main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 9 +++++++++
5 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java
index b1568a24f18..150333f31aa 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java
@@ -37,8 +37,4 @@ abstract class CamelCommand implements Callable<Integer> {
return main;
}
- public String getProfile() {
- return main.getProfile();
- }
-
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
index fe83b9d9725..05f370032d7 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
@@ -27,10 +27,6 @@ import picocli.CommandLine.Command;
public class CamelJBangMain implements Callable<Integer> {
private static CommandLine commandLine;
- @CommandLine.Option(names = { "--profile" }, scope = CommandLine.ScopeType.INHERIT, defaultValue = "application",
- description = "Profile")
- private String profile;
-
public static void run(String... args) {
CamelJBangMain main = new CamelJBangMain();
commandLine = new CommandLine(main)
@@ -58,7 +54,4 @@ public class CamelJBangMain implements Callable<Integer> {
return 0;
}
- public String getProfile() {
- return profile;
- }
}
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 f78ead4c07d..3cb0af282b4 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
@@ -76,6 +76,7 @@ class Export extends ExportBaseCommand {
private Integer export(ExportBaseCommand cmd) throws Exception {
// copy properties from this to cmd
+ cmd.profile = this.profile;
cmd.runtime = this.runtime;
cmd.gav = this.gav;
cmd.exportDir = this.exportDir;
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 128405b1966..0635409b784 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
@@ -54,6 +54,10 @@ abstract class ExportBaseCommand extends CamelCommand {
"camel.jbang.classpathFiles"
};
+ @CommandLine.Option(names = { "--profile" }, scope = CommandLine.ScopeType.INHERIT, defaultValue = "application",
+ description = "Profile to use, which refers to loading properties file with the given profile name. By default application.properties is loaded.")
+ protected String profile;
+
@CommandLine.Option(names = { "--runtime" }, description = "Runtime (spring-boot, quarkus, or camel-main)")
protected String runtime;
@@ -122,6 +126,10 @@ abstract class ExportBaseCommand extends CamelCommand {
return export();
}
+ public String getProfile() {
+ return profile;
+ }
+
protected abstract Integer export() throws Exception;
protected static String getScheme(String name) {
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 5d0c45efedc..c341d12f52f 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
@@ -62,6 +62,7 @@ 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;
import picocli.CommandLine.Parameters;
@@ -99,6 +100,10 @@ class Run extends CamelCommand {
arity = "0..9")
String[] files;
+ @CommandLine.Option(names = { "--profile" }, scope = CommandLine.ScopeType.INHERIT, defaultValue = "application",
+ description = "Profile to use, which refers to loading properties file with the given profile name. By default application.properties is loaded.")
+ String profile;
+
@Option(names = {
"--dep", "--deps" }, description = "Add additional dependencies (Use commas to separate multiple dependencies).")
String dependencies;
@@ -191,6 +196,10 @@ class Run extends CamelCommand {
//CHECKSTYLE:ON
+ public String getProfile() {
+ return profile;
+ }
+
@Override
public Integer call() throws Exception {
if (stopRequested) {