This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch brow in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8137abdc21381b05c87d83375e84aaf2b8373373 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon Sep 9 10:29:59 2024 +0200 CAMEL-21183: BrowseEndpoint should have limit/filter to optimize returned data from component implementations --- .../java/org/apache/camel/cli/connector/LocalCliConnector.java | 4 +++- .../dsl/jbang/core/commands/action/CamelBrowseAction.java | 10 ++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java index 14ba369621e..c1767158c37 100644 --- a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java +++ b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java @@ -780,8 +780,10 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C String filter = root.getString("filter"); String limit = root.getString("limit"); String dump = root.getString("dump"); + String includeBody = root.getString("includeBody"); JsonObject json - = (JsonObject) dc.call(DevConsole.MediaType.JSON, Map.of("filter", filter, "limit", limit, "dump", dump)); + = (JsonObject) dc.call(DevConsole.MediaType.JSON, + Map.of("filter", filter, "limit", limit, "dump", dump, "includeBody", includeBody)); LOG.trace("Updating output file: {}", outputFile); IOHelper.writeText(json.toJson(), outputFile); } else { diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelBrowseAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelBrowseAction.java index 19db3918dc8..10052052584 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelBrowseAction.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelBrowseAction.java @@ -79,10 +79,6 @@ public class CamelBrowseAction extends ActionBaseCommand { description = "Sort by uri, or size", defaultValue = "uri") String sort; - @CommandLine.Option(names = { "--show-exchange-properties" }, defaultValue = "false", - description = "Show exchange properties in browsed messages") - boolean showExchangeProperties; - @CommandLine.Option(names = { "--show-headers" }, defaultValue = "true", description = "Show message headers in browsed messages") boolean showHeaders = true; @@ -126,6 +122,7 @@ public class CamelBrowseAction extends ActionBaseCommand { root.put("filter", endpoint == null ? "*" : endpoint); root.put("limit", limit); root.put("dump", dump); + root.put("includeBody", showBody); File f = getActionFile(Long.toString(pid)); try { @@ -185,7 +182,7 @@ public class CamelBrowseAction extends ActionBaseCommand { MessageTableHelper tableHelper = new MessageTableHelper(); tableHelper.setPretty(pretty); tableHelper.setLoggingColor(loggingColor); - tableHelper.setShowExchangeProperties(showExchangeProperties); + tableHelper.setShowExchangeProperties(false); for (Row row : rows) { if (row.messages != null) { @@ -194,9 +191,6 @@ public class CamelBrowseAction extends ActionBaseCommand { String exchangeId = jo.getString("exchangeId"); JsonObject message = jo.getMap("message"); - if (!showExchangeProperties && message != null) { - message.remove("exchangeProperties"); - } if (!showHeaders && message != null) { message.remove("headers"); }