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
The following commit(s) were added to refs/heads/camel-3.20.x by this push:
new 5349a8cf0fd Print user configuration values
5349a8cf0fd is described below
commit 5349a8cf0fd60a7ae1836e34ca8454d4e8d2c8b9
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Mar 14 04:38:10 2023 +0100
Print user configuration values
---
.../camel/dsl/jbang/core/commands/CamelCommand.java | 13 ++++++++++---
.../dsl/jbang/core/commands/ExportBaseCommand.java | 3 +--
.../org/apache/camel/dsl/jbang/core/commands/Run.java | 5 ++---
.../dsl/jbang/core/commands/version/VersionGet.java | 17 ++++++++++++++---
4 files changed, 27 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 cafd28602d0..96ed6c302bb 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
@@ -17,7 +17,9 @@
package org.apache.camel.dsl.jbang.core.commands;
import java.io.File;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import java.util.Properties;
import java.util.Stack;
import java.util.concurrent.Callable;
@@ -83,17 +85,22 @@ public abstract class CamelCommand implements
Callable<Integer> {
return new File(camelDir, pid + "-trace.json");
}
- protected void printConfigurationValues() {
+ protected void printConfigurationValues(String header) {
final Properties configProperties = new Properties();
CommandLineHelper.loadProperties(properties ->
configProperties.putAll(properties));
+ List<String> lines = new ArrayList<>();
spec.options().forEach(opt -> {
if (Arrays.stream(opt.names()).anyMatch(name ->
// name starts with --
configProperties.containsKey(name.substring(2)))) {
- System.out.printf("%s = %s%n",
- opt.longestName(), opt.getValue().toString());
+ lines.add(String.format(" %s=%s",
+ opt.longestName(), opt.getValue().toString()));
}
});
+ if (!lines.isEmpty()) {
+ System.out.println(header);
+ lines.forEach(System.out::println);
+ }
}
protected abstract static class ParameterConsumer<T> implements
IParameterConsumer {
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 ada24eb199f..78e441c3dcc 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
@@ -160,8 +160,7 @@ abstract class ExportBaseCommand extends CamelCommand {
RuntimeUtil.configureLog("off", false, false, false, true);
}
- System.out.println("Exporting integration with the following
configuration:");
- printConfigurationValues();
+ printConfigurationValues("Exporting integration with the following
configuration:");
// export
return export();
}
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 03fbbc498b5..817984e6b25 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
@@ -215,9 +215,8 @@ public class Run extends CamelCommand {
@Override
public Integer call() throws Exception {
- System.out.println("Running integration with the following
configuration:");
- printConfigurationValues();
-
+ printConfigurationValues("Running integration with the following
configuration:");
+ // run
return run();
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java
index 87e486ecff0..1ae16ffbed1 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java
@@ -38,12 +38,23 @@ public class VersionGet extends CamelCommand {
public Integer call() throws Exception {
CamelCatalog catalog = new DefaultCamelCatalog();
String v = catalog.getCatalogVersion();
- System.out.println("Camel CLI version: " + v);
+ System.out.println("Camel JBang version: " + v);
CommandLineHelper.loadProperties(properties -> {
String uv = properties.getProperty("camel-version");
- if (uv != null) {
- System.out.println("User configuration Camel version: " + uv);
+ String repos = properties.getProperty("repos");
+ String runtime = properties.getProperty("runtime");
+ if (uv != null || repos != null || runtime != null) {
+ System.out.println("User configuration:");
+ if (uv != null) {
+ System.out.println(" camel-version = " + uv);
+ }
+ if (runtime != null) {
+ System.out.println(" runtime = " + runtime);
+ }
+ if (repos != null) {
+ System.out.println(" repos = " + repos);
+ }
}
});
