This is an automated email from the ASF dual-hosted git repository.
pcongiusti 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 4a06dcfcb276 fix(dsl): jbang core streams closures
4a06dcfcb276 is described below
commit 4a06dcfcb2762ee03fb84d9dcd4405ebe56b1c29
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Wed Dec 3 09:51:26 2025 +0100
fix(dsl): jbang core streams closures
Beside a few minor compilation warnings cleaning
---
.../jbang/core/commands/action/CamelLogAction.java | 2 -
.../core/commands/catalog/CatalogKamelet.java | 3 +-
.../commands/catalog/KameletCatalogHelper.java | 6 +-
.../dsl/jbang/core/commands/infra/InfraPs.java | 18 ++--
.../commands/process/CamelRouteGroupStatus.java | 2 -
.../dsl/jbang/core/commands/process/Hawtio.java | 104 ++++++++++-----------
.../dsl/jbang/core/commands/process/ListKafka.java | 4 -
7 files changed, 62 insertions(+), 77 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelLogAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelLogAction.java
index 793bc91cb6cf..ed03e9bd1ac9 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelLogAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelLogAction.java
@@ -318,10 +318,8 @@ public class CamelLogAction extends ActionBaseCommand {
l1 = unescapeAnsi(l1);
l2 = unescapeAnsi(l2);
- String n1 = StringHelper.before(l1, "| ");
String t1 = StringHelper.after(l1, "| ");
t1 = StringHelper.before(t1, " ");
- String n2 = StringHelper.before(l2, "| ");
String t2 = StringHelper.after(l2, "| ");
t2 = StringHelper.before(t2, " ");
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
index cccc22f80bb9..304ba8d84f28 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
@@ -72,9 +72,8 @@ public class CatalogKamelet extends CamelCommand {
Map<String, Object> kamelets;
var tccLoader = Thread.currentThread().getContextClassLoader();
- try {
+ try (MavenDependencyDownloader downloader = new
MavenDependencyDownloader()) {
ClassLoader cl = createClassLoader();
- MavenDependencyDownloader downloader = new
MavenDependencyDownloader();
downloader.setClassLoader(cl);
downloader.start();
downloader.downloadDependency("org.apache.camel.kamelets",
"camel-kamelets-catalog", kameletsVersion);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/KameletCatalogHelper.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/KameletCatalogHelper.java
index ad6ca54546a4..89ef90b69021 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/KameletCatalogHelper.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/KameletCatalogHelper.java
@@ -142,9 +142,8 @@ public final class KameletCatalogHelper {
public static Map<String, Object> loadKamelets(String version) throws
Exception {
var tccLoader = Thread.currentThread().getContextClassLoader();
- try {
+ try (MavenDependencyDownloader downloader = new
MavenDependencyDownloader()) {
ClassLoader cl = createClassLoader();
- MavenDependencyDownloader downloader = new
MavenDependencyDownloader();
downloader.setClassLoader(cl);
downloader.start();
downloader.downloadDependency("org.apache.camel.kamelets",
"camel-kamelets-catalog", version);
@@ -161,9 +160,8 @@ public final class KameletCatalogHelper {
public static InputStream loadKameletYamlSchema(String name, String
version) throws Exception {
var tccLoader = Thread.currentThread().getContextClassLoader();
- try {
+ try (MavenDependencyDownloader downloader = new
MavenDependencyDownloader()) {
ClassLoader cl = createClassLoader();
- MavenDependencyDownloader downloader = new
MavenDependencyDownloader();
downloader.setClassLoader(cl);
downloader.start();
downloader.downloadDependency("org.apache.camel.kamelets",
"camel-kamelets-catalog", version);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraPs.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraPs.java
index af51ea5bd0ff..5c068adab0b9 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraPs.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraPs.java
@@ -22,6 +22,7 @@ import java.nio.file.Path;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.stream.Stream;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
import org.apache.camel.dsl.jbang.core.common.CommandLineHelper;
@@ -47,15 +48,14 @@ public class InfraPs extends InfraBaseCommand {
public Integer doCall() throws Exception {
// retrieve running services to filter output
Set<String> runningAliases = new HashSet<>();
- try {
- List<Path> pidFiles = Files.list(CommandLineHelper.getCamelDir())
- .filter(p -> {
- if (serviceName == null) {
- return
p.getFileName().toString().startsWith("infra-");
- } else {
- return
p.getFileName().toString().startsWith("infra-" + serviceName.get(0));
- }
- })
+ try (Stream<Path> files = Files.list(CommandLineHelper.getCamelDir()))
{
+ List<Path> pidFiles = files.filter(p -> {
+ if (serviceName == null) {
+ return p.getFileName().toString().startsWith("infra-");
+ } else {
+ return p.getFileName().toString().startsWith("infra-" +
serviceName.get(0));
+ }
+ })
.toList();
for (Path pidFile : pidFiles) {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteGroupStatus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteGroupStatus.java
index e2b50186fc39..0e5228c09d72 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteGroupStatus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteGroupStatus.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
import com.github.freva.asciitable.AsciiTable;
import com.github.freva.asciitable.Column;
@@ -83,7 +82,6 @@ public class CamelRouteGroupStatus extends
ProcessWatchCommand {
public Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
- AtomicBoolean remoteVisible = new AtomicBoolean();
List<Long> pids = findPids(name);
ProcessHandle.allProcesses()
.filter(ph -> pids.contains(ph.pid()))
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
index 06cd768bcfad..10a888be5160 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
@@ -91,63 +91,59 @@ public class Hawtio extends CamelCommand {
}
protected Integer callHawtio() throws Exception {
- ClassLoader cl = createClassLoader();
-
- MavenDependencyDownloader downloader = new MavenDependencyDownloader();
- downloader.setClassLoader(cl);
- downloader.start();
- // download hawtio embedded mode
- downloader.downloadDependency("io.hawt", "hawtio-embedded", version);
- // download war that has the web-console
- MavenArtifact ma = downloader.downloadArtifact("io.hawt",
"hawtio-war:war", version);
- if (ma == null) {
- printer().printErr("Cannot download io.hawt:hawtio-war:war:" +
version);
- return 1;
- }
-
- String war = ma.getFile().getAbsolutePath();
-
- // invoke hawtio main app that launches hawtio
- try {
- // turn off hawito auth
- System.setProperty("hawtio.authenticationEnabled", "false");
-
- // use CL from that has the downloaded JAR
- Thread.currentThread().setContextClassLoader(cl);
- Class<?> clazz = cl.loadClass("io.hawt.embedded.Main");
- Object hawt = clazz.getDeclaredConstructor().newInstance();
- Method m = clazz.getMethod("setWar", String.class);
- ObjectHelper.invokeMethod(m, hawt, war);
- m = clazz.getMethod("setPort", Integer.class);
- ObjectHelper.invokeMethod(m, hawt, port);
- m = clazz.getMethod("run");
- ObjectHelper.invokeMethod(m, hawt);
-
- if (openUrl) {
- // open web browser
- String url = "http://localhost:"; + port + "/hawtio";
- System.setProperty("hawtio.url", url);
- if (openUrl && Desktop.isDesktopSupported()) {
- try {
- Desktop.getDesktop().browse(new URI(url));
- } catch (Exception e) {
- printer().printErr("Failed to open browser session, to
access Hawtio open url: " + url);
+ try (MavenDependencyDownloader downloader = new
MavenDependencyDownloader()) {
+ ClassLoader cl = createClassLoader();
+ downloader.setClassLoader(cl);
+ downloader.start();
+ // download hawtio embedded mode
+ downloader.downloadDependency("io.hawt", "hawtio-embedded",
version);
+ // download war that has the web-console
+ MavenArtifact ma = downloader.downloadArtifact("io.hawt",
"hawtio-war:war", version);
+ if (ma == null) {
+ printer().printErr("Cannot download io.hawt:hawtio-war:war:" +
version);
+ return 1;
+ }
+ String war = ma.getFile().getAbsolutePath();
+ // invoke hawtio main app that launches hawtio
+ try {
+ // turn off hawito auth
+ System.setProperty("hawtio.authenticationEnabled", "false");
+
+ // use CL from that has the downloaded JAR
+ Thread.currentThread().setContextClassLoader(cl);
+ Class<?> clazz = cl.loadClass("io.hawt.embedded.Main");
+ Object hawt = clazz.getDeclaredConstructor().newInstance();
+ Method m = clazz.getMethod("setWar", String.class);
+ ObjectHelper.invokeMethod(m, hawt, war);
+ m = clazz.getMethod("setPort", Integer.class);
+ ObjectHelper.invokeMethod(m, hawt, port);
+ m = clazz.getMethod("run");
+ ObjectHelper.invokeMethod(m, hawt);
+
+ if (openUrl) {
+ // open web browser
+ String url = "http://localhost:"; + port + "/hawtio";
+ System.setProperty("hawtio.url", url);
+ if (openUrl && Desktop.isDesktopSupported()) {
+ try {
+ Desktop.getDesktop().browse(new URI(url));
+ } catch (Exception e) {
+ printer().printErr("Failed to open browser
session, to access Hawtio open url: " + url);
+ }
}
}
- }
- // keep JVM running
- installHangupInterceptor();
- shutdownLatch.await();
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- printer().printErr("Interrupted while launching Hawtio");
- return 1;
- } catch (Exception e) {
- printer().printErr("Cannot launch Hawtio due to: " +
e.getMessage());
- return 1;
- } finally {
- downloader.close();
+ // keep JVM running
+ installHangupInterceptor();
+ shutdownLatch.await();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ printer().printErr("Interrupted while launching Hawtio");
+ return 1;
+ } catch (Exception e) {
+ printer().printErr("Cannot launch Hawtio due to: " +
e.getMessage());
+ return 1;
+ }
}
return 0;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListKafka.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListKafka.java
index 0ce663ade570..8885e4828349 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListKafka.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListKafka.java
@@ -249,10 +249,6 @@ public class ListKafka extends ProcessWatchCommand {
return u;
}
- private String getMetadata(Row r) {
- return r.groupId;
- }
-
private String getState(Row r) {
return StringHelper.capitalize(r.state.toLowerCase(Locale.ROOT));
}
