This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch investigate-and-fix-camel-24272-use-backgroundtas in repository https://gitbox.apache.org/repos/asf/camel.git
commit a176c8c524db8876f03cb33a70b04b8627000c4c Merge: 9b5f1ca175f9 31dc50538ad7 Author: Guillaume Nodet <[email protected]> AuthorDate: Tue Jul 28 00:43:48 2026 +0200 merge: resolve conflicts with main Upstream already migrated KafkaFetchRecords to BackgroundTask with a unified reconnectTask() pattern. Taking upstream's version since it supersedes our separate create/subscribe task approach. Co-Authored-By: Claude Opus 4.6 <[email protected]> AGENTS.md | 12 +- .../org/apache/camel/catalog/components/kafka.json | 6 +- .../org/apache/camel/component/kafka/kafka.json | 6 +- .../camel/component/kafka/KafkaComponent.java | 27 +- .../camel/component/kafka/KafkaFetchRecords.java | 163 +++----- .../kafka/SingleNodeKafkaResumeStrategyTest.java | 5 - .../component/sjms/SjmsConnectionRecoveryTest.java | 2 +- .../apache/camel/spi/TypeConverterRegistry.java | 11 + .../apache/camel/impl/engine/DefaultTracer.java | 9 +- .../impl/converter/CoreTypeConverterRegistry.java | 12 + .../camel/impl/console/TypeConverterConsole.java | 16 +- .../DefaultTracerTraceCounterConcurrencyTest.java | 113 ++++++ .../ROOT/images/jbang/camel-tui-diagram.png | Bin 0 -> 324402 bytes .../ROOT/images/jbang/camel-tui-hello-diagram.svg | 1 - .../ROOT/images/jbang/camel-tui-hello-log.svg | 1 - .../ROOT/images/jbang/camel-tui-hello-overview.svg | 1 - .../ROOT/images/jbang/camel-tui-inspect.png | Bin 0 -> 373960 bytes .../ROOT/images/jbang/camel-tui-overview.png | Bin 0 -> 435239 bytes .../modules/ROOT/images/jbang/camel-tui-send.png | Bin 0 -> 124060 bytes .../jbang/camel-tui-topology-diagram-drilldown.svg | 1 - .../jbang/camel-tui-topology-diagram-external.svg | 1 - .../images/jbang/camel-tui-topology-diagram.svg | 1 - .../images/jbang/camel-tui-topology-errors.svg | 1 - .../images/jbang/camel-tui-topology-overview.svg | 1 - .../images/jbang/camel-tui-topology-routes.svg | 1 - .../ROOT/pages/camel-4x-upgrade-guide-4_22.adoc | 16 + .../modules/ROOT/pages/camel-jbang-tui.adoc | 20 +- .../camel/cli/connector/LocalCliConnector.java | 28 ++ .../dsl/KafkaComponentBuilderFactory.java | 6 +- .../docs/video/camel-tui-hello.cast | 40 -- .../docs/video/camel-tui-hello.gif | Bin 569957 -> 0 bytes .../docs/video/camel-tui-hello.tape | 52 --- .../docs/video/camel-tui-topology.cast | 66 ---- .../docs/video/camel-tui-topology.gif | Bin 1225838 -> 0 bytes .../docs/video/camel-tui-topology.tape | 92 ----- .../camel-jbang-plugin-tui/docs/video/readme.md | 148 -------- .../camel-jbang-plugin-tui/docs/video/record.sh | 53 --- .../video/screenshots/camel-tui-hello-diagram.svg | 1 - .../screenshots/camel-tui-hello-endpoints.svg | 1 - .../video/screenshots/camel-tui-hello-health.svg | 1 - .../docs/video/screenshots/camel-tui-hello-log.svg | 1 - .../video/screenshots/camel-tui-hello-overview.svg | 1 - .../video/screenshots/camel-tui-hello-routes.svg | 1 - .../camel-tui-topology-diagram-drilldown.svg | 1 - .../camel-tui-topology-diagram-external.svg | 1 - .../camel-tui-topology-diagram-navigate.svg | 1 - .../screenshots/camel-tui-topology-diagram.svg | 1 - .../screenshots/camel-tui-topology-endpoints.svg | 1 - .../screenshots/camel-tui-topology-errors.svg | 1 - .../video/screenshots/camel-tui-topology-final.svg | 1 - .../screenshots/camel-tui-topology-health.svg | 1 - .../video/screenshots/camel-tui-topology-log.svg | 1 - .../screenshots/camel-tui-topology-overview.svg | 1 - .../screenshots/camel-tui-topology-routes.svg | 1 - .../dsl/jbang/core/commands/tui/ActionsPopup.java | 2 +- .../dsl/jbang/core/commands/tui/HttpHelper.java | 121 ++++++ .../camel/dsl/jbang/core/commands/tui/HttpTab.java | 97 +---- .../jbang/core/commands/tui/IntegrationInfo.java | 1 + .../dsl/jbang/core/commands/tui/KafkaTab.java | 70 +++- .../jbang/core/commands/tui/SendMessagePopup.java | 66 +++- .../dsl/jbang/core/commands/tui/SourceTab.java | 24 +- .../dsl/jbang/core/commands/tui/StatusParser.java | 4 + .../dsl/jbang/core/commands/tui/TabRegistry.java | 13 +- .../jbang/core/commands/tui/TransformersTab.java | 275 ++++++++++++++ .../dsl/jbang/core/commands/tui/TuiIcons.java | 2 + .../jbang/core/commands/tui/TypeConvertersTab.java | 410 +++++++++++++++++++++ .../jbang/core/commands/tui/HttpHelperTest.java | 90 +++++ 67 files changed, 1386 insertions(+), 718 deletions(-)
