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 201f79792464 CAMEL-26929: camel-jbang - camel get transformer no
longer warns for each integration without transformers (#30020)
201f79792464 is described below
commit 201f79792464abc9f94a924bd3bf6f5dad0a1614
Author: Claus Ibsen <[email protected]>
AuthorDate: Sun Nov 15 16:05:34 2026 +0100
CAMEL-26929: camel-jbang - camel get transformer no longer warns for each
integration without transformers (#30020)
…each integration without transformers
Since the consoles are records (CAMEL-24565), the transformers console
leaves out its list when there are no
transformers, and camel get transformer skipped each such integration with
a NullPointerException warning. The other
35 camel get commands were checked against an integration without
transformers, beans, errors and so on: only this one
failed. The fixtures of ListTransformerTest are built from the console
record.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
---
.../core/commands/process/ListTransformer.java | 5 +--
.../core/commands/process/ListTransformerTest.java | 38 +++++++++++++++++++---
2 files changed, 36 insertions(+), 7 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListTransformer.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListTransformer.java
index 8e1479a62a1c..9daa02d126cf 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListTransformer.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListTransformer.java
@@ -67,8 +67,9 @@ public class ListTransformer extends ProcessBaseCommand {
forEachIntegration(name, (ph, root) -> {
JsonObject context = (JsonObject) root.get("context");
JsonObject jo = (JsonObject) root.get("transformers");
- if (context != null && jo != null) {
- JsonArray array = (JsonArray) jo.get("transformers");
+ // the console leaves the list out when there are no transformers
(CAMEL-26929)
+ JsonArray array = jo != null ? (JsonArray) jo.get("transformers")
: null;
+ if (context != null && array != null) {
for (int i = 0; i < array.size(); i++) {
JsonObject o = (JsonObject) array.get(i);
Row row = new Row();
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/process/ListTransformerTest.java
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/process/ListTransformerTest.java
index 4deeff87521e..6e0906853f57 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/process/ListTransformerTest.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/process/ListTransformerTest.java
@@ -17,11 +17,14 @@
package org.apache.camel.dsl.jbang.core.commands.process;
import java.util.Collections;
+import java.util.List;
import java.util.stream.Stream;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
+import org.apache.camel.impl.console.TransformerConsole;
import org.apache.camel.util.json.JsonArray;
import org.apache.camel.util.json.JsonObject;
+import org.apache.camel.util.json.JsonRecordSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.MockedStatic;
@@ -56,6 +59,31 @@ class ListTransformerTest extends ProcessCommandTestSupport {
}
}
+ @Test
+ void testIntegrationWithoutTransformers() throws Exception {
+ // as the console writes it: no list when there are no transformers,
which was a NullPointerException
+ JsonObject root = new JsonObject();
+ root.put("context", contextObj());
+ root.put("transformers", JsonRecordSupport.toJsonObject(new
TransformerConsole.Response(0, 0, 0, 1000, null)));
+ writeStatusFile(TEST_PID, root);
+
+ ListTransformer command = new ListTransformer(new
CamelJBangMain().withPrinter(printer));
+ command.sort = "pid";
+
+ try (MockedStatic<ProcessHandle> mocked =
mockStatic(ProcessHandle.class)) {
+ ProcessHandle ph = mockProcessHandle(TEST_PID);
+ ProcessHandle currentHandle = mockCurrentHandle();
+ mocked.when(ProcessHandle::current).thenReturn(currentHandle);
+ mocked.when(ProcessHandle::allProcesses).thenAnswer(inv ->
Stream.of(ph));
+
+ int exit = command.doCall();
+
+ assertEquals(0, exit);
+ assertEquals("", printer.getOutput().trim());
+ assertEquals("", printer.getStderr().trim(), "no warning for the
integration");
+ }
+ }
+
@Test
void testShowsTransformerDataTypes() throws Exception {
JsonObject root = new JsonObject();
@@ -122,11 +150,11 @@ class ListTransformerTest extends
ProcessCommandTestSupport {
return container;
}
+ // built from the record of the transformer console, so a renamed key
breaks this test
private static JsonObject transformer(String name, String from, String to)
{
- JsonObject t = new JsonObject();
- t.put("name", name);
- t.put("from", from);
- t.put("to", to);
- return t;
+ TransformerConsole.TransformerEntry entry = new
TransformerConsole.TransformerEntry(name, from, to);
+ JsonObject response
+ = JsonRecordSupport.toJsonObject(new
TransformerConsole.Response(1, 0, 1, 1000, List.of(entry)));
+ return (JsonObject) ((JsonArray) response.get("transformers")).get(0);
}
}