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 3f8af26d1304 Reattach Javadoc blocks separated from their member in
camel-jbang (#29650)
3f8af26d1304 is described below
commit 3f8af26d1304300fe785f8230471e518c36cd967
Author: dhairya05 <[email protected]>
AuthorDate: Thu Nov 12 12:04:24 2026 +0530
Reattach Javadoc blocks separated from their member in camel-jbang (#29650)
* camel-jbang-plugin-tui: reattach the Javadoc of AboutView.routeOrder
stripName was inserted between the block and routeOrder, so the
description of the route ordering documented stripName and was dropped
in favour of stripName's own block.
* camel-jbang-plugin-tui: reattach the Javadoc of AutocompletePopup.title
isAdvanced was inserted between the block and title(), leaving title()
undocumented.
* camel-jbang-plugin-tui: reattach the Javadoc of McpFacade.editFile
The APPLIED_WRITES constant was inserted between the block and the
editFile overload it points at.
* camel-jbang-core: reattach the Javadoc of AuthoringTools.editFile
The EDIT_WINDOW_LINES constant was inserted between the block and the
editFile it describes, which was left undocumented.
* camel-jbang-core: reattach the Javadoc of SimpleChecks.isMissingDependency
isOfTheApplication was inserted between the block and
isMissingDependency; the block describes a missing dependency, while
isOfTheApplication has a block of its own about application classes.
* camel-jbang-core: reattach the Javadoc of IntegrationSummary.clean
keyAndRest and shortKey were inserted between the block and clean,
which strips exactly what the block describes.
* camel-jbang-plugin-tui: drop the superseded Javadoc on ChaosRecipes.Recipe
The one-line "A known rule." was left above the fuller description that
replaced it, where Javadoc already ignored it.
* camel-jbang-plugin-tui: merge the two Javadoc blocks of
TabRegistry.MoreTab
The description and the @param tags were in separate blocks, so Javadoc
kept only the tags and the description of what a MoreTab is was
dropped. Both describe MoreTab, so they belong in one block.
---
.../camel/dsl/jbang/core/commands/ai/AuthoringTools.java | 6 +++---
.../camel/dsl/jbang/core/commands/ai/IntegrationSummary.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/ai/SimpleChecks.java | 8 ++++----
.../apache/camel/dsl/jbang/core/commands/tui/AboutView.java | 8 ++++----
.../camel/dsl/jbang/core/commands/tui/AutocompletePopup.java | 10 +++++-----
.../apache/camel/dsl/jbang/core/commands/tui/ChaosRecipes.java | 1 -
.../apache/camel/dsl/jbang/core/commands/tui/McpFacade.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/tui/TabRegistry.java | 3 +--
8 files changed, 19 insertions(+), 21 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/AuthoringTools.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/AuthoringTools.java
index aa4ddfc7457f..f7355e56b2c3 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/AuthoringTools.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/AuthoringTools.java
@@ -732,14 +732,14 @@ public final class AuthoringTools {
/** How long a write waits after the reload for the first output of the
routes (CAMEL-25513). */
static final long OUTPUT_WAIT_MILLIS = 3000;
+ /** How many lines of the file are handed back on either side of the place
an edit was aiming at. */
+ private static final int EDIT_WINDOW_LINES = 20;
+
/**
* Replaces one snippet of a file and writes the result through {@link
#writeFile}, so a change to an existing file
* does not rewrite every line of it: a model that re-emits a whole file
corrupts the lines it did not mean to touch
* (CAMEL-24909). The snippet must occur exactly once; the answer says
what was replaced.
*/
- /** How many lines of the file are handed back on either side of the place
an edit was aiming at. */
- private static final int EDIT_WINDOW_LINES = 20;
-
public static JsonObject editFile(ToolContext ctx, Path dir, String file,
String find, String replace) {
return editFile(ctx, dir, file, find, replace, null);
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/IntegrationSummary.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/IntegrationSummary.java
index 8d7da48a2969..7eb8552647bd 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/IntegrationSummary.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/IntegrationSummary.java
@@ -1151,7 +1151,6 @@ public final class IntegrationSummary {
return new Capability(name, routes, sentence);
}
- /** Strips Markdown emphasis, code ticks and quotes around a value. */
/**
* The route a line of the answer is about, and what follows its colon
(null when there is no colon). A route
* without an id has a key with a colon of its own ({@code
src/main/java/OrderRoute.java:32}), so the key is the
@@ -1192,6 +1191,7 @@ public final class IntegrationSummary {
return slash >= 0 && key.matches(".*:\\d+$") ? key.substring(slash +
1) : key;
}
+ /** Strips Markdown emphasis, code ticks and quotes around a value. */
private static String clean(String s) {
String t = s.strip();
t = t.replaceAll("^[*_`\"']+|[*_`\"']+$", "").strip();
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/SimpleChecks.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/SimpleChecks.java
index d0151de4feb2..4a4a97318cb6 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/SimpleChecks.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/SimpleChecks.java
@@ -811,10 +811,6 @@ final class SimpleChecks {
return -1;
}
- /**
- * A function served by a language or a component that is not on the
classpath of the check (${jsonpath(...)},
- * ${a2a:text}): the route works when the dependency is there, which the
check cannot know, so it is not reported.
- */
/**
* Whether the error is about something only the application has: a class
of its own (${type:com.acme.Codes.OK},
* which the classpath of the check does not have), or a custom function
it registers (${function(name)}).
@@ -823,6 +819,10 @@ final class SimpleChecks {
return error.contains("ClassNotFoundException") ||
error.startsWith("No custom simple function");
}
+ /**
+ * A function served by a language or a component that is not on the
classpath of the check (${jsonpath(...)},
+ * ${a2a:text}): the route works when the dependency is there, which the
check cannot know, so it is not reported.
+ */
static boolean isMissingDependency(String error) {
return error.startsWith("No language could be found for:")
|| error.contains("requires camel-semantic")
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/AboutView.java
b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/AboutView.java
index 25399325e8c7..b017cd0ed76c 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/AboutView.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/AboutView.java
@@ -510,10 +510,6 @@ final class AboutView {
return last;
}
- /**
- * The routes in the order of the Routes panel, where a route comes after
the one that calls it, then those it does
- * not have; the integration lists its routes by id, which puts a called
route before its caller.
- */
/**
* The name of a route on its strip: its id, or for a route the sources do
not have and Camel named route1, its
* endpoint (rest-api:openapi, the route that serves the API description
of the REST DSL).
@@ -532,6 +528,10 @@ final class AboutView {
return (q >= 0 ? from.substring(0, q) : from).replaceFirst("://", ":");
}
+ /**
+ * The routes in the order of the Routes panel, where a route comes after
the one that calls it, then those it does
+ * not have; the integration lists its routes by id, which puts a called
route before its caller.
+ */
private List<String> routeOrder(IntegrationInfo info) {
List<String> running = info.routes.stream().map(r ->
r.routeId).filter(id -> id != null).toList();
List<String> order = new ArrayList<>();
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/AutocompletePopup.java
b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/AutocompletePopup.java
index 68afc2e624b2..8f1d9bbc2381 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/AutocompletePopup.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/AutocompletePopup.java
@@ -604,16 +604,16 @@ class AutocompletePopup {
listState.select(filteredItems.isEmpty() ? null : 0);
}
- /**
- * The title of the list with its count. When the list has the properties
of a Kamelet, the count is of those: the
- * options of the kamelet component below the divider are for special
uses, and not what the title names
- * (CAMEL-25411).
- */
/** An option of an advanced group of the catalog: "advanced", "consumer
(advanced)", "producer (advanced)". */
static boolean isAdvanced(CompletionItem item) {
return item.group() != null && item.group().contains("advanced");
}
+ /**
+ * The title of the list with its count. When the list has the properties
of a Kamelet, the count is of those: the
+ * options of the kamelet component below the divider are for special
uses, and not what the title names
+ * (CAMEL-25411).
+ */
String title() {
String label = titlePrefix != null ? titlePrefix : "Completions";
boolean kamelet =
allItems.stream().anyMatch(AutocompletePopup::isKameletProperty);
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/ChaosRecipes.java
b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/ChaosRecipes.java
index 1e78a9f04fb3..af6ba2ab2801 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/ChaosRecipes.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/ChaosRecipes.java
@@ -40,7 +40,6 @@ final class ChaosRecipes {
List<String> schemes, List<String> values) {
}
- /** A known rule. */
/**
* A known rule. Besides what it does, the model says what it can uncover,
when not to use it and what to watch
* while it runs (CAMEL-26699): empty with a catalog from before that.
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/McpFacade.java
b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/McpFacade.java
index 486c1750122e..02c37ea26cbd 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/McpFacade.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/McpFacade.java
@@ -1532,10 +1532,10 @@ class McpFacade {
return editFile(name, file, find, replace, null, confirm);
}
- /** As {@link #editFile(String, String, String, String, boolean)} with
several edits, written once (CAMEL-25501). */
/** The statuses of a write that changed the file: written directly, or
saved in the editor after a live replay. */
private static final Set<String> APPLIED_WRITES = Set.of("overwritten",
"created", "written");
+ /** As {@link #editFile(String, String, String, String, boolean)} with
several edits, written once (CAMEL-25501). */
JsonObject editFile(String name, String file, String find, String replace,
String edits, boolean confirm) {
IntegrationInfo target = findIntegration(name);
if (target == null) {
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/TabRegistry.java
b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/TabRegistry.java
index a020b299286f..36cac9bc77e0 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/TabRegistry.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/TabRegistry.java
@@ -483,8 +483,7 @@ class TabRegistry {
* popup {@code label} carrying a {@value TuiIcons#MNEMONIC_MARKER}
shortcut marker, and the tab instance. The
* shortcut letter and its highlight offset are derived from {@code label}
via
* {@link TuiIcons#mnemonicIndex(String)}, so there is no separate index
or shortcut list to keep aligned.
- */
- /**
+ *
* @param requiredConsoles dev console IDs that must be present (any-of)
for this tab to be active; empty = always
* active
* @param activeWhen runtime predicate on IntegrationInfo; null =
always active (after console check)
