This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e888a8c3266f996adfb2376d1459c60b5ae71ea1
Author: Thomas Diesler <tdies...@redhat.com>
AuthorDate: Mon Jul 15 13:51:14 2024 +0200
[CAMEL-20976] camel-jbang: Remove support for comma separated --deps
---
.../camel/dsl/jbang/core/commands/Export.java | 2 +-
.../dsl/jbang/core/commands/ExportBaseCommand.java | 27 ++++++-------------
.../apache/camel/dsl/jbang/core/commands/Run.java | 31 +++++++---------------
3 files changed, 19 insertions(+), 41 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 a984cdc4748..89efb841b1e 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
@@ -113,7 +113,7 @@ public class Export extends ExportBaseCommand {
// copy properties from this to cmd
cmd.files = this.files;
cmd.repos = this.repos;
- cmd.addDependencies(this.dependencies());
+ cmd.addDependencies(this.dependencies);
cmd.runtime = this.runtime;
cmd.gav = this.gav;
cmd.mavenSettings = this.mavenSettings;
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 d1b9e0cbca1..2b61badb1db 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
@@ -93,9 +93,8 @@ public abstract class ExportBaseCommand extends CamelCommand {
description = "Additional maven repositories (Use
commas to separate multiple repositories)")
protected String repos;
- @CommandLine.Option(names = {
- "--dep", "--deps" }, arity = "*", description = "Add additional
dependencies")
- private String[] _dependencies; // [TODO] make less protected when we
ditch --deps
+ @CommandLine.Option(names = { "--dep", "--dependency" }, arity = "*",
description = "Add additional dependencies")
+ protected String[] dependencies;
@CommandLine.Option(names = { "--runtime" },
completionCandidates =
RuntimeCompletionCandidates.class,
@@ -294,7 +293,7 @@ public abstract class ExportBaseCommand extends
CamelCommand {
protected Integer runSilently(boolean ignoreLoadingError) throws Exception
{
Run run = new Run(getMain());
// need to declare the profile to use for run
- run.addDependencies(dependencies());
+ run.addDependencies(dependencies);
run.files = files;
run.exclude = exclude;
run.openapi = openapi;
@@ -307,25 +306,15 @@ public abstract class ExportBaseCommand extends
CamelCommand {
return run.runExport(ignoreLoadingError);
}
- // [TODO] Remove when we ditch --deps
- // For backward compatibility, we expands comma separated --deps
- // https://issues.apache.org/jira/browse/CAMEL-20976
- String[] dependencies() {
- if (_dependencies != null && _dependencies.length == 1) {
- String[] toks = _dependencies[0].split(",");
- _dependencies =
Arrays.stream(toks).map(String::trim).toArray(String[]::new);
- }
- return _dependencies;
- }
-
protected void addDependencies(String... deps) {
+ var depsArray = Optional.ofNullable(deps).orElse(new String[0]);
var depsList = new ArrayList<>(getDependenciesList());
- depsList.addAll(Arrays.asList(deps));
- _dependencies = depsList.toArray(new String[0]);
+ depsList.addAll(Arrays.asList(depsArray));
+ dependencies = depsList.toArray(new String[0]);
}
protected List<String> getDependenciesList() {
- var depsArray = Optional.ofNullable(dependencies()).orElse(new
String[0]);
+ var depsArray = Optional.ofNullable(dependencies).orElse(new
String[0]);
return Arrays.asList(depsArray);
}
@@ -347,7 +336,7 @@ public abstract class ExportBaseCommand extends
CamelCommand {
}
// custom dependencies
- for (String d : dependencies()) {
+ for (String d : getDependenciesList()) {
answer.add(normalizeDependency(d));
}
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 f4fc4aecbfa..570892479e4 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
@@ -152,9 +152,8 @@ public class Run extends CamelCommand {
description = "Profile to run (dev, test, or prod).")
String profile = "dev";
- @Option(names = {
- "--dep", "--deps" }, arity = "*", description = "Add additional
dependencies")
- private String[] _dependencies; // [TODO] make less protected when we
ditch --deps
+ @Option(names = { "--dep", "--dependency" }, arity = "*", description =
"Add additional dependencies")
+ String[] dependencies;
@Option(names = { "--repos" },
description = "Additional maven repositories for download
on-demand (Use commas to separate multiple repositories)")
@@ -809,8 +808,8 @@ public class Run extends CamelCommand {
// merge existing dependencies with --deps
addDependencies(RuntimeUtil.getDependenciesAsArray(profileProperties));
- if (dependencies().length > 0) {
- var joined = String.join(",", dependencies());
+ if (dependencies.length > 0) {
+ var joined = String.join(",", dependencies);
main.addInitialProperty("camel.jbang.dependencies", joined);
writeSettings("camel.jbang.dependencies", joined);
}
@@ -856,25 +855,15 @@ public class Run extends CamelCommand {
}
}
- // [TODO] Remove when we ditch --deps
- // For backward compatibility, we expands comma separated --deps
- // https://issues.apache.org/jira/browse/CAMEL-20976
- String[] dependencies() {
- if (_dependencies != null && _dependencies.length == 1) {
- String[] toks = _dependencies[0].split(",");
- _dependencies =
Arrays.stream(toks).map(String::trim).toArray(String[]::new);
- }
- return _dependencies;
- }
-
protected void addDependencies(String... deps) {
+ var depsArray = Optional.ofNullable(deps).orElse(new String[0]);
var depsList = new ArrayList<>(getDependenciesList());
- depsList.addAll(Arrays.asList(deps));
- _dependencies = depsList.toArray(new String[0]);
+ depsList.addAll(Arrays.asList(depsArray));
+ dependencies = depsList.toArray(new String[0]);
}
protected List<String> getDependenciesList() {
- var depsArray = Optional.ofNullable(dependencies()).orElse(new
String[0]);
+ var depsArray = Optional.ofNullable(dependencies).orElse(new
String[0]);
return Arrays.asList(depsArray);
}
@@ -901,7 +890,7 @@ public class Run extends CamelCommand {
if (eq.gav == null) {
eq.gav = "org.example.project:jbang-run-dummy:1.0-SNAPSHOT";
}
- eq.addDependencies(this.dependencies());
+ eq.addDependencies(this.dependencies);
eq.addDependencies("camel:cli-connector");
eq.fresh = this.fresh;
eq.download = this.download;
@@ -965,7 +954,7 @@ public class Run extends CamelCommand {
if (eq.gav == null) {
eq.gav = "org.example.project:jbang-run-dummy:1.0-SNAPSHOT";
}
- eq.addDependencies(dependencies());
+ eq.addDependencies(dependencies);
eq.addDependencies("camel:cli-connector");
if (this.dev) {
// hot-reload of spring-boot
