Skip to content

CAMEL-21563 : camel-jbang ps option output in JSON #16628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davsclaus merged 1 commit into from
Dec 21, 2024
Merged

CAMEL-21563 : camel-jbang ps option output in JSON #16628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 40 additions & 13 deletions ...bang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import com.github.freva.asciitable.AsciiTable;
import com.github.freva.asciitable.Column;
Expand All @@ -30,6 +31,7 @@
import org.apache.camel.dsl.jbang.core.common.ProcessHelper;
import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.json.JsonObject;
import org.apache.camel.util.json.Jsoner;
import picocli.CommandLine;
import picocli.CommandLine.Command;

Expand All @@ -46,6 +48,10 @@ public class ListProcess extends ProcessWatchCommand {
description = "List only pid in the output")
boolean pid;

@CommandLine.Option(names = { "--json" },
description = "Output in JSON Format")
boolean jsonOutput;

public ListProcess(CamelJBangMain main) {
super(main);
}
Expand Down Expand Up @@ -104,22 +110,43 @@ protected Integer doProcessWatchCall() throws Exception {
// sort rows
rows.sort(this::sortRow);

// print rows
if (!rows.isEmpty()) {
if (pid) {
rows.forEach(r -> printer().println(r.pid));
if (jsonOutput) {
printer().println(
Jsoner.serialize(
rows.stream().map(row -> row.pid).collect(Collectors.toList())));
} else {
rows.forEach(r -> printer().println(r.pid));
}
} else {
printer().println(AsciiTable.getTable(AsciiTable.NO_BORDERS, rows, Arrays.asList(
new Column().header("PID").headerAlign(HorizontalAlign.CENTER).with(r -> r.pid),
new Column().header("NAME").dataAlign(HorizontalAlign.LEFT)
.maxWidth(40, OverflowBehaviour.ELLIPSIS_RIGHT)
.with(r -> r.name),
new Column().header("READY").dataAlign(HorizontalAlign.CENTER).with(r -> r.ready),
new Column().header("STATUS").headerAlign(HorizontalAlign.CENTER)
.with(r -> extractState(r.state)),
new Column().header("AGE").headerAlign(HorizontalAlign.CENTER).with(r -> r.ago),
new Column().header("TOTAL").with(this::getTotal),
new Column().header("FAIL").with(this::getFailed),
new Column().header("INFLIGHT").with(this::getInflight))));
if (jsonOutput) {
printer().println(
Jsoner.serialize(
rows.stream().map(row -> Map.of(
"pid", row.pid,
"name", row.name,
"ready", row.ready,
"status", extractState(row.state),
"age", row.ago,
"total", getTotal(row),
"fail", getFailed(row),
"inflight", getInflight(row))).collect(Collectors.toList())));
} else {
printer().println(AsciiTable.getTable(AsciiTable.NO_BORDERS, rows, Arrays.asList(
new Column().header("PID").headerAlign(HorizontalAlign.CENTER).with(r -> r.pid),
new Column().header("NAME").dataAlign(HorizontalAlign.LEFT)
.maxWidth(40, OverflowBehaviour.ELLIPSIS_RIGHT)
.with(r -> r.name),
new Column().header("READY").dataAlign(HorizontalAlign.CENTER).with(r -> r.ready),
new Column().header("STATUS").headerAlign(HorizontalAlign.CENTER)
.with(r -> extractState(r.state)),
new Column().header("AGE").headerAlign(HorizontalAlign.CENTER).with(r -> r.ago),
new Column().header("TOTAL").with(this::getTotal),
new Column().header("FAIL").with(this::getFailed),
new Column().header("INFLIGHT").with(this::getInflight))));
}
}
}

Expand Down
Loading