Croway commented on code in PR #27817:
URL: https://github.com/apache/camel/pull/27817#discussion_r4269293257
##########
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ai/ToolRegistry.java:
##########
@@ -1130,45 +1150,60 @@ private static void registerExampleTools() {
}));
register(tool("get_example_file",
- "Get the content of a file from a bundled Camel CLI example.")
- .param("example", "string",
- "Example name (e.g., timer-log, rest-api,
circuit-breaker)", true)
- .param("file", "string",
- "File name within the example (e.g.,
route.camel.yaml)", true)
- .executor((ctx, args) -> {
- String example = args.get("example");
- String file = args.get("file");
- if (example == null || example.isBlank()) {
- throw new ToolExecutionException("example name is
required");
- }
- if (file == null || file.isBlank()) {
- throw new ToolExecutionException("file name is
required");
- }
- List<JsonObject> catalog2 = ExampleHelper.loadCatalog();
- JsonObject entry = ExampleHelper.findExample(catalog2,
example);
- if (entry == null) {
- return "Example not found: " + example;
- }
- List<String> files = ExampleHelper.getFiles(entry);
- if (!files.contains(file)) {
- return "File '" + file + "' not found in example '" +
example + "'. Available: " + files;
- }
- if (ExampleHelper.isBundled(entry)) {
- String resourcePath = "examples/" + example + "/" +
file;
- try (InputStream is
- =
ExampleHelper.class.getClassLoader().getResourceAsStream(resourcePath)) {
- if (is != null) {
- return IOHelper.loadText(is);
- }
- } catch (Exception e) {
- return "Error reading file: " + e.getMessage();
- }
- return "Could not read bundled file: " + resourcePath;
- } else {
- return "This example is not bundled. View it on
GitHub: "
- + ExampleHelper.getGithubUrl(entry) + "/" +
file;
- }
- }));
+ "Get the content of a file from a Camel CLI example: the
content of a bundled example, the GitHub "
+ + "URL of the file for the others.
Returns the full name of the example.")
+ .param("example", "string", EXAMPLE_NAME_DESC, true)
+ .param("file", "string", EXAMPLE_FILE_DESC, true)
+ .executor((ctx, args) -> exampleFile(args.get("example"),
args.get("file")).toJson()));
+ }
+
+ /**
+ * A file of an example: the catalog entry is found by its full or short
name and the bundled resource is read from
+ * the entry's name, so a short name reads the file as well (CAMEL-25535).
+ */
+ static JsonObject exampleFile(String example, String file) {
+ if (example == null || example.isBlank()) {
+ throw new ToolExecutionException("example name is required");
+ }
+ if (file == null || file.isBlank()) {
+ throw new ToolExecutionException("file name is required");
+ }
+ String wanted = example.trim();
+ String fileName = file.trim();
+ List<JsonObject> catalog = ExampleHelper.loadCatalog();
+ JsonObject entry = ExampleHelper.findExample(catalog, wanted);
Review Comment:
Done in 743e92942ed0: `exampleFile` resolves a short name through
`findExamplesByShortName`, as `Run` does, and answers "Ambiguous example: x.
Use one of: a/x, b/x" when two groups share it, with a test on a small made-up
catalog (the bundled one has no duplicate today).
##########
core/camel-core-engine/src/main/docs/modules/eips/pages/throwException-eip.adoc:
##########
@@ -1,7 +1,7 @@
-= Stop EIP
-:doctitle: Stop
-:shortname: stop
-:description: Stops the processing of the current message
+= Throw Exception EIP
+:doctitle: Throw Exception
+:shortname: throwException
+:description: Throws an exception
Review Comment:
Applied in 743e92942ed0: the page and its catalog mirror use the model's
description.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
