This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 3795457c785 Fixed CS
3795457c785 is described below
commit 3795457c785caa6cdecec384531428e2e2e9050a
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Nov 11 09:30:18 2022 +0100
Fixed CS
---
.../apache/camel/dsl/jbang/core/commands/Run.java | 61 ++++++++++++----------
1 file changed, 32 insertions(+), 29 deletions(-)
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 41fe9f132ec..63578d16e6a 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
@@ -308,40 +308,12 @@ class Run extends CamelCommand {
final KameletMain main = createMainInstance();
- final Set<String> downloaded = new HashSet<>();
- final Set<String> kamelets = new HashSet<>();
main.setRepos(repos);
main.setDownload(download);
main.setFresh(fresh);
main.setMavenSettings(mavenSettings);
main.setMavenSettingsSecurity(mavenSettingsSecurity);
- main.setDownloadListener(new DownloadListener() {
- @Override
- public void onDownloadDependency(String groupId, String
artifactId, String version) {
- String line = "mvn:" + groupId + ":" + artifactId;
- if (version != null) {
- line += ":" + version;
- }
- if (!downloaded.contains(line)) {
- writeSettings("dependency", line);
- downloaded.add(line);
- }
- }
-
- @Override
- public void onAlreadyDownloadedDependency(String groupId, String
artifactId, String version) {
- // we want to register everything
- onDownloadDependency(groupId, artifactId, version);
- }
-
- @Override
- public void onLoadingKamelet(String name) {
- if (!kamelets.contains(name)) {
- writeSettings("kamelet", name);
- kamelets.add(name);
- }
- }
- });
+ main.setDownloadListener(new RunDownloadListener());
main.setAppName("Apache Camel (JBang)");
writeSetting(main, profileProperties,
"camel.main.sourceLocationEnabled", "true");
@@ -835,4 +807,35 @@ class Run extends CamelCommand {
return false;
}
+ private class RunDownloadListener implements DownloadListener {
+ final Set<String> downloaded = new HashSet<>();
+ final Set<String> kamelets = new HashSet<>();
+
+ @Override
+ public void onDownloadDependency(String groupId, String artifactId,
String version) {
+ String line = "mvn:" + groupId + ":" + artifactId;
+ if (version != null) {
+ line += ":" + version;
+ }
+ if (!downloaded.contains(line)) {
+ writeSettings("dependency", line);
+ downloaded.add(line);
+ }
+ }
+
+ @Override
+ public void onAlreadyDownloadedDependency(String groupId, String
artifactId, String version) {
+ // we want to register everything
+ onDownloadDependency(groupId, artifactId, version);
+ }
+
+ @Override
+ public void onLoadingKamelet(String name) {
+ if (!kamelets.contains(name)) {
+ writeSettings("kamelet", name);
+ kamelets.add(name);
+ }
+ }
+ }
+
}